Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tablexia
- Activity
- Members
- Wiki
- Releases
- Model registry

Snippets Groups Projects

Admin message

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

6aca2679

Commit 6aca2679 authored 8 years ago by Matyáš Latner

Downloads
- Plain Diff

Merge branch 'feature-shootingrange' into 'V3.2.1'

#394 Fixed wrong carousel and watch position after animation.



See merge request !368

parents 780e94cd fafaee04

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

android/assets/text/application/application_cs.properties 1 addition, 1 deletion

android/assets/text/application/application_cs.properties
android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 6 additions, 8 deletions

...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
core/external 1 addition, 1 deletion

core/external
core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeGame.java 31 additions, 27 deletions

...tablexia/game/games/shooting_range/ShootingRangeGame.java
core/src/cz/nic/tablexia/game/games/shooting_range/actors/Row.java 8 additions, 4 deletions

...cz/nic/tablexia/game/games/shooting_range/actors/Row.java
core/src/cz/nic/tablexia/game/games/shooting_range/tools/TargetPositionController.java 6 additions, 11 deletions

.../games/shooting_range/tools/TargetPositionController.java
core/src/cz/nic/tablexia/model/game/GameDAO.java 18 additions, 5 deletions

core/src/cz/nic/tablexia/model/game/GameDAO.java
core/src/cz/nic/tablexia/model/game/UserTrophy.java 1 addition, 1 deletion

core/src/cz/nic/tablexia/model/game/UserTrophy.java
core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java 1 addition, 1 deletion

...c/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java

with 73 additions and 59 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment