Merge branch 'ui' into 'development' (57e8394e) · Commits · Scherbaum Maximilian / BattleArena

Commit 57e8394e authored 1 year ago by Gehrung Jonas

Merge branch 'ui' into 'development'

# Conflicts:
#   src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java

parents ffb5a41d de03ede0

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 103 additions, 2 deletions

...stuttgart/battlearena/Controller/GameSceneController.java
src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java 6 additions, 0 deletions

src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java 69 additions, 0 deletions

..._stuttgart/battlearena/Model/Entity/CollisionHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EnemyHandler.java 78 additions, 2 deletions

.../hdm_stuttgart/battlearena/Model/Entity/EnemyHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityClass.java 8 additions, 0 deletions

...e/hdm_stuttgart/battlearena/Model/Entity/EntityClass.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityDirection.java 8 additions, 0 deletions

...m_stuttgart/battlearena/Model/Entity/EntityDirection.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java 27 additions, 0 deletions

...hdm_stuttgart/battlearena/Model/Entity/EntityFactory.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EntityType.java 6 additions, 0 deletions

...de/hdm_stuttgart/battlearena/Model/Entity/EntityType.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java 30 additions, 1 deletion

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

...ava/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Inputs/InputHandler.java 75 additions, 1 deletion

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

...e/hdm_stuttgart/battlearena/Model/Map/BackgroundTile.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/ITile.java 5 additions, 1 deletion

...in/java/de/hdm_stuttgart/battlearena/Model/Map/ITile.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileFactorie.java 0 additions, 10 deletions

.../de/hdm_stuttgart/battlearena/Model/Map/TileFactorie.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileFactory.java 25 additions, 0 deletions

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

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

...java/de/hdm_stuttgart/battlearena/Model/Map/TileType.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Client.java 51 additions, 0 deletions

...e/hdm_stuttgart/battlearena/Model/Multiplayer/Client.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java 79 additions, 1 deletion

...gart/battlearena/Model/Multiplayer/ConnectionHandler.java
src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/GameServer.java 0 additions, 10 deletions

...m_stuttgart/battlearena/Model/Multiplayer/GameServer.java

with 1020 additions and 33 deletions

Please register or to comment