diff options
| author | Juan Linietsky | 2015-10-19 18:48:34 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-10-19 18:48:34 -0300 |
| commit | 2b12a8109dda1f47f9b75a5de91d7d00c1f25869 (patch) | |
| tree | 3f3775c304e76ea2776d336c9a471d99359872c0 /demos | |
| parent | 5d86a25f4d04b21559f0d4edbd4e70dc01ea6685 (diff) | |
| parent | 0a02c28b2be8e8271d5f3ffb95a4b09f91c3bd32 (diff) | |
| download | godot-2b12a8109dda1f47f9b75a5de91d7d00c1f25869.tar.gz godot-2b12a8109dda1f47f9b75a5de91d7d00c1f25869.tar.zst godot-2b12a8109dda1f47f9b75a5de91d7d00c1f25869.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/2d/platformer/coin.gd | 8 | ||||
| -rw-r--r-- | demos/2d/platformer/tiles_demo.png.flags | 1 | ||||
| -rw-r--r-- | demos/3d/platformer/enemy.gd | 3 | ||||
| -rw-r--r-- | demos/3d/platformer/enemy.scn | bin | 37784 -> 38594 bytes |
4 files changed, 11 insertions, 1 deletions
diff --git a/demos/2d/platformer/coin.gd b/demos/2d/platformer/coin.gd index 3e31a395a..983cd46d8 100644 --- a/demos/2d/platformer/coin.gd +++ b/demos/2d/platformer/coin.gd @@ -18,3 +18,11 @@ func _ready(): # Initalization here pass + + +func _on_coin_area_enter( area ): + pass # replace with function body + + +func _on_coin_area_enter_shape( area_id, area, area_shape, area_shape ): + pass # replace with function body diff --git a/demos/2d/platformer/tiles_demo.png.flags b/demos/2d/platformer/tiles_demo.png.flags new file mode 100644 index 000000000..efb2b8ce5 --- /dev/null +++ b/demos/2d/platformer/tiles_demo.png.flags @@ -0,0 +1 @@ +filter=false diff --git a/demos/3d/platformer/enemy.gd b/demos/3d/platformer/enemy.gd index cbbb2fe72..9b2e95a96 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 06d725061..083582a85 100644 --- a/demos/3d/platformer/enemy.scn +++ b/demos/3d/platformer/enemy.scn |
