aboutsummaryrefslogtreecommitdiff
path: root/demos/3d
diff options
context:
space:
mode:
Diffstat (limited to 'demos/3d')
-rw-r--r--demos/3d/kinematic_char/cubelib.resbin11530 -> 11532 bytes
-rw-r--r--demos/3d/kinematic_char/cubio.gd5
-rw-r--r--demos/3d/kinematic_char/level.scnbin15556 -> 15523 bytes
-rw-r--r--demos/3d/navmesh/navmesh.scnbin37856 -> 38129 bytes
-rw-r--r--demos/3d/platformer/bullet.scnbin5465 -> 6157 bytes
-rw-r--r--demos/3d/platformer/coin.scnbin6013 -> 6791 bytes
-rw-r--r--demos/3d/platformer/enemy.gd2
-rw-r--r--demos/3d/platformer/enemy.scnbin36976 -> 37784 bytes
-rw-r--r--demos/3d/shader_materials/shader_materials.scnbin5494 -> 6382 bytes
-rw-r--r--demos/3d/truck_town/engine.cfg1
10 files changed, 4 insertions, 4 deletions
diff --git a/demos/3d/kinematic_char/cubelib.res b/demos/3d/kinematic_char/cubelib.res
index 27f2b9b3b..130b9529f 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/cubio.gd b/demos/3d/kinematic_char/cubio.gd
index a1baa78a0..058b919d0 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
index 7ccb2430c..8be64c61c 100644
--- a/demos/3d/kinematic_char/level.scn
+++ b/demos/3d/kinematic_char/level.scn
Binary files differ
diff --git a/demos/3d/navmesh/navmesh.scn b/demos/3d/navmesh/navmesh.scn
index 73df340b1..1202985de 100644
--- a/demos/3d/navmesh/navmesh.scn
+++ b/demos/3d/navmesh/navmesh.scn
Binary files differ
diff --git a/demos/3d/platformer/bullet.scn b/demos/3d/platformer/bullet.scn
index 43f48fc99..da90dba1a 100644
--- a/demos/3d/platformer/bullet.scn
+++ b/demos/3d/platformer/bullet.scn
Binary files differ
diff --git a/demos/3d/platformer/coin.scn b/demos/3d/platformer/coin.scn
index 449bb0f89..a4148b406 100644
--- a/demos/3d/platformer/coin.scn
+++ b/demos/3d/platformer/coin.scn
Binary files differ
diff --git a/demos/3d/platformer/enemy.gd b/demos/3d/platformer/enemy.gd
index 1d0e0315d..cbbb2fe72 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
index b3f69af60..06d725061 100644
--- a/demos/3d/platformer/enemy.scn
+++ b/demos/3d/platformer/enemy.scn
Binary files differ
diff --git a/demos/3d/shader_materials/shader_materials.scn b/demos/3d/shader_materials/shader_materials.scn
index d6a3efe73..243c6c8f0 100644
--- a/demos/3d/shader_materials/shader_materials.scn
+++ b/demos/3d/shader_materials/shader_materials.scn
Binary files differ
diff --git a/demos/3d/truck_town/engine.cfg b/demos/3d/truck_town/engine.cfg
index f47c0de4f..3c340e6dc 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]