Merge pull request #565 from aaronfranke/save-load-loading

Move Saving and Loading demo to Loading category
godotengine · Dec 30, 2020 · 08e3f1e · 08e3f1e
2 parents 96baaa0 + 0d9c0d1
commit 08e3f1e
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 2 deletions.
diff --git a/2d/save_load/README.md → loading/serialization/README.md b/2d/save_load/README.md → loading/serialization/README.md
diff --git a/2d/save_load/default_env.tres → loading/serialization/default_env.tres b/2d/save_load/default_env.tres → loading/serialization/default_env.tres
diff --git a/2d/save_load/enemy.gd → loading/serialization/enemy.gd b/2d/save_load/enemy.gd → loading/serialization/enemy.gd
diff --git a/2d/save_load/enemy.tscn → loading/serialization/enemy.tscn b/2d/save_load/enemy.tscn → 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 → loading/serialization/gui.gd b/2d/save_load/gui.gd → loading/serialization/gui.gd
diff --git a/2d/save_load/icon.png → loading/serialization/icon.png b/2d/save_load/icon.png → loading/serialization/icon.png
diff --git a/2d/save_load/icon.png.import → loading/serialization/icon.png.import b/2d/save_load/icon.png.import → loading/serialization/icon.png.import
diff --git a/2d/save_load/player.gd → loading/serialization/player.gd b/2d/save_load/player.gd → loading/serialization/player.gd
diff --git a/2d/save_load/project.godot → loading/serialization/project.godot b/2d/save_load/project.godot → 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,27 +32,33 @@ 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={
 "deadzone": 0.2,
 "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={
 "deadzone": 0.2,
 "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={
 "deadzone": 0.2,
 "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 → loading/serialization/save_load.tscn b/2d/save_load/save_load.tscn → 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 → ...ng/serialization/save_load_config_file.gd b/2d/save_load/save_load_config_file.gd → ...ng/serialization/save_load_config_file.gd
diff --git a/2d/save_load/save_load_json.gd → loading/serialization/save_load_json.gd b/2d/save_load/save_load_json.gd → loading/serialization/save_load_json.gd
diff --git a/2d/save_load/screenshots/.gdignore → loading/serialization/screenshots/.gdignore b/2d/save_load/screenshots/.gdignore → loading/serialization/screenshots/.gdignore
diff --git a/2d/save_load/screenshots/save_load.png → ...g/serialization/screenshots/save_load.png b/2d/save_load/screenshots/save_load.png → ...g/serialization/screenshots/save_load.png