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

Commit 1b694101 authored 1 year ago by Scherbaum Maximilian

Merge branch 'LocalGameplay' into 'development'

merge LokalGameplay into development

See merge request !12

parents 6d25a58f 1b5d8eca

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameMode.java 6 additions, 0 deletions

...e/hdm_stuttgart/battlearena/Controller/Enum/GameMode.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/GameState.java 9 additions, 0 deletions

.../hdm_stuttgart/battlearena/Controller/Enum/GameState.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/Enum/PlayerMode.java 6 additions, 0 deletions

...hdm_stuttgart/battlearena/Controller/Enum/PlayerMode.java
src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 30 additions, 6 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 42 additions, 1 deletion

...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/EntityType.java 2 additions, 1 deletion

...de/hdm_stuttgart/battlearena/Model/Entity/EntityType.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 16 additions, 5 deletions

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

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

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

...e/hdm_stuttgart/battlearena/Model/Map/BackgroundTile.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/ITile.java 1 addition, 0 deletions

...in/java/de/hdm_stuttgart/battlearena/Model/Map/ITile.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java 13 additions, 7 deletions

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

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

...java/de/hdm_stuttgart/battlearena/Model/Map/TileType.java
src/main/resources/textures/map/finalheart.png 0 additions, 0 deletions

src/main/resources/textures/map/finalheart.png
src/main/resources/textures/player/high_born/HighBornDown00.png 0 additions, 0 deletions

...in/resources/textures/player/high_born/HighBornDown00.png
src/main/resources/textures/player/high_born/HighBornDown01.png 0 additions, 0 deletions

...in/resources/textures/player/high_born/HighBornDown01.png
src/main/resources/textures/player/human/HumanDown00.png 0 additions, 0 deletions

src/main/resources/textures/player/human/HumanDown00.png

with 434 additions and 120 deletions

Please register or to comment