Merge branch 'player' into 'development'
merging player for integration testing See merge request !3
Showing
- src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java 60 additions, 2 deletions...stuttgart/battlearena/Controller/GameSceneController.java
- src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java 7 additions, 1 deletionsrc/main/java/de/hdm_stuttgart/battlearena/Main/Main.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/CollisionHandler.java 27 additions, 0 deletions..._stuttgart/battlearena/Model/Entity/CollisionHandler.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/EnemyHandler.java 60 additions, 2 deletions.../hdm_stuttgart/battlearena/Model/Entity/EnemyHandler.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 26 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 24 additions, 1 deletion...va/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java
- src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java 265 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/module-info.java 2 additions, 0 deletionssrc/main/java/module-info.java
- src/main/resources/fxml/GameScene.fxml 9 additions, 1 deletionsrc/main/resources/fxml/GameScene.fxml
- src/main/resources/textures/player/downOne.png 0 additions, 0 deletionssrc/main/resources/textures/player/downOne.png
- src/main/resources/textures/player/downTwo.png 0 additions, 0 deletionssrc/main/resources/textures/player/downTwo.png
- src/main/resources/textures/player/leftOne.png 0 additions, 0 deletionssrc/main/resources/textures/player/leftOne.png
- src/main/resources/textures/player/leftTwo.png 0 additions, 0 deletionssrc/main/resources/textures/player/leftTwo.png
- src/main/resources/textures/player/rightOne.png 0 additions, 0 deletionssrc/main/resources/textures/player/rightOne.png
- src/main/resources/textures/player/rightTwo.png 0 additions, 0 deletionssrc/main/resources/textures/player/rightTwo.png
- src/main/resources/textures/player/upOne.png 0 additions, 0 deletionssrc/main/resources/textures/player/upOne.png
- src/main/resources/textures/player/upTwo.png 0 additions, 0 deletionssrc/main/resources/textures/player/upTwo.png
Loading
Please register or sign in to comment