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

Commit f1bc80db authored 1 year ago by Scherbaum Maximilian

Merge branch 'LocalGameplay' into 'development'

Merge LocalGameplay into development

See merge request !52

parents 7d073296 d94d9547

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 13 additions, 4 deletions

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

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

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

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

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

...rena/Model/Entity/GameplayObjects/BlastDownItemFrame.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BlastUpItemFrame.java 15 additions, 13 deletions

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

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

...rena/Model/Entity/GameplayObjects/BombClockItemFrame.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Explosion.java 10 additions, 19 deletions

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

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

...gart/battlearena/Model/Entity/GameplayObjects/Marker.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/ObjectType.java 5 additions, 1 deletion

.../battlearena/Model/Entity/GameplayObjects/ObjectType.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/TeleportationItemFrame.java 162 additions, 0 deletions

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

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

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

...ava/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java 1 addition, 0 deletions

...a/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java
src/main/resources/textures/objects/itemFrames/AmogUsDown.png 0 additions, 0 deletions

...main/resources/textures/objects/itemFrames/AmogUsDown.png
src/main/resources/textures/objects/itemFrames/AmogUsMiddle.png 0 additions, 0 deletions

...in/resources/textures/objects/itemFrames/AmogUsMiddle.png

with 1338 additions and 259 deletions

Please register or to comment