Ignore#30
Open
BritoEspNya wants to merge 82 commits into
Open
Conversation
Solo hago este commit para poder hacer el merge c: los archivos subidos no son importantes
Reutilicé el código main.gd
Introduce MatchController Node to centralize match lifecycle and UI transitions. Adds MatchState enum, state_changed signal, and timers/shop UI references; implements setup, start_match, start_round, enter_shop, exit_shop, end_match and change_state methods. Connects round and shop timers in _ready and toggles gameplay on players/balls via set_gameplay_enabled. Includes UID file for the new scene script.
Refactor main.gd to spawn players and balls via a new _spawn_match_entities() helper, storing spawned instances in player_instances and ball_instances arrays. Add a match_controller onready var and a _setup_match_controller() method to initialize it with the spawned entities. Update match_scene.tscn to include Players and Balls container nodes, a ShopScreen UI instance, RoundTimer and ShopTimer nodes, and a MatchController node with its script resource.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
H2 + shop + fixes to date