Merge branch 'development' into 'ui-gameScene' (0b4c3b78) · Commits · Scherbaum Maximilian / BattleArena

Commit 0b4c3b78 authored 1 year ago by Tran Peter

Merge branch 'development' into 'ui-gameScene'

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java

parents 8afd90f3 6ba3f4aa

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.idea/misc.xml 2 additions, 1 deletion

.idea/misc.xml
src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 45 additions, 26 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 4 additions, 4 deletions

...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java 6 additions, 4 deletions

...hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBomb.java 166 additions, 0 deletions

...art/battlearena/Model/Entity/GameplayObjects/BigBomb.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBombItemFrame.java 163 additions, 0 deletions

...earena/Model/Entity/GameplayObjects/BigBombItemFrame.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BlastUpItemFrame.java 162 additions, 0 deletions

...earena/Model/Entity/GameplayObjects/BlastUpItemFrame.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java 16 additions, 8 deletions

...ttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Explosion.java 44 additions, 12 deletions

...t/battlearena/Model/Entity/GameplayObjects/Explosion.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java 2 additions, 2 deletions

...tgart/battlearena/Model/Entity/GameplayObjects/Heart.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/ObjectType.java 3 additions, 0 deletions

.../battlearena/Model/Entity/GameplayObjects/ObjectType.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java 2 additions, 2 deletions

...va/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java 2 additions, 2 deletions

..._stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java 253 additions, 96 deletions

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

...a/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java
src/main/resources/textures/map/bomberman/building/BlackBrick.png 0 additions, 0 deletions

.../resources/textures/map/bomberman/building/BlackBrick.png
src/main/resources/textures/map/bomberman/building/Brick.png 0 additions, 0 deletions

src/main/resources/textures/map/bomberman/building/Brick.png
src/main/resources/textures/map/bomberman/building/DarkMossyOldBrick.png 0 additions, 0 deletions

...ces/textures/map/bomberman/building/DarkMossyOldBrick.png
src/main/resources/textures/map/bomberman/building/GrassBrick.png 0 additions, 0 deletions

.../resources/textures/map/bomberman/building/GrassBrick.png
src/main/resources/textures/map/bomberman/building/MoreMossyOldBrick.png 0 additions, 0 deletions

...ces/textures/map/bomberman/building/MoreMossyOldBrick.png

with 1054 additions and 340 deletions

Please register or to comment