Skip to content
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
merged 55 commits into from
Sep 7, 2023

Conversation

MiniSoda17
Copy link
Contributor

@MiniSoda17 MiniSoda17 commented Sep 7, 2023

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.

Gaganx0 and others added 30 commits September 2, 2023 23:11
…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
…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
…ug at the moment where when one entity gets disposed, all other TNT_Towers lose their animation component
…n't actually doing anything. Now uses PhysicsLayer to target.
@MiniSoda17 MiniSoda17 added this to the Sprint 2 milestone Sep 7, 2023
@MiniSoda17 MiniSoda17 linked an issue Sep 7, 2023 that may be closed by this pull request
19 tasks
@MiniSoda17 MiniSoda17 removed a link to an issue Sep 7, 2023
19 tasks
@meganroxburgh meganroxburgh merged commit 37222ae into main Sep 7, 2023
@MiniSoda17 MiniSoda17 linked an issue Sep 11, 2023 that may be closed by this pull request
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

[Team 1] Projectile animations