DevelopmentBranch #99
Merged
Conversation
This file contains 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
…into Level_4_nickm
got level 5 to run correctly working on other levels
Fixed levels that where broken due to incorrect game controller
# Conflicts: # uot/Assets/_Scenes/Level_05.unity
…into Level_02_Gerard
…into Level_02_Gerard
…into Level_02_Gerard
# Conflicts: # uot/Assets/_Scenes/Level_05.unity # uot/Assets/_Scripts/DestroyScripts/DestroyByContact.cs
Level one is fully complete. All the other levels just use a generic wave spawn and boss wave to test the game progression.
Level 01 BeatsPerMinute
Just a minor adjustment on the GUI text
Offline game play mode had a bug, Respawn(). This bug is now fixed. The level one is completed now when the song is done playing instead of keeping a rhythm count.
Level 01 BeatsPerMinute
Had the collider off for testing, forgot to turn it back on
Bug found in re spawn. bug fixed, background updated in lvl 1
Level 01 BeatsPerMinute
- Created new models for wingmen - New Materials for wingmen prefab - Update DestroyByContact.cs to reflect wingmen instances - Create navmesh for wingmen movement ai - Create WingmenMovement.cs ai script - Create WeaponControllerWingman.cs script for firing
comet script and prefab
…into Level_4_Nickm
Level 4 nickm
…erMinute"" This reverts commit a943b6b.
…into Level_4_Nickm
Level 01 BeatsPerMinute
Merge remote-tracking branch 'refs/remotes/origin/DevelopmentBranch' into Level_02_Gerard
…into Level_4_Nickm # Conflicts: # uot/Assets/_Scenes/Level_04.unity
Level 4 nickm
Level_05 had the buggy boundary from the tutorial still so I replaced it with our boundary
Level 01 BeatsPerMinute
|
Tested the dev branch before merging, everything looks good. |
dsalopek
approved these changes
Apr 1, 2017
|
I agree looking good. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Attempting to pull into master to show everyones contributions