Merge branch 'sound' into 'development' (36d419e8) · Commits · Scherbaum Maximilian / BattleArena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BattleArena
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

36d419e8

Commit 36d419e8 authored 1 year ago by Gehrung Jonas

Downloads
- Plain Diff

Merge branch 'sound' into 'development'

Sound: Music is playing, fuiyoh:

See merge request !30

parents e46752f8 89ccb222

No related branches found

Tags v0.2.0

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameState.java 1 addition, 0 deletions

.../hdm_stuttgart/battlearena/Controller/Enum/GameState.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 7 additions, 3 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java 3 additions, 7 deletions

src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java 13 additions, 5 deletions

...ava/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java 120 additions, 120 deletions

...a/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java 69 additions, 48 deletions

...de/hdm_stuttgart/battlearena/Model/Sound/MusicPlayer.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/SoundEffects.java 38 additions, 26 deletions

...e/hdm_stuttgart/battlearena/Model/Sound/SoundEffects.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Sound/SoundFileManager.java 39 additions, 0 deletions

...m_stuttgart/battlearena/Model/Sound/SoundFileManager.java

with 290 additions and 209 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment