Merge branch 'development' into ui
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java 1 addition, 1 deletion...hdm_stuttgart/battlearena/Controller/IntroController.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java 4 additions, 0 deletions...ttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java 1 addition, 1 deletion...ava/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java 1 addition, 1 deletion...de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/SFX.java 19 additions, 6 deletions...in/java/de/hdm_stuttgart/battlearena/Model/Sound/SFX.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/SoundEffects.java 1 addition, 1 deletion...e/hdm_stuttgart/battlearena/Model/Sound/SoundEffects.java
- src/main/resources/maps/coreMaps.json 9 additions, 9 deletionssrc/main/resources/maps/coreMaps.json
- src/main/resources/sound/sfx/otSFX/attack/Sword_hit1.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/attack/Sword_hit1.wav
- src/main/resources/sound/sfx/otSFX/attack/Sword_swing.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/attack/Sword_swing.wav
- src/main/resources/sound/sfx/otSFX/bomb/Bomb2.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/bomb/Bomb2.wav
- src/main/resources/sound/sfx/otSFX/bomb/Fuse.wav 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/bomb/Fuse.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/explosion.mp3 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/explosion.mp3
- src/main/resources/sound/sfx/otSFX/powerups/drop-coins.mp3 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/powerups/drop-coins.mp3
- src/main/resources/sound/sfx/otSFX/powerups/powerup.mp3 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/powerups/powerup.mp3
- src/main/resources/sound/sfx/otSFX/sword-hit.mp3 0 additions, 0 deletionssrc/main/resources/sound/sfx/otSFX/sword-hit.mp3
- src/main/resources/videos/DigitalGlitch.mp4 0 additions, 0 deletionssrc/main/resources/videos/DigitalGlitch.mp4
- src/main/resources/videos/EngineIntro.mp4 0 additions, 0 deletionssrc/main/resources/videos/EngineIntro.mp4
Loading
Please register or sign in to comment