Merged with main and fixed merge conflicts

2021-11-29 13:53:26 -06:00
parent 2a6d1bce1d 7b29ecc3f8
commit 9d2a15985c
161 changed files with 2347 additions and 778 deletions
--- a/Levels/Level
+++ b/Levels/Level
@@ -0,0 +1,6 @@
+extends Node2D
+
+func _ready() -> void:
+    $YSort/Player.position = get_viewport_rect().size / 2
+    $YSort/Player.load_hud($HUD)
+    return