Merge branch 'devel' into feature-shootingrange
No related branches found
No related tags found
Showing
- core/assets/common/game/kidnapping/gfx/overlay.png 0 additions, 0 deletionscore/assets/common/game/kidnapping/gfx/overlay.png
- core/assets/common/screen/form/gfx/avatar/overlay.png 0 additions, 0 deletionscore/assets/common/screen/form/gfx/avatar/overlay.png
- core/assets/common/screen/gamemenu/gfx/overlay.png 0 additions, 0 deletionscore/assets/common/screen/gamemenu/gfx/overlay.png
- core/assets/common/screen/panorama/gfx/newspaper/overlay.png 0 additions, 0 deletionscore/assets/common/screen/panorama/gfx/newspaper/overlay.png
- core/src/cz/nic/tablexia/TablexiaApplication.java 5 additions, 7 deletionscore/src/cz/nic/tablexia/TablexiaApplication.java
- core/src/cz/nic/tablexia/debug/DebugInfo.java 2 additions, 3 deletionscore/src/cz/nic/tablexia/debug/DebugInfo.java
- core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java 1 addition, 2 deletionscore/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
- core/src/cz/nic/tablexia/game/games/kidnapping/actors/EarOverlay.java 2 additions, 1 deletion...nic/tablexia/game/games/kidnapping/actors/EarOverlay.java
- core/src/cz/nic/tablexia/game/games/kidnapping/actors/Map.java 3 additions, 1 deletion...src/cz/nic/tablexia/game/games/kidnapping/actors/Map.java
- core/src/cz/nic/tablexia/graphics/ColorTexture.java 0 additions, 27 deletionscore/src/cz/nic/tablexia/graphics/ColorTexture.java
- core/src/cz/nic/tablexia/loader/TablexiaAtlasManager.java 41 additions, 4 deletionscore/src/cz/nic/tablexia/loader/TablexiaAtlasManager.java
- core/src/cz/nic/tablexia/loader/application/ApplicationAtlasManager.java 58 additions, 56 deletions.../tablexia/loader/application/ApplicationAtlasManager.java
- core/src/cz/nic/tablexia/menu/MainMenu.java 2 additions, 3 deletionscore/src/cz/nic/tablexia/menu/MainMenu.java
- core/src/cz/nic/tablexia/menu/MainMenuDimmer.java 4 additions, 4 deletionscore/src/cz/nic/tablexia/menu/MainMenuDimmer.java
- core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java 235 additions, 201 deletionscore/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java
- core/src/cz/nic/tablexia/screen/createuser/FormScreen.java 4 additions, 4 deletionscore/src/cz/nic/tablexia/screen/createuser/FormScreen.java
- core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java 2 additions, 2 deletions...src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/OfficeMenuPage.java 3 additions, 2 deletions...cz/nic/tablexia/screen/gamemenu/pages/OfficeMenuPage.java
- core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java 3 additions, 5 deletions...cz/nic/tablexia/screen/preferences/PreferencesScreen.java
- core/src/cz/nic/tablexia/util/ui/dialog/TablexiaDialog.java 10 additions, 22 deletionscore/src/cz/nic/tablexia/util/ui/dialog/TablexiaDialog.java
Loading
Please register or sign in to comment