Merge branch 'development' into ui-gameScene
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/Persistence.java 26 additions, 25 deletions...rt/battlearena/Model/DataStorage/Classes/Persistence.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 43 additions, 14 deletions...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql 5 additions, 5 deletions...tlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql 5 additions, 5 deletions...ttlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java 4 additions, 4 deletions..._stuttgart/battlearena/Model/Entity/CollisionHandler.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 149 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 146 additions, 54 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 3 additions, 1 deletionsrc/main/java/module-info.java
Loading
Please register or sign in to comment