diff --git a/.DS_Store b/.DS_Store index b39dc8c..b505fc1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Phase2/.DS_Store b/Phase2/.DS_Store index 48f24ac..68fa788 100644 Binary files a/Phase2/.DS_Store and b/Phase2/.DS_Store differ diff --git a/Phase2/Godot_GameCode/.DS_Store b/Phase2/Godot_GameCode/.DS_Store index 0cebeec..c8d4acf 100644 Binary files a/Phase2/Godot_GameCode/.DS_Store and b/Phase2/Godot_GameCode/.DS_Store differ diff --git a/Phase2/Godot_GameCode/MainMenu/.DS_Store b/Phase2/Godot_GameCode/MainMenu/.DS_Store index 856a3e3..883625a 100644 Binary files a/Phase2/Godot_GameCode/MainMenu/.DS_Store and b/Phase2/Godot_GameCode/MainMenu/.DS_Store differ diff --git a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/LoadGame_temp.tscn b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/LoadGame_temp.tscn index c843e61..f0b52e6 100644 --- a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/LoadGame_temp.tscn +++ b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/LoadGame_temp.tscn @@ -20,7 +20,7 @@ margin_left = 0.0 margin_top = 0.0 margin_right = 0.0 margin_bottom = 0.0 -text = "Multiplayer (temp)" +text = "Load Game (temp)" [node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] text = "Temp: back to menu" diff --git a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/NewGame_temp.tscn b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/NewGame_temp.tscn index c843e61..2b79954 100644 --- a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/NewGame_temp.tscn +++ b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/NewGame_temp.tscn @@ -20,7 +20,7 @@ margin_left = 0.0 margin_top = 0.0 margin_right = 0.0 margin_bottom = 0.0 -text = "Multiplayer (temp)" +text = "New Game(temp)" [node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] text = "Temp: back to menu" diff --git a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/Settings_temp.tscn b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/Settings_temp.tscn index c843e61..d8c71a3 100644 --- a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/Settings_temp.tscn +++ b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/Screens/Settings_temp.tscn @@ -20,7 +20,7 @@ margin_left = 0.0 margin_top = 0.0 margin_right = 0.0 margin_bottom = 0.0 -text = "Multiplayer (temp)" +text = "Settings (temp)" [node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] text = "Temp: back to menu" diff --git a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.gd b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.gd index f8a43ac..0e0eace 100644 --- a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.gd +++ b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.gd @@ -9,10 +9,9 @@ export(String, FILE) var next_scene_path: = "" var tempToggle = 0 -func _on_But_NewGame_button_up(): +func _on_But_ChangeScene_button_up(): get_tree().change_scene(next_scene_path) - func _get_configuration_warning() -> String: return "next_scene_path must be set for this button to work" if next_scene_path == "" else "" diff --git a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.tscn b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.tscn index 80849fc..e324dd1 100644 --- a/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.tscn +++ b/Phase2/Godot_GameCode/MainMenu/GodotUserInterface-MainMenu-Accepted/bcirpg_mainMenu_2023_0716A/UserInterface/But_ChangeScene.tscn @@ -8,8 +8,5 @@ margin_bottom = 24.0 size_flags_vertical = 3 text = "New Game" script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} -[connection signal="button_up" from="." to="." method="_on_But_NewGame_button_up"] +[connection signal="button_up" from="." to="." method="_on_But_ChangeScene_button_up"]