-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Team 1 - new projectile animations and mob balls merge to main #110
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
…ied tower.json and baseTowerConfigs
…ps-main # Conflicts: # source/core/src/main/com/csse3200/game/areas/ForestGameArea.java # source/core/src/main/com/csse3200/game/areas/terrain/TerrainFactory.java # source/core/src/main/com/csse3200/game/screens/MainGameScreen.java
… it was breaking somewhere
…Projectile which has parameters that accepts different effects and whether it is an aoe projectile or not
…procedure for a certain duration in order to apply knock-back on moving entities
…er types of entities
…ug at the moment where when one entity gets disposed, all other TNT_Towers lose their animation component
…function of Entity
…n't actually doing anything. Now uses PhysicsLayer to target.
…or single targeting projectiles. Also added a burn effect which does 5 extra ticks of the projectile damage over 5 seconds
…023-studio-3 into Team-1--Projectiles
19 tasks
19 tasks
BlairCannon97
approved these changes
Sep 7, 2023
meganroxburgh
approved these changes
Sep 7, 2023
19 tasks
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.
Hi there, please review our code carefully. We have added a new animation for the default projectiles, added changes from the Tower team, and changes from the map team. The map is now updated and will be clear and have bigger tile sizes. Finally, we've also added a new projectile which will be unique to general mobs. We have already incorporated these changes so once the merge is complete to main, mobs will be shooting out the new mob balls with an animation.