Merged
Conversation
…o dev # Conflicts: # Assets/Prefabs/Chicken.prefab
like me.
And other organizational stuff done.
- added UI elements - added method to subtract health
- added way to heal (currently set to button - Q (testing)) - added restart when health reduced to 0 hp
Now we have one script attached to chicken. Important note: fix audio, because it was overwhelming for me D :
Added collectibles + counters
- fixed health issue - code visibility update - added prefabs for hearts and diamonds
# Conflicts: # Assets/Scenes/Levels/Level8.unity
…o dev # Conflicts: # Assets/Scenes/Levels/Level4.unity # Assets/Scenes/Levels/Level6.unity
…o dev # Conflicts: # Assets/Scenes/Levels/Level4.unity
# Conflicts: # UserSettings/Layouts/default-2021.dwlt
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
7 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.
No description provided.