Merge branch 'LocalGameplay' into 'development'
Merge LocalGameplay into Development See merge request !64
No related branches found
No related tags found
Checking pipeline status
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameOverController.java 18 additions, 0 deletions..._stuttgart/battlearena/Controller/GameOverController.java
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 32 additions, 12 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 1 addition, 1 deletion...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBomb.java 27 additions, 7 deletions...art/battlearena/Model/Entity/GameplayObjects/BigBomb.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java 22 additions, 11 deletions...ttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java 35 additions, 14 deletions...ava/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/SFX.java 4 additions, 4 deletions...in/java/de/hdm_stuttgart/battlearena/Model/Sound/SFX.java
- src/main/resources/fxml/GameOver.fxml 13 additions, 0 deletionssrc/main/resources/fxml/GameOver.fxml
- src/main/resources/player/appSettings.json 2 additions, 2 deletionssrc/main/resources/player/appSettings.json
- src/main/resources/sound/sfx/otSFX/bomb/Bomb3.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/bomb/Bomb3.wav
- src/main/resources/sound/sfx/otSFX/destruction/WoodDestruction.wav 0 additions, 0 deletions...resources/sound/sfx/otSFX/destruction/WoodDestruction.wav
- src/main/resources/sound/sfx/otSFX/dieSounds/body-falling-to-ground.mp3 0 additions, 0 deletions...rces/sound/sfx/otSFX/dieSounds/body-falling-to-ground.mp3
- src/main/resources/sound/sfx/otSFX/dieSounds/body-falling-to-ground.wav 0 additions, 0 deletions...rces/sound/sfx/otSFX/dieSounds/body-falling-to-ground.wav
- src/main/resources/sound/sfx/otSFX/powerups/drop-coins.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/powerups/drop-coins.wav
- src/main/resources/sound/sfx/otSFX/powerups/drop-coins2.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/powerups/drop-coins2.wav
- src/main/resources/sound/sfx/otSFX/powerups/powerup.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/powerups/powerup.wav
- src/main/resources/sound/sfx/otSFX/powerups/powerup2.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/powerups/powerup2.wav
- src/main/resources/styles/style.css 5 additions, 0 deletionssrc/main/resources/styles/style.css
- src/main/resources/textures/objects/big_bomb/bigBomb1.png 0 additions, 0 deletionssrc/main/resources/textures/objects/big_bomb/bigBomb1.png
- src/main/resources/textures/objects/big_bomb/bigBomb2.png 0 additions, 0 deletionssrc/main/resources/textures/objects/big_bomb/bigBomb2.png
Loading
Please register or sign in to comment