Commit 7894b4ca authored 4 years ago by morkolai

resolved merge conflicts from merge with default-game

parents b29a247a 5e4090d7

Branches

No related tags found

1 merge request!14WIP: Default game

Show whitespace changes

Inline Side-by-side

Showing

CheckersClient/android/assets/Game/1x/StarBackground1x.png 0 additions, 0 deletions

CheckersClient/android/assets/Game/1x/StarBackground1x.png
CheckersClient/core/src/com/mygdx/game/Constants.java 16 additions, 0 deletions

CheckersClient/core/src/com/mygdx/game/Constants.java
CheckersClient/core/src/com/mygdx/game/UniCheckersClient.java 3 additions, 18 deletions

...kersClient/core/src/com/mygdx/game/UniCheckersClient.java
CheckersClient/core/src/com/mygdx/game/controllers/GameController.java 58 additions, 13 deletions

...t/core/src/com/mygdx/game/controllers/GameController.java
CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java 4 additions, 1 deletion

...ore/src/com/mygdx/game/controllers/NetworkController.java
CheckersClient/core/src/com/mygdx/game/controllers/PlayerController.java 7 additions, 1 deletion

...core/src/com/mygdx/game/controllers/PlayerController.java
CheckersClient/core/src/com/mygdx/game/controllers/commands/cPlayerPieceMove.java 35 additions, 3 deletions

...com/mygdx/game/controllers/commands/cPlayerPieceMove.java
CheckersClient/core/src/com/mygdx/game/model/Game.kt 88 additions, 19 deletions

CheckersClient/core/src/com/mygdx/game/model/Game.kt
CheckersClient/core/src/com/mygdx/game/model/GameMode.kt 6 additions, 6 deletions

CheckersClient/core/src/com/mygdx/game/model/GameMode.kt
CheckersClient/core/src/com/mygdx/game/model/GameState.kt 17 additions, 26 deletions

CheckersClient/core/src/com/mygdx/game/model/GameState.kt
CheckersClient/core/src/com/mygdx/game/model/Lobby.java 3 additions, 2 deletions

CheckersClient/core/src/com/mygdx/game/model/Lobby.java
CheckersClient/core/src/com/mygdx/game/model/Lobby.kt 2 additions, 1 deletion

CheckersClient/core/src/com/mygdx/game/model/Lobby.kt
CheckersClient/core/src/com/mygdx/game/model/Piece.kt 5 additions, 10 deletions

CheckersClient/core/src/com/mygdx/game/model/Piece.kt
CheckersClient/core/src/com/mygdx/game/model/gamemodes/boards/AbstractBoard.kt 1 addition, 1 deletion

...rc/com/mygdx/game/model/gamemodes/boards/AbstractBoard.kt
CheckersClient/core/src/com/mygdx/game/model/gamemodes/boards/DefaultBoard.kt 5 additions, 5 deletions

...src/com/mygdx/game/model/gamemodes/boards/DefaultBoard.kt
CheckersClient/core/src/com/mygdx/game/model/gamemodes/rules/AbstractRules.kt 7 additions, 3 deletions

...src/com/mygdx/game/model/gamemodes/rules/AbstractRules.kt
CheckersClient/core/src/com/mygdx/game/model/gamemodes/rules/DefaultRules.kt 82 additions, 37 deletions

.../src/com/mygdx/game/model/gamemodes/rules/DefaultRules.kt
CheckersClient/core/src/com/mygdx/game/views/CinematicView.java 19 additions, 5 deletions

...rsClient/core/src/com/mygdx/game/views/CinematicView.java
CheckersClient/core/src/com/mygdx/game/views/Constants.java 0 additions, 7 deletions

CheckersClient/core/src/com/mygdx/game/views/Constants.java
CheckersClient/core/src/com/mygdx/game/views/LobbyView.java 16 additions, 11 deletions

CheckersClient/core/src/com/mygdx/game/views/LobbyView.java

with 374 additions and 169 deletions

Please register or to comment