diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-07-29 23:01:36 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-07-29 23:01:36 +0300 |
| commit | dc8df8a91a995796f0f330bf6bb6b209f6dfce08 (patch) | |
| tree | 46cfe09124703b07860754d6b44e0289422e0573 /demos/3d | |
| parent | 16746f157f83d666079ba3266acec13d35b84c3f (diff) | |
| parent | 922356b903061cda7591090bf19e8346c3a78cf5 (diff) | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'demos/3d')
| -rw-r--r-- | demos/3d/kinematic_char/cubelib.res | bin | 11530 -> 11532 bytes | |||
| -rw-r--r-- | demos/3d/kinematic_char/cubio.gd | 5 | ||||
| -rw-r--r-- | demos/3d/kinematic_char/level.scn | bin | 15556 -> 15523 bytes | |||
| -rw-r--r-- | demos/3d/navmesh/navmesh.scn | bin | 37856 -> 38129 bytes | |||
| -rw-r--r-- | demos/3d/platformer/bullet.scn | bin | 5465 -> 6157 bytes | |||
| -rw-r--r-- | demos/3d/platformer/coin.scn | bin | 6013 -> 6791 bytes | |||
| -rw-r--r-- | demos/3d/platformer/enemy.gd | 2 | ||||
| -rw-r--r-- | demos/3d/platformer/enemy.scn | bin | 36976 -> 37784 bytes | |||
| -rw-r--r-- | demos/3d/shader_materials/shader_materials.scn | bin | 5494 -> 6382 bytes | |||
| -rw-r--r-- | demos/3d/truck_town/engine.cfg | 1 |
10 files changed, 4 insertions, 4 deletions
diff --git a/demos/3d/kinematic_char/cubelib.res b/demos/3d/kinematic_char/cubelib.res Binary files differindex 27f2b9b3bd..130b9529fe 100644 --- a/demos/3d/kinematic_char/cubelib.res +++ b/demos/3d/kinematic_char/cubelib.res diff --git a/demos/3d/kinematic_char/cubio.gd b/demos/3d/kinematic_char/cubio.gd index a1baa78a0c..058b919d05 100644 --- a/demos/3d/kinematic_char/cubio.gd +++ b/demos/3d/kinematic_char/cubio.gd @@ -46,9 +46,8 @@ func _fixed_process(delta): vel.x=hvel.x; vel.z=hvel.z - - var motion = vel*delta - motion=move(vel*delta) + + var motion = move(vel*delta) var on_floor = false var original_vel = vel diff --git a/demos/3d/kinematic_char/level.scn b/demos/3d/kinematic_char/level.scn Binary files differindex 7ccb2430c1..8be64c61c0 100644 --- a/demos/3d/kinematic_char/level.scn +++ b/demos/3d/kinematic_char/level.scn diff --git a/demos/3d/navmesh/navmesh.scn b/demos/3d/navmesh/navmesh.scn Binary files differindex 73df340b1e..1202985dec 100644 --- a/demos/3d/navmesh/navmesh.scn +++ b/demos/3d/navmesh/navmesh.scn diff --git a/demos/3d/platformer/bullet.scn b/demos/3d/platformer/bullet.scn Binary files differindex 43f48fc99f..da90dba1a5 100644 --- a/demos/3d/platformer/bullet.scn +++ b/demos/3d/platformer/bullet.scn diff --git a/demos/3d/platformer/coin.scn b/demos/3d/platformer/coin.scn Binary files differindex 449bb0f895..a4148b4060 100644 --- a/demos/3d/platformer/coin.scn +++ b/demos/3d/platformer/coin.scn diff --git a/demos/3d/platformer/enemy.gd b/demos/3d/platformer/enemy.gd index 1d0e0315d9..cbbb2fe725 100644 --- a/demos/3d/platformer/enemy.gd +++ b/demos/3d/platformer/enemy.gd @@ -45,7 +45,7 @@ func _integrate_forces(state): state.set_angular_velocity( -dp.cross(up).normalized() *33.0) get_node("AnimationPlayer").play("impact") get_node("AnimationPlayer").queue("explode") - set_friction(true) + set_friction(1) cc.disabled=true get_node("sound").play("hit") return diff --git a/demos/3d/platformer/enemy.scn b/demos/3d/platformer/enemy.scn Binary files differindex b3f69af600..06d725061d 100644 --- a/demos/3d/platformer/enemy.scn +++ b/demos/3d/platformer/enemy.scn diff --git a/demos/3d/shader_materials/shader_materials.scn b/demos/3d/shader_materials/shader_materials.scn Binary files differindex d6a3efe73f..243c6c8f06 100644 --- a/demos/3d/shader_materials/shader_materials.scn +++ b/demos/3d/shader_materials/shader_materials.scn diff --git a/demos/3d/truck_town/engine.cfg b/demos/3d/truck_town/engine.cfg index f47c0de4fa..3c340e6dcd 100644 --- a/demos/3d/truck_town/engine.cfg +++ b/demos/3d/truck_town/engine.cfg @@ -1,5 +1,6 @@ [application] +name="Truck Town" main_scene="res://car_select.scn" [display] |