-
- Downloads
#Fixes merge conflics
No related branches found
No related tags found
Showing
- backend/api/games.js 17 additions, 9 deletionsbackend/api/games.js
- frontend/android/assets/Number1.png 0 additions, 0 deletionsfrontend/android/assets/Number1.png
- frontend/android/assets/Number2.png 0 additions, 0 deletionsfrontend/android/assets/Number2.png
- frontend/android/assets/Number3.png 0 additions, 0 deletionsfrontend/android/assets/Number3.png
- frontend/android/assets/SlicingVisualEffect.png 0 additions, 0 deletionsfrontend/android/assets/SlicingVisualEffect.png
- frontend/core/src/com/gameware/game/GameWare.java 8 additions, 8 deletionsfrontend/core/src/com/gameware/game/GameWare.java
- frontend/core/src/com/gameware/game/QueryIntermediate.java 2 additions, 12 deletionsfrontend/core/src/com/gameware/game/QueryIntermediate.java
- frontend/core/src/com/gameware/game/models/Game.java 8 additions, 2 deletionsfrontend/core/src/com/gameware/game/models/Game.java
- frontend/core/src/com/gameware/game/sprites/Animation.java 0 additions, 43 deletionsfrontend/core/src/com/gameware/game/sprites/Animation.java
- frontend/core/src/com/gameware/game/sprites/Bubble.java 3 additions, 7 deletionsfrontend/core/src/com/gameware/game/sprites/Bubble.java
- frontend/core/src/com/gameware/game/sprites/ColorRushButton.java 1 addition, 5 deletions...d/core/src/com/gameware/game/sprites/ColorRushButton.java
- frontend/core/src/com/gameware/game/sprites/ColorRushTarget.java 1 addition, 4 deletions...d/core/src/com/gameware/game/sprites/ColorRushTarget.java
- frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java 0 additions, 3 deletions...d/core/src/com/gameware/game/sprites/ConfirmationBox.java
- frontend/core/src/com/gameware/game/sprites/PauseButton.java 0 additions, 3 deletionsfrontend/core/src/com/gameware/game/sprites/PauseButton.java
- frontend/core/src/com/gameware/game/sprites/PauseCircle.java 0 additions, 1 deletionfrontend/core/src/com/gameware/game/sprites/PauseCircle.java
- frontend/core/src/com/gameware/game/sprites/PauseMenuButton.java 0 additions, 2 deletions...d/core/src/com/gameware/game/sprites/PauseMenuButton.java
- frontend/core/src/com/gameware/game/sprites/SlicingCircle.java 48 additions, 0 deletions...end/core/src/com/gameware/game/sprites/SlicingCircle.java
- frontend/core/src/com/gameware/game/states/BubbleWrapState.java 10 additions, 33 deletions...nd/core/src/com/gameware/game/states/BubbleWrapState.java
- frontend/core/src/com/gameware/game/states/ColorRushState.java 4 additions, 30 deletions...end/core/src/com/gameware/game/states/ColorRushState.java
- frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java 7 additions, 7 deletions...c/com/gameware/game/states/CreateJoinTournamentState.java
Loading
Please register or sign in to comment