Merging
Showing
- android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 10 additions, 8 deletions...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
- build.gradle 1 addition, 2 deletionsbuild.gradle
- core/src/cz/nic/tablexia/TablexiaStorage.java 2 additions, 2 deletionscore/src/cz/nic/tablexia/TablexiaStorage.java
- core/src/cz/nic/tablexia/debug/DebugInfo.java 1 addition, 1 deletioncore/src/cz/nic/tablexia/debug/DebugInfo.java
- core/src/cz/nic/tablexia/game/games/kidnapping/KidnappingGame.java 1 addition, 1 deletion...cz/nic/tablexia/game/games/kidnapping/KidnappingGame.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/clothing/ClothingAttribute.java 1 addition, 1 deletion...obbery/creature/attribute/clothing/ClothingAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/clothing/accessories/AccessoriesAttribute.java 1 addition, 1 deletion.../attribute/clothing/accessories/AccessoriesAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/clothing/bottom/BottomAttribute.java 1 addition, 1 deletion...y/creature/attribute/clothing/bottom/BottomAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/clothing/headgear/HeadgearAttribute.java 1 addition, 1 deletion...eature/attribute/clothing/headgear/HeadgearAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/clothing/top/TopAttribute.java 1 addition, 1 deletion...robbery/creature/attribute/clothing/top/TopAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/glasses/GlassesAttribute.java 1 addition, 1 deletion.../robbery/creature/attribute/glasses/GlassesAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/hair/HairAttribute.java 1 addition, 1 deletion.../games/robbery/creature/attribute/hair/HairAttribute.java
- core/src/cz/nic/tablexia/game/games/robbery/creature/attribute/head/HeadAttribute.java 1 addition, 1 deletion.../games/robbery/creature/attribute/head/HeadAttribute.java
- core/src/cz/nic/tablexia/model/UserDAO.java 0 additions, 2 deletionscore/src/cz/nic/tablexia/model/UserDAO.java
- core/src/cz/nic/tablexia/model/game/UserTrophy.java 1 addition, 2 deletionscore/src/cz/nic/tablexia/model/game/UserTrophy.java
- core/src/cz/nic/tablexia/screen/camera/CameraScreen.java 1 addition, 1 deletioncore/src/cz/nic/tablexia/screen/camera/CameraScreen.java
- core/src/cz/nic/tablexia/screen/loader/LoaderScreen.java 0 additions, 1 deletioncore/src/cz/nic/tablexia/screen/loader/LoaderScreen.java
- core/src/cz/nic/tablexia/util/camera/DeviceCameraControl.java 1 addition, 1 deletion.../src/cz/nic/tablexia/util/camera/DeviceCameraControl.java
- core/test/cz/nic/tablexia/test/games/kidnapping/PathGeneratorTest.java 1 addition, 1 deletion...nic/tablexia/test/games/kidnapping/PathGeneratorTest.java
Please register or sign in to comment