Merge branch 'feature-pursuit_devel' into 'feature-pursuit' (614af15f) · Commits · labs / Tablexia

Commit 614af15f authored 9 years ago by

Matyáš Latner

Merge branch 'feature-pursuit_devel' into 'feature-pursuit'

Feature pursuit devel

See merge request !50

parents 71d5b930 98b549be

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

android/assets/text/game/nightwatch/night_watch_cs.properties~ 0 additions, 8 deletions

...id/assets/text/game/nightwatch/night_watch_cs.properties~
android/assets/text/game/pursuit/pursuit_cs.properties 8 additions, 0 deletions

android/assets/text/game/pursuit/pursuit_cs.properties
android/assets/text/game/pursuit/pursuit_de.properties 5 additions, 0 deletions

android/assets/text/game/pursuit/pursuit_de.properties
android/assets/text/game/pursuit/pursuit_sk.properties 5 additions, 0 deletions

android/assets/text/game/pursuit/pursuit_sk.properties
core/src/cz/nic/tablexia/game/games/night_watch/NightWatchGame.java 0 additions, 2 deletions

...z/nic/tablexia/game/games/night_watch/NightWatchGame.java
core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java 136 additions, 38 deletions

core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
core/src/cz/nic/tablexia/game/games/pursuit/action/MovePieceToPosition.java 29 additions, 0 deletions

...blexia/game/games/pursuit/action/MovePieceToPosition.java
core/src/cz/nic/tablexia/game/games/pursuit/action/RotateAndMovePieceInPosition.java 31 additions, 0 deletions

...me/games/pursuit/action/RotateAndMovePieceInPosition.java
core/src/cz/nic/tablexia/game/games/pursuit/action/RotatePieceToClosestAngle.java 32 additions, 0 deletions

.../game/games/pursuit/action/RotatePieceToClosestAngle.java
core/src/cz/nic/tablexia/game/games/pursuit/action/SwitchPiecesAction.java 26 additions, 0 deletions

...ablexia/game/games/pursuit/action/SwitchPiecesAction.java
core/src/cz/nic/tablexia/game/games/pursuit/assets/PursuitAssets.java 3 additions, 0 deletions

...nic/tablexia/game/games/pursuit/assets/PursuitAssets.java
core/src/cz/nic/tablexia/game/games/pursuit/helper/ArithmeticsHelper.java 40 additions, 13 deletions

...tablexia/game/games/pursuit/helper/ArithmeticsHelper.java
core/src/cz/nic/tablexia/game/games/pursuit/helper/TextureHelper.java 43 additions, 5 deletions

...nic/tablexia/game/games/pursuit/helper/TextureHelper.java
core/src/cz/nic/tablexia/game/games/pursuit/listener/VehicleDragListener.java 93 additions, 0 deletions

...exia/game/games/pursuit/listener/VehicleDragListener.java
core/src/cz/nic/tablexia/game/games/pursuit/model/Grid.java 253 additions, 0 deletions

core/src/cz/nic/tablexia/game/games/pursuit/model/Grid.java
core/src/cz/nic/tablexia/game/games/pursuit/model/Maps.java 44 additions, 0 deletions

core/src/cz/nic/tablexia/game/games/pursuit/model/Maps.java
core/src/cz/nic/tablexia/game/games/pursuit/model/Point.java 21 additions, 0 deletions

core/src/cz/nic/tablexia/game/games/pursuit/model/Point.java
core/src/cz/nic/tablexia/game/games/pursuit/model/PuzzlePiece.java 49 additions, 0 deletions

...cz/nic/tablexia/game/games/pursuit/model/PuzzlePiece.java
core/src/cz/nic/tablexia/game/games/pursuit/model/RotatedAndDraggedImage.java 39 additions, 0 deletions

...exia/game/games/pursuit/model/RotatedAndDraggedImage.java
core/src/cz/nic/tablexia/game/games/pursuit/model/Vehicle.java 19 additions, 0 deletions

...src/cz/nic/tablexia/game/games/pursuit/model/Vehicle.java

with 876 additions and 66 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'feature-pursuit_devel' into 'feature-pursuit'