Merge branch 'LocalGameplay' into 'development' (2946682a) · Commits · Scherbaum Maximilian / BattleArena

Commit 2946682a authored 1 year ago by Scherbaum Maximilian

Merge branch 'LocalGameplay' into 'development'

Gameplay update

See merge request !22

parents 31710634 e41ae4c5

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 75 additions, 27 deletions

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

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

...hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Explosion.java 119 additions, 0 deletions

.../de/hdm_stuttgart/battlearena/Model/Entity/Explosion.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java 150 additions, 0 deletions

...ttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java 127 additions, 0 deletions

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

...attlearena/Model/Entity/GameplayObjects/ObjectStatus.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/ObjectType.java 8 additions, 0 deletions

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

...va/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java 23 additions, 1 deletion

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

...ava/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Inputs/InputHandler.java 41 additions, 8 deletions

.../hdm_stuttgart/battlearena/Model/Inputs/InputHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/Biom.java 8 additions, 0 deletions

...ain/java/de/hdm_stuttgart/battlearena/Model/Map/Biom.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java 9 additions, 9 deletions

...a/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java 275 additions, 17 deletions

...a/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java
src/main/java/module-info.java 4 additions, 1 deletion

src/main/java/module-info.java
src/main/resources/textures/map/NoTexture.png 0 additions, 0 deletions

src/main/resources/textures/map/NoTexture.png
src/main/resources/textures/map/bomberman/building/StoneBombLand00.png 0 additions, 0 deletions

...urces/textures/map/bomberman/building/StoneBombLand00.png
src/main/resources/textures/map/bomberman/building/StoneBombLand01.png 0 additions, 0 deletions

...urces/textures/map/bomberman/building/StoneBombLand01.png
src/main/resources/textures/map/bomberman/building/box.png 0 additions, 0 deletions

src/main/resources/textures/map/bomberman/building/box.png

with 1059 additions and 130 deletions

Please register or to comment