summaryrefslogtreecommitdiff
path: root/demos/2d/platformer/coin.gd
diff options
context:
space:
mode:
authorMarianoGNU <marianognu.easyrpg@gmail.com>2015-10-16 23:21:39 -0300
committerMarianoGNU <marianognu.easyrpg@gmail.com>2015-10-16 23:21:39 -0300
commita5ebb525000d8301f73377426a2c1924d70aaf86 (patch)
tree55eaf1e0e6553dbb34d236b07a051689ae8f2493 /demos/2d/platformer/coin.gd
parent553edf1f250f34ca0ef0703b13b4d601f609e491 (diff)
parent17a90ddc0824bb51b5ea707f5d4d11aed301f91d (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts: # tools/editor/property_editor.cpp
Diffstat (limited to 'demos/2d/platformer/coin.gd')
-rw-r--r--demos/2d/platformer/coin.gd8
1 files changed, 8 insertions, 0 deletions
diff --git a/demos/2d/platformer/coin.gd b/demos/2d/platformer/coin.gd
index 3e31a395ae..983cd46d88 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