Merge branch 'devel' into feature-gamemenu
Conflicts: core/src/cz/nic/tablexia/util/ScaleUtil.java
No related branches found
No related tags found
Showing
- android/assets/gfx/screen_loader_background.jpg 0 additions, 0 deletionsandroid/assets/gfx/screen_loader_background.jpg
- android/assets/text/game/shootingrange/shootingrange_cs.properties 5 additions, 4 deletions...ssets/text/game/shootingrange/shootingrange_cs.properties
- android/assets/text/game/shootingrange/shootingrange_de.properties 5 additions, 4 deletions...ssets/text/game/shootingrange/shootingrange_de.properties
- android/assets/text/game/shootingrange/shootingrange_sk.properties 5 additions, 5 deletions...ssets/text/game/shootingrange/shootingrange_sk.properties
- android/assets/text/screen/about/about_cs.properties 24 additions, 0 deletionsandroid/assets/text/screen/about/about_cs.properties
- android/assets/text/screen/about/about_de.properties 24 additions, 0 deletionsandroid/assets/text/screen/about/about_de.properties
- android/assets/text/screen/about/about_sk.properties 24 additions, 0 deletionsandroid/assets/text/screen/about/about_sk.properties
- core/assets/common/_global/application/mainmenu/background_border.png 0 additions, 0 deletions...common/_global/application/mainmenu/background_border.png
- core/assets/common/_global/application/mainmenu/background_border_noswitch.png 0 additions, 0 deletions...lobal/application/mainmenu/background_border_noswitch.png
- core/assets/common/_global/application/mainmenu/background_border_switch.png 0 additions, 0 deletions..._global/application/mainmenu/background_border_switch.png
- core/assets/common/_global/application/mainmenu/background_switch.png 0 additions, 0 deletions...common/_global/application/mainmenu/background_switch.png
- core/assets/common/game/inthedarkness/gfx/background/background.jpg 0 additions, 0 deletions...s/common/game/inthedarkness/gfx/background/background.jpg
- core/assets/common/game/inthedarkness/gfx/background/background_map.png 0 additions, 0 deletions...mmon/game/inthedarkness/gfx/background/background_map.png
- core/assets/common/game/robbery/gamescreen/background_bank.png 0 additions, 0 deletions...assets/common/game/robbery/gamescreen/background_bank.png
- core/assets/common/game/robbery/gamescreen/background_bank_bottom.png 0 additions, 0 deletions...common/game/robbery/gamescreen/background_bank_bottom.png
- core/assets/common/game/robbery/gamescreen/background_jewellery.png 0 additions, 0 deletions...s/common/game/robbery/gamescreen/background_jewellery.png
- core/assets/common/game/robbery/gamescreen/background_jewellery_bottom.png 0 additions, 0 deletions...n/game/robbery/gamescreen/background_jewellery_bottom.png
- core/assets/common/game/robbery/gamescreen/background_newsstand.png 0 additions, 0 deletions...s/common/game/robbery/gamescreen/background_newsstand.png
- core/assets/common/game/robbery/gamescreen/background_newsstand_bottom.png 0 additions, 0 deletions...n/game/robbery/gamescreen/background_newsstand_bottom.png
- core/assets/common/screen/about/closebutton_pressed.png 0 additions, 0 deletionscore/assets/common/screen/about/closebutton_pressed.png
Loading
Please register or sign in to comment