Merge branch 'spoon' into devel
Showing
- android/build.gradle 47 additions, 44 deletionsandroid/build.gradle
- android/src/androidTest/java/cz/nic/tablexia/android/test/instrumentation/AbstractOpenglTest.java 42 additions, 0 deletions...exia/android/test/instrumentation/AbstractOpenglTest.java
- android/src/androidTest/java/cz/nic/tablexia/android/test/instrumentation/ScreenTest.java 21 additions, 0 deletions...nic/tablexia/android/test/instrumentation/ScreenTest.java
- android/src/cz/nic/tablexia/android/AndroidLauncher.java 0 additions, 27 deletionsandroid/src/cz/nic/tablexia/android/AndroidLauncher.java
- android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 64 additions, 0 deletions...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
- build.gradle 16 additions, 6 deletionsbuild.gradle
- core/src/cz/nic/tablexia/Tablexia.java 47 additions, 2 deletionscore/src/cz/nic/tablexia/Tablexia.java
- core/src/cz/nic/tablexia/TablexiaApplication.java 1 addition, 1 deletioncore/src/cz/nic/tablexia/TablexiaApplication.java
- core/src/cz/nic/tablexia/game/games/robbery/GameScreen.java 12 additions, 12 deletionscore/src/cz/nic/tablexia/game/games/robbery/GameScreen.java
- core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java 2 additions, 0 deletions...src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
- core/src/cz/nic/tablexia/menu/MainMenu.java 1 addition, 1 deletioncore/src/cz/nic/tablexia/menu/MainMenu.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java 1 addition, 1 deletion...c/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
- core/src/cz/nic/tablexia/util/ui/dialog/TextDialog.java 4 additions, 2 deletionscore/src/cz/nic/tablexia/util/ui/dialog/TextDialog.java
Please register or sign in to comment