Merge branch 'combine-hud-game' into 'main'
Combine hud with gameplay See merge request !32
Showing
- frontend/assets/Roboto-Black.ttf 0 additions, 0 deletionsfrontend/assets/Roboto-Black.ttf
- frontend/assets/Roboto-Regular.ttf 0 additions, 0 deletionsfrontend/assets/Roboto-Regular.ttf
- frontend/assets/gameplay-skin.atlas 96 additions, 0 deletionsfrontend/assets/gameplay-skin.atlas
- frontend/assets/gameplay-skin.json 92 additions, 0 deletionsfrontend/assets/gameplay-skin.json
- frontend/assets/gameplay-skin.png 0 additions, 0 deletionsfrontend/assets/gameplay-skin.png
- frontend/build.gradle 3 additions, 0 deletionsfrontend/build.gradle
- frontend/core/src/com/game/tankwars/ResourceManager.java 17 additions, 7 deletionsfrontend/core/src/com/game/tankwars/ResourceManager.java
- frontend/core/src/com/game/tankwars/TankWarsGame.java 11 additions, 0 deletionsfrontend/core/src/com/game/tankwars/TankWarsGame.java
- frontend/core/src/com/game/tankwars/controller/GameController.java 81 additions, 16 deletions...core/src/com/game/tankwars/controller/GameController.java
- frontend/core/src/com/game/tankwars/model/Tank.java 13 additions, 1 deletionfrontend/core/src/com/game/tankwars/model/Tank.java
- frontend/core/src/com/game/tankwars/model/Terrain.java 2 additions, 7 deletionsfrontend/core/src/com/game/tankwars/model/Terrain.java
- frontend/core/src/com/game/tankwars/view/GameHud.java 136 additions, 0 deletionsfrontend/core/src/com/game/tankwars/view/GameHud.java
- frontend/core/src/com/game/tankwars/view/GameScreen.java 33 additions, 11 deletionsfrontend/core/src/com/game/tankwars/view/GameScreen.java
- frontend/core/src/com/game/tankwars/view/LoginScreen.java 11 additions, 1 deletionfrontend/core/src/com/game/tankwars/view/LoginScreen.java
Loading
Please register or sign in to comment