qinchuanhui
commented
1 year ago plz resolve the conflicts first; u can refer to https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
tangzhanshuo
https://github.com/Yao-class-cpp-studio/battle_game/issues/450 Added a new projectile type Circle: Creates a colored circle on screen, and continously damages anything outside of it. Also added a tank that spawns circles for testing purposes.
Also, my previous pull request (https://github.com/Yao-class-cpp-studio/battle_game/pull/169) is also a solution to https://github.com/Yao-class-cpp-studio/battle_game/issues/390.