diff --git a/2d/save_load/README.md b/loading/serialization/README.md similarity index 100% rename from 2d/save_load/README.md rename to loading/serialization/README.md diff --git a/2d/save_load/default_env.tres b/loading/serialization/default_env.tres similarity index 100% rename from 2d/save_load/default_env.tres rename to loading/serialization/default_env.tres diff --git a/2d/save_load/enemy.gd b/loading/serialization/enemy.gd similarity index 100% rename from 2d/save_load/enemy.gd rename to loading/serialization/enemy.gd diff --git a/2d/save_load/enemy.tscn b/loading/serialization/enemy.tscn similarity index 99% rename from 2d/save_load/enemy.tscn rename to loading/serialization/enemy.tscn index a37bf8e8f4..6be6e40b93 100644 --- a/2d/save_load/enemy.tscn +++ b/loading/serialization/enemy.tscn @@ -26,6 +26,5 @@ texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="AttackArea"] shape = SubResource( 2 ) - [connection signal="body_entered" from="AttackArea" to="." method="_on_AttackArea_body_entered"] [connection signal="body_exited" from="AttackArea" to="." method="_on_AttackArea_body_exited"] diff --git a/2d/save_load/gui.gd b/loading/serialization/gui.gd similarity index 100% rename from 2d/save_load/gui.gd rename to loading/serialization/gui.gd diff --git a/2d/save_load/icon.png b/loading/serialization/icon.png similarity index 100% rename from 2d/save_load/icon.png rename to loading/serialization/icon.png diff --git a/2d/save_load/icon.png.import b/loading/serialization/icon.png.import similarity index 100% rename from 2d/save_load/icon.png.import rename to loading/serialization/icon.png.import diff --git a/2d/save_load/player.gd b/loading/serialization/player.gd similarity index 100% rename from 2d/save_load/player.gd rename to loading/serialization/player.gd diff --git a/2d/save_load/project.godot b/loading/serialization/project.godot similarity index 67% rename from 2d/save_load/project.godot rename to loading/serialization/project.godot index 119e75b1d4..6996ed0756 100644 --- a/2d/save_load/project.godot +++ b/loading/serialization/project.godot @@ -8,6 +8,11 @@ config_version=4 +_global_script_classes=[ ] +_global_script_class_icons={ + +} + [application] config/name="Saving and Loading (Serialization)" @@ -27,6 +32,8 @@ move_up={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null) ] } move_down={ @@ -34,6 +41,7 @@ move_down={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) ] } move_left={ @@ -41,6 +49,8 @@ move_left={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null) ] } move_right={ @@ -48,6 +58,7 @@ move_right={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) ] } diff --git a/2d/save_load/save_load.tscn b/loading/serialization/save_load.tscn similarity index 99% rename from 2d/save_load/save_load.tscn rename to loading/serialization/save_load.tscn index 6cc59a30ac..6f364301b8 100644 --- a/2d/save_load/save_load.tscn +++ b/loading/serialization/save_load.tscn @@ -153,7 +153,6 @@ Use the save and load buttons to save/load the game with the respective format ( text = "Use the arrow keys or controller to move the player. Use the save and load buttons to save/load the game with the respective format (each format is its own savegame)." - [connection signal="pressed" from="Control/VBoxContainer/SaveLoad/SaveConfigFile" to="Control/VBoxContainer/SaveLoad/SaveConfigFile" method="save_game"] [connection signal="pressed" from="Control/VBoxContainer/SaveLoad/LoadConfigFile" to="Control/VBoxContainer/SaveLoad/LoadConfigFile" method="load_game"] [connection signal="pressed" from="Control/VBoxContainer/SaveLoad/SaveJSON" to="Control/VBoxContainer/SaveLoad/SaveJSON" method="save_game"] diff --git a/2d/save_load/save_load_config_file.gd b/loading/serialization/save_load_config_file.gd similarity index 100% rename from 2d/save_load/save_load_config_file.gd rename to loading/serialization/save_load_config_file.gd diff --git a/2d/save_load/save_load_json.gd b/loading/serialization/save_load_json.gd similarity index 100% rename from 2d/save_load/save_load_json.gd rename to loading/serialization/save_load_json.gd diff --git a/2d/save_load/screenshots/.gdignore b/loading/serialization/screenshots/.gdignore similarity index 100% rename from 2d/save_load/screenshots/.gdignore rename to loading/serialization/screenshots/.gdignore diff --git a/2d/save_load/screenshots/save_load.png b/loading/serialization/screenshots/save_load.png similarity index 100% rename from 2d/save_load/screenshots/save_load.png rename to loading/serialization/screenshots/save_load.png