Merge branch 'master' of github.com:sanicteam/sanic-gaiden

SanicTeam · Mar 25, 2016 · 7fe8d6a · 7fe8d6a
2 parents f03f6c2 + 22a82c6
commit 7fe8d6a
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/engine.cfg b/engine.cfg
@@ -1,7 +1,7 @@
 [application]
 
 name="sanic-gaiden"
-main_scene="res://main.scn"
+main_scene="res://scenes/main.scn"
 icon="icon.png"
 
 [autoload]

diff --git a/levels/test_level0.scn b/levels/test_level0.scn
diff --git a/camera.scn → scenes/camera.scn b/camera.scn → scenes/camera.scn
diff --git a/fade.scn → scenes/fade.scn b/fade.scn → scenes/fade.scn
diff --git a/hud.scn → scenes/hud.scn b/hud.scn → scenes/hud.scn
diff --git a/scenes/levels/test_level0.scn b/scenes/levels/test_level0.scn
diff --git a/levels/test_level1.scn → scenes/levels/test_level1.scn b/levels/test_level1.scn → scenes/levels/test_level1.scn
diff --git a/main.scn → scenes/main.scn b/main.scn → scenes/main.scn
diff --git a/player.scn → scenes/player.scn b/player.scn → scenes/player.scn
diff --git a/scripts/globals.gd b/scripts/globals.gd
@@ -21,10 +21,10 @@ var paused = false
 func _ready():
 	var main_scene = get_tree().get_root().get_node("main")
 
-	camera = ResourceLoader.load("res://camera.scn").instance()
+	camera = ResourceLoader.load("res://scenes/camera.scn").instance()
 	main_scene.add_child(camera)
 
-	fade = ResourceLoader.load("res://fade.scn").instance()
+	fade = ResourceLoader.load("res://scenes/fade.scn").instance()
 	main_scene.add_child(fade)
 
 	set_scene("test_level0")
@@ -99,7 +99,7 @@ func set_scene(scene):
 	if level != null:
 		level.queue_free()
 	# Load the file passed in as the param "scene"
-	var s = ResourceLoader.load("res://levels/" + scene + ".scn")
+	var s = ResourceLoader.load("res://scenes/levels/" + scene + ".scn")
 	# Create an instance of our scene
 	level = s.instance()
 	# Add scene to main