diff options
Diffstat (limited to 'demos/3d')
| -rw-r--r-- | demos/3d/kinematic_char/cubio.gd | 5 | ||||
| -rw-r--r-- | demos/3d/navmesh/icon.png | bin | 0 -> 4902 bytes | |||
| -rw-r--r-- | demos/3d/navmesh/navmesh.scn | bin | 37856 -> 38129 bytes | |||
| -rw-r--r-- | demos/3d/platformer/bullet.scn | bin | 6156 -> 6157 bytes | |||
| -rw-r--r-- | demos/3d/platformer/coin.scn | bin | 6013 -> 6791 bytes | |||
| -rw-r--r-- | demos/3d/platformer/enemy.gd | 3 | ||||
| -rw-r--r-- | demos/3d/platformer/enemy.scn | bin | 36976 -> 38594 bytes | |||
| -rw-r--r-- | demos/3d/platformer/player.gd | 6 | ||||
| -rw-r--r-- | demos/3d/sat_test/engine.cfg | 1 | ||||
| -rw-r--r-- | demos/3d/sat_test/icon.png | bin | 0 -> 4628 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 | ||||
| -rw-r--r-- | demos/3d/truck_town/icon.png | bin | 0 -> 6878 bytes |
13 files changed, 9 insertions, 7 deletions
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/navmesh/icon.png b/demos/3d/navmesh/icon.png Binary files differnew file mode 100644 index 0000000000..51fef7b2df --- /dev/null +++ b/demos/3d/navmesh/icon.png 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 4f1623b7d9..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 cbbb2fe725..9b2e95a96d 100644 --- a/demos/3d/platformer/enemy.gd +++ b/demos/3d/platformer/enemy.gd @@ -91,4 +91,5 @@ func _ready(): # Initalization here pass - +func _die(): + queue_free() diff --git a/demos/3d/platformer/enemy.scn b/demos/3d/platformer/enemy.scn Binary files differindex b3f69af600..083582a85a 100644 --- a/demos/3d/platformer/enemy.scn +++ b/demos/3d/platformer/enemy.scn diff --git a/demos/3d/platformer/player.gd b/demos/3d/platformer/player.gd index 4eeb12e23b..76cf2861bf 100644 --- a/demos/3d/platformer/player.gd +++ b/demos/3d/platformer/player.gd @@ -69,9 +69,9 @@ func _integrate_forces( state ): var lv = state.get_linear_velocity() # linear velocity var g = state.get_total_gravity() var delta = state.get_step() - var d = 1.0 - delta*state.get_total_density() - if (d<0): - d=0 +# var d = 1.0 - delta*state.get_total_density() +# if (d<0): +# d=0 lv += g * delta #apply gravity var anim = ANIM_FLOOR diff --git a/demos/3d/sat_test/engine.cfg b/demos/3d/sat_test/engine.cfg index cc215c83e8..82c688635d 100644 --- a/demos/3d/sat_test/engine.cfg +++ b/demos/3d/sat_test/engine.cfg @@ -2,3 +2,4 @@ name="SAT Collision Test" main_scene="res://sat_test.xml" +icon="res://icon.png" diff --git a/demos/3d/sat_test/icon.png b/demos/3d/sat_test/icon.png Binary files differnew file mode 100644 index 0000000000..194456e10f --- /dev/null +++ b/demos/3d/sat_test/icon.png 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 3c340e6dcd..b2a463e1e2 100644 --- a/demos/3d/truck_town/engine.cfg +++ b/demos/3d/truck_town/engine.cfg @@ -2,6 +2,7 @@ name="Truck Town" main_scene="res://car_select.scn" +icon="res://icon.png" [display] diff --git a/demos/3d/truck_town/icon.png b/demos/3d/truck_town/icon.png Binary files differnew file mode 100644 index 0000000000..7d7bd42116 --- /dev/null +++ b/demos/3d/truck_town/icon.png |
