summaryrefslogtreecommitdiff
path: root/demos/3d
diff options
context:
space:
mode:
authorAnton Yabchinskiy <arn@bestmx.ru>2015-03-10 11:44:40 +0300
committerAnton Yabchinskiy <arn@bestmx.ru>2015-03-10 11:44:40 +0300
commit43713810deaadfec6a1656767cf5520073e58a06 (patch)
tree8b1c7e82562494e1889b1550b58b3d953f076696 /demos/3d
parent19a99afa81354ed69e1c07b6050aeb438e4ee2cb (diff)
parent91744e9ed3124ca48e0837ee72bfe7182fd31701 (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'demos/3d')
-rw-r--r--demos/3d/kinematic_char/cubelib.resbin11431 -> 11530 bytes
-rw-r--r--demos/3d/kinematic_char/level.scnbin15323 -> 15556 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/demos/3d/kinematic_char/cubelib.res b/demos/3d/kinematic_char/cubelib.res
index 66b999d78d..27f2b9b3bd 100644
--- a/demos/3d/kinematic_char/cubelib.res
+++ b/demos/3d/kinematic_char/cubelib.res
Binary files differ
diff --git a/demos/3d/kinematic_char/level.scn b/demos/3d/kinematic_char/level.scn
index a276fe22e1..7ccb2430c1 100644
--- a/demos/3d/kinematic_char/level.scn
+++ b/demos/3d/kinematic_char/level.scn
Binary files differ