Merge branch 'develop' into feature/enemies

2022-08-05 12:16:52 -04:00 · 2022-08-05 12:16:52 -04:00 · 7a3b29a419
parent 5ce3a2f37c 0d0fb42698
commit 7a3b29a419
2 changed files with 2 additions and 2 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "godot-cpp"]
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp
-	branch = 3.4
+	branch = 3.5
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ced274fbe62c07dd9bb6791a77392f4bdc625152
+Subproject commit 867374da404887337909e8b7b9de5a8acbc47569