Merge branch 'development' into 'ui'
# Conflicts: # src/main/resources/maps/coreMaps.json
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 1 addition, 19 deletions...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java 1 addition, 1 deletion...ttlearena/Model/DataStorage/Classes/Utilities/Parser.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java 5 additions, 5 deletions...a/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java 169 additions, 6 deletions...gart/battlearena/Model/Multiplayer/ConnectionHandler.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java 36 additions, 12 deletions...e/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java
- src/main/resources/maps/coreMaps.json 52 additions, 3 deletionssrc/main/resources/maps/coreMaps.json
- src/main/resources/textures/map/grass_biom/building/StoneBriddleStone.png 0 additions, 0 deletions...es/textures/map/grass_biom/building/StoneBriddleStone.png
- src/main/resources/textures/map/grass_biom/ground/GrassPathCrossway.png 0 additions, 0 deletions...rces/textures/map/grass_biom/ground/GrassPathCrossway.png
- src/main/resources/textures/map/grass_biom/ground/GrassPathHorizontal.png 0 additions, 0 deletions...es/textures/map/grass_biom/ground/GrassPathHorizontal.png
- src/main/resources/textures/map/grass_biom/ground/GrassStoneRemains.png 0 additions, 0 deletions...rces/textures/map/grass_biom/ground/GrassStoneRemains.png
- src/main/resources/textures/map/grass_biom/objects/Crate.png 0 additions, 0 deletionssrc/main/resources/textures/map/grass_biom/objects/Crate.png
- src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java 3 additions, 3 deletions...arena/Model/DataStorage/Classes/Utilities/ParserTest.java
Loading
Please register or sign in to comment