Merge branch 'devel' into feature-pursuit
Conflicts: core/src/cz/nic/tablexia/game/GameDefinition.java
No related branches found
No related tags found
Showing
- android/assets/text/application/application_cs.properties 1 addition, 0 deletionsandroid/assets/text/application/application_cs.properties
- android/assets/text/application/application_de.properties 2 additions, 1 deletionandroid/assets/text/application/application_de.properties
- android/assets/text/application/application_sk.properties 1 addition, 0 deletionsandroid/assets/text/application/application_sk.properties
- android/assets/text/game/robbery/robbery_de.properties 1 addition, 1 deletionandroid/assets/text/game/robbery/robbery_de.properties
- android/assets/text/screen/encyclopedia/encyclopedia_cs.properties 170 additions, 0 deletions...ssets/text/screen/encyclopedia/encyclopedia_cs.properties
- android/assets/text/screen/encyclopedia/encyclopedia_de.properties 172 additions, 0 deletions...ssets/text/screen/encyclopedia/encyclopedia_de.properties
- android/assets/text/screen/encyclopedia/encyclopedia_sk.properties 170 additions, 0 deletions...ssets/text/screen/encyclopedia/encyclopedia_sk.properties
- android/assets/text/screen/halloffame/halloffame_de.properties 5 additions, 5 deletions...id/assets/text/screen/halloffame/halloffame_de.properties
- android/build.gradle 8 additions, 1 deletionandroid/build.gradle
- build.gradle 36 additions, 3 deletionsbuild.gradle
- core/assets/common/game/inthedarkness/gfx/tiles/tile0.png 0 additions, 0 deletionscore/assets/common/game/inthedarkness/gfx/tiles/tile0.png
- core/assets/common/game/inthedarkness/gfx/tiles/tile1.png 0 additions, 0 deletionscore/assets/common/game/inthedarkness/gfx/tiles/tile1.png
- core/assets/common/game/inthedarkness/gfx/tiles/tile2I.png 0 additions, 0 deletionscore/assets/common/game/inthedarkness/gfx/tiles/tile2I.png
- core/assets/common/game/inthedarkness/gfx/tiles/tile2L.png 0 additions, 0 deletionscore/assets/common/game/inthedarkness/gfx/tiles/tile2L.png
- core/assets/common/game/inthedarkness/gfx/tiles/tile3.png 0 additions, 0 deletionscore/assets/common/game/inthedarkness/gfx/tiles/tile3.png
- core/assets/common/game/inthedarkness/gfx/tiles/tile4.png 0 additions, 0 deletionscore/assets/common/game/inthedarkness/gfx/tiles/tile4.png
- core/assets/common/screen/encyclopedia/auditory_distinction.json 7 additions, 0 deletions...sets/common/screen/encyclopedia/auditory_distinction.json
- core/assets/common/screen/encyclopedia/dysgraphia.json 8 additions, 0 deletionscore/assets/common/screen/encyclopedia/dysgraphia.json
- core/assets/common/screen/encyclopedia/dyslexia.json 8 additions, 0 deletionscore/assets/common/screen/encyclopedia/dyslexia.json
- core/assets/common/screen/encyclopedia/dysorthographia.json 8 additions, 0 deletionscore/assets/common/screen/encyclopedia/dysorthographia.json
Loading
Please register or sign in to comment