Merge _02devParker into main (Battle scene overhaul + dungeonLoop -> battle scene transitions)#31
Open
Merge _02devParker into main (Battle scene overhaul + dungeonLoop -> battle scene transitions)#31
Conversation
Added a 'GameManager' object in the dungeon scene that defines functions for additive loading of the 'battle' scene! Also handles disabling/re-enabling everything in the dungeon scene when returning to it after combat.
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
1 participant
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.
The main conflict is how I made an empty game object in the "dungeonLoop" scene to be the parent of all other objects in that scene! This was to be able to disable all game objects in the dungeon scene when the battle scene is loaded with the additive flag overtop of the dungeon, and then to enable them again when the battle is over.
Take a look at this implementation and tell me if I'm stupid or if there is a better way to do this, worst comes to worst I can just remove this to merge my branch and then set it up again in main/change it to work a different way!