(#18): merge combine-hud-game into main, fix conflicts
No related branches found
No related tags found
Showing
- backend/src/index.ts 23 additions, 7 deletionsbackend/src/index.ts
- backend/types/User.ts 1 addition, 0 deletionsbackend/types/User.ts
- frontend/android/AndroidManifest.xml 1 addition, 1 deletionfrontend/android/AndroidManifest.xml
- frontend/assets/menu-textures.atlas 7 additions, 0 deletionsfrontend/assets/menu-textures.atlas
- frontend/assets/menu-textures.png 0 additions, 0 deletionsfrontend/assets/menu-textures.png
- frontend/core/src/com/game/tankwars/ReceiverHandler.java 1 addition, 0 deletionsfrontend/core/src/com/game/tankwars/ReceiverHandler.java
- frontend/core/src/com/game/tankwars/TankWarsGame.java 2 additions, 6 deletionsfrontend/core/src/com/game/tankwars/TankWarsGame.java
- frontend/core/src/com/game/tankwars/controller/GameController.java 4 additions, 4 deletions...core/src/com/game/tankwars/controller/GameController.java
- frontend/core/src/com/game/tankwars/controller/LeaderboardController.java 2 additions, 2 deletions...c/com/game/tankwars/controller/LeaderboardController.java
- frontend/core/src/com/game/tankwars/controller/LoginController.java 64 additions, 17 deletions...ore/src/com/game/tankwars/controller/LoginController.java
- frontend/core/src/com/game/tankwars/controller/MainMenuController.java 64 additions, 44 deletions.../src/com/game/tankwars/controller/MainMenuController.java
- frontend/core/src/com/game/tankwars/model/CurrentUser.java 28 additions, 0 deletionsfrontend/core/src/com/game/tankwars/model/CurrentUser.java
- frontend/core/src/com/game/tankwars/model/Tank.java 19 additions, 2 deletionsfrontend/core/src/com/game/tankwars/model/Tank.java
- frontend/core/src/com/game/tankwars/model/User.java 0 additions, 9 deletionsfrontend/core/src/com/game/tankwars/model/User.java
- frontend/core/src/com/game/tankwars/view/GameScreen.java 48 additions, 18 deletionsfrontend/core/src/com/game/tankwars/view/GameScreen.java
- frontend/core/src/com/game/tankwars/view/LoginScreen.java 13 additions, 3 deletionsfrontend/core/src/com/game/tankwars/view/LoginScreen.java
- frontend/core/src/com/game/tankwars/view/MainMenuScreen.java 78 additions, 91 deletionsfrontend/core/src/com/game/tankwars/view/MainMenuScreen.java
Loading
Please register or sign in to comment