Merge branch 'V3.3' into feature-ranksystem
Conflicts: core/src/cz/nic/tablexia/game/GameDefinition.java core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessGame.java core/src/cz/nic/tablexia/game/ranksystem/UserRankManager.java
Showing
- README.md 136 additions, 0 deletionsREADME.md
- android/assets/text/application/application_cs.properties 11 additions, 0 deletionsandroid/assets/text/application/application_cs.properties
- android/assets/text/application/application_de.properties 10 additions, 0 deletionsandroid/assets/text/application/application_de.properties
- android/assets/text/application/application_sk.properties 13 additions, 3 deletionsandroid/assets/text/application/application_sk.properties
- android/assets/text/game/crimescene/crimescene_cs.properties 7 additions, 0 deletionsandroid/assets/text/game/crimescene/crimescene_cs.properties
- android/assets/text/game/crimescene/crimescene_de.properties 7 additions, 0 deletionsandroid/assets/text/game/crimescene/crimescene_de.properties
- android/assets/text/game/crimescene/crimescene_sk.properties 7 additions, 0 deletionsandroid/assets/text/game/crimescene/crimescene_sk.properties
- android/assets/text/game/runes/runes_cs.properties 13 additions, 0 deletionsandroid/assets/text/game/runes/runes_cs.properties
- android/assets/text/game/runes/runes_de.properties 9 additions, 0 deletionsandroid/assets/text/game/runes/runes_de.properties
- android/assets/text/game/runes/runes_sk.properties 9 additions, 0 deletionsandroid/assets/text/game/runes/runes_sk.properties
- core/assets/common/_preloader/crimescene/preloader_anim_0.png 0 additions, 0 deletions.../assets/common/_preloader/crimescene/preloader_anim_0.png
- core/assets/common/_preloader/crimescene/preloader_anim_1.png 0 additions, 0 deletions.../assets/common/_preloader/crimescene/preloader_anim_1.png
- core/assets/common/_preloader/crimescene/preloader_info.png 0 additions, 0 deletionscore/assets/common/_preloader/crimescene/preloader_info.png
- core/assets/common/_preloader/runes/help.mp3 0 additions, 0 deletionscore/assets/common/_preloader/runes/help.mp3
- core/assets/common/game/crimescene/common/gfx/actioncards/book.png 0 additions, 0 deletions...ts/common/game/crimescene/common/gfx/actioncards/book.png
- core/assets/common/game/crimescene/common/gfx/actioncards/cat.png 0 additions, 0 deletions...ets/common/game/crimescene/common/gfx/actioncards/cat.png
- core/assets/common/game/crimescene/common/gfx/actioncards/clock.png 0 additions, 0 deletions...s/common/game/crimescene/common/gfx/actioncards/clock.png
- core/assets/common/game/crimescene/common/gfx/actioncards/curtain.png 0 additions, 0 deletions...common/game/crimescene/common/gfx/actioncards/curtain.png
- core/assets/common/game/crimescene/common/gfx/actioncards/door.png 0 additions, 0 deletions...ts/common/game/crimescene/common/gfx/actioncards/door.png
- core/assets/common/game/crimescene/common/gfx/actioncards/empty_card.png 0 additions, 0 deletions...mon/game/crimescene/common/gfx/actioncards/empty_card.png
Loading
Please register or sign in to comment