Merge branch 'devel' into feature-abstractgame
Showing
- android/AndroidManifest.xml 1 addition, 1 deletionandroid/AndroidManifest.xml
- android/assets/gfx/screen_loader_bighand.png 0 additions, 0 deletionsandroid/assets/gfx/screen_loader_bighand.png
- android/assets/gfx/screen_loader_smallhand.png 0 additions, 0 deletionsandroid/assets/gfx/screen_loader_smallhand.png
- android/assets/text/application/application_cs.properties 4 additions, 0 deletionsandroid/assets/text/application/application_cs.properties
- android/assets/text/application/application_sk.properties 4 additions, 0 deletionsandroid/assets/text/application/application_sk.properties
- android/build.gradle 5 additions, 3 deletionsandroid/build.gradle
- core/assets/common/screen/gamemenu/overlay.png 0 additions, 0 deletionscore/assets/common/screen/gamemenu/overlay.png
- core/assets/cs/screen/gamemenu/helplayer.png 0 additions, 0 deletionscore/assets/cs/screen/gamemenu/helplayer.png
- core/assets/cs/screen/gamemenu/potme_startbutton_pressed.png 0 additions, 0 deletionscore/assets/cs/screen/gamemenu/potme_startbutton_pressed.png
- core/assets/cs/screen/gamemenu/strelnice_startbutton_pressed.png 0 additions, 0 deletions...sets/cs/screen/gamemenu/strelnice_startbutton_pressed.png
- core/src/cz/nic/tablexia/Tablexia.java 83 additions, 82 deletionscore/src/cz/nic/tablexia/Tablexia.java
- core/src/cz/nic/tablexia/TablexiaSettings.java 34 additions, 34 deletionscore/src/cz/nic/tablexia/TablexiaSettings.java
- core/src/cz/nic/tablexia/game/difficulty/GameDifficulty.java 14 additions, 18 deletionscore/src/cz/nic/tablexia/game/difficulty/GameDifficulty.java
- core/src/cz/nic/tablexia/screen/ScreenDefinition.java 66 additions, 0 deletionscore/src/cz/nic/tablexia/screen/ScreenDefinition.java
- core/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java 2 additions, 0 deletionscore/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java
- core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java 18 additions, 7 deletionscore/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java 136 additions, 50 deletions...c/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/MenuPage.java 9 additions, 0 deletionscore/src/cz/nic/tablexia/screen/gamemenu/pages/MenuPage.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/OfficeMenuPage.java 112 additions, 31 deletions...cz/nic/tablexia/screen/gamemenu/pages/OfficeMenuPage.java
- core/src/cz/nic/tablexia/screen/loader/LoaderScreen.java 21 additions, 29 deletionscore/src/cz/nic/tablexia/screen/loader/LoaderScreen.java
Please register or sign in to comment