-
- Downloads
Merge branch 'master' into LevelEditor
# Conflicts: # src/de/brickedleveleditor/ui/controller/MainController.java
Showing
- bin/de/bricked/main/_de.properties 1 addition, 0 deletionsbin/de/bricked/main/_de.properties
- bin/de/bricked/ui/LevelGUI.fxml 4 additions, 4 deletionsbin/de/bricked/ui/LevelGUI.fxml
- bin/de/brickedleveleditor/main/_de.properties 5 additions, 0 deletionsbin/de/brickedleveleditor/main/_de.properties
- bin/de/brickedleveleditor/ui/GUI.fxml 42 additions, 0 deletionsbin/de/brickedleveleditor/ui/GUI.fxml
- src/de/bricked/game/Game.java 8 additions, 15 deletionssrc/de/bricked/game/Game.java
- src/de/bricked/game/powerups/ExtraLifePowerUp.java 2 additions, 2 deletionssrc/de/bricked/game/powerups/ExtraLifePowerUp.java
- src/de/bricked/game/powerups/PowerUpType.java 38 additions, 14 deletionssrc/de/bricked/game/powerups/PowerUpType.java
- src/de/bricked/game/powerups/ball/ExplodeBallPowerUp.java 1 addition, 1 deletionsrc/de/bricked/game/powerups/ball/ExplodeBallPowerUp.java
- src/de/bricked/game/powerups/ball/NoCollisionBallPowerUp.java 1 addition, 1 deletion...de/bricked/game/powerups/ball/NoCollisionBallPowerUp.java
- src/de/bricked/main/_de.properties 1 addition, 0 deletionssrc/de/bricked/main/_de.properties
- src/de/bricked/ui/LevelController.java 89 additions, 41 deletionssrc/de/bricked/ui/LevelController.java
- src/de/bricked/ui/LevelGUI.fxml 4 additions, 4 deletionssrc/de/bricked/ui/LevelGUI.fxml
- src/de/bricked/utils/CountdownTimer.java 37 additions, 6 deletionssrc/de/bricked/utils/CountdownTimer.java
- src/de/brickedleveleditor/ui/BrickLabel.java 3 additions, 3 deletionssrc/de/brickedleveleditor/ui/BrickLabel.java
- src/de/brickedleveleditor/ui/controller/MainController.java 7 additions, 10 deletionssrc/de/brickedleveleditor/ui/controller/MainController.java
Loading
Please register or sign in to comment