Merge branch 'V3.4' into feature-qr-code
Showing
- android/build.gradle 7 additions, 15 deletionsandroid/build.gradle
- android/src/androidTest/java/cz/nic/tablexia/android/test/instrumentation/AbstractOpenglTest.java 0 additions, 59 deletions...exia/android/test/instrumentation/AbstractOpenglTest.java
- android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 1 addition, 54 deletions...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
- build.gradle 2 additions, 16 deletionsbuild.gradle
- core/build.gradle 0 additions, 1 deletioncore/build.gradle
- core/external/tablexia-shared 1 addition, 1 deletioncore/external/tablexia-shared
- core/src/cz/nic/tablexia/Tablexia.java 0 additions, 1 deletioncore/src/cz/nic/tablexia/Tablexia.java
- core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java 1 addition, 1 deletioncore/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
- core/src/cz/nic/tablexia/game/GameDefinition.java 10 additions, 24 deletionscore/src/cz/nic/tablexia/game/GameDefinition.java
- core/src/cz/nic/tablexia/game/games/crime_scene/CrimeSceneGame.java 5 additions, 0 deletions...z/nic/tablexia/game/games/crime_scene/CrimeSceneGame.java
- core/src/cz/nic/tablexia/game/games/robbery/RobberyGame.java 1 addition, 1 deletioncore/src/cz/nic/tablexia/game/games/robbery/RobberyGame.java
- core/src/cz/nic/tablexia/game/games/runes/RunesGame.java 2 additions, 0 deletionscore/src/cz/nic/tablexia/game/games/runes/RunesGame.java
- core/src/cz/nic/tablexia/game/games/runes/model/RunesGameProperties.java 1 addition, 0 deletions.../tablexia/game/games/runes/model/RunesGameProperties.java
- core/src/cz/nic/tablexia/game/games/runes/model/RunesGameState.java 18 additions, 5 deletions...z/nic/tablexia/game/games/runes/model/RunesGameState.java
- core/src/cz/nic/tablexia/model/DatabaseManager.java 3 additions, 1 deletioncore/src/cz/nic/tablexia/model/DatabaseManager.java
- core/src/cz/nic/tablexia/model/game/GameDAO.java 9 additions, 6 deletionscore/src/cz/nic/tablexia/model/game/GameDAO.java
- core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java 12 additions, 30 deletions.../nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/actors/PlaybackStateButton.java 46 additions, 0 deletions...reen/encyclopedia/content/actors/PlaybackStateButton.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java 8 additions, 8 deletions...ic/tablexia/screen/encyclopedia/content/model/Header.java
- core/src/cz/nic/tablexia/screen/statistics/StatisticsGameScoreResolver.java 3 additions, 3 deletions...blexia/screen/statistics/StatisticsGameScoreResolver.java
Please register or sign in to comment