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 5] Turret Selection, Game End, Further improvements to Economy #153

Closed
wants to merge 36 commits into from

Conversation

Hasakev
Copy link
Contributor

@Hasakev Hasakev commented Sep 12, 2023

[Team 5] Turret Selection, Game End, Further improvements to Economy

Here is a summary added in the pull request:

Tests

We conducted test plans for our screens these are here:

ThivanW and others added 30 commits September 9, 2023 22:13
…tack,charging energy,walk,idle,hurt,attack2 and created a long range projectile attack which targets engineers
Copy link
Contributor

@MiniSoda17 MiniSoda17 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi there, there seem to be a lot of random deletions within this pull request. There are 1000 additions and 3000 deletions. A lot of files are being deleted like all the images from projectiles and animation controllers for the projectiles. Please fix these changes first before merging to main!!!!! Don't delete our stuff please!!!

Copy link
Contributor

@The-AhmadAA The-AhmadAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same feedback as @MiniSoda17 , please fix deletions before merging. Have you pulled from main before attempting this merge?

…studio-3 into Team-5--Economy"

This reverts commit 04234d8, reversing
changes made to db07558.
@Hasakev Hasakev closed this Sep 12, 2023
@ryandmcneilly ryandmcneilly deleted the Team-5--Economy branch September 28, 2023 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.