Merge branch 'feature-pursuit' into feature-pursuit_devel
Conflicts: core/src/cz/nic/tablexia/TablexiaSettings.java
No related branches found
No related tags found
Showing
- android/assets/text/game/shootingrange/shootingrange_cs.properties 10 additions, 0 deletions...ssets/text/game/shootingrange/shootingrange_cs.properties
- android/assets/text/game/shootingrange/shootingrange_sk.properties 12 additions, 0 deletions...ssets/text/game/shootingrange/shootingrange_sk.properties
- android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 1 addition, 1 deletion...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
- core/assets/common/game/kidnapping/sfx/error.mp3 0 additions, 0 deletionscore/assets/common/game/kidnapping/sfx/error.mp3
- core/assets/common/game/shootingrange/gfx/background.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/background.png
- core/assets/common/game/shootingrange/gfx/box_bad.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/box_bad.png
- core/assets/common/game/shootingrange/gfx/box_good.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/box_good.png
- core/assets/common/game/shootingrange/gfx/carousel.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/carousel.png
- core/assets/common/game/shootingrange/gfx/effects/1smoke.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/effects/1smoke.png
- core/assets/common/game/shootingrange/gfx/effects/2smoke.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/effects/2smoke.png
- core/assets/common/game/shootingrange/gfx/effects/3smoke.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/effects/3smoke.png
- core/assets/common/game/shootingrange/gfx/effects/4smoke.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/effects/4smoke.png
- core/assets/common/game/shootingrange/gfx/effects/5smoke.png 0 additions, 0 deletionscore/assets/common/game/shootingrange/gfx/effects/5smoke.png
- core/assets/common/game/shootingrange/gfx/effects/bad_fast.png 0 additions, 0 deletions...assets/common/game/shootingrange/gfx/effects/bad_fast.png
- core/assets/common/game/shootingrange/gfx/effects/bad_minus5.png 0 additions, 0 deletions...sets/common/game/shootingrange/gfx/effects/bad_minus5.png
- core/assets/common/game/shootingrange/gfx/effects/bad_minus7.png 0 additions, 0 deletions...sets/common/game/shootingrange/gfx/effects/bad_minus7.png
- core/assets/common/game/shootingrange/gfx/effects/good_plus1.png 0 additions, 0 deletions...sets/common/game/shootingrange/gfx/effects/good_plus1.png
- core/assets/common/game/shootingrange/gfx/effects/good_plus5.png 0 additions, 0 deletions...sets/common/game/shootingrange/gfx/effects/good_plus5.png
- core/assets/common/game/shootingrange/gfx/effects/good_plus7.png 0 additions, 0 deletions...sets/common/game/shootingrange/gfx/effects/good_plus7.png
- core/assets/common/game/shootingrange/gfx/effects/good_slow.png 0 additions, 0 deletions...ssets/common/game/shootingrange/gfx/effects/good_slow.png
Loading
Please register or sign in to comment