Merge pull request godotengine#26 from williamd1k0/player-index

Export player index
stormi · Oct 1, 2016 · 95fff76 · 95fff76
2 parents 80aea98 + 8f46b78
commit 95fff76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/2d/split_screen_platformer/player.gd b/2d/split_screen_platformer/player.gd
@@ -17,7 +17,7 @@ var on_floor = false
 var shoot_time=99999 #time since last shot
 
 var anim=""
-export var index=1
+export(int, "None", "Player 1", "Player 2") var index = 1
 
 #cache the sprite here for fast access (we will set scale to flip it often)
 onready var sprite = get_node("sprite")

diff --git a/2d/split_screen_platformer/player.tscn b/2d/split_screen_platformer/player.tscn
@@ -262,6 +262,7 @@ default/chorus_send = 0.0
 
 [node name="ui" type="CanvasLayer" parent="."]
 
+editor/display_folded = true
 layer = 0
 offset = Vector2( 0, 0 )
 rotation = 0.0