Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tablexia
- Activity
- Members
- Wiki
- Releases
- Model registry

Snippets Groups Projects

Admin message

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

ddafe69e

Commit ddafe69e authored 9 years ago by Luboš Horáček

Downloads
- Plain Diff

Merge branch 'devel' into feature-shootingrange

parents 3945f40b 0bc2aaa1

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

core/src/cz/nic/tablexia/Tablexia.java 8 additions, 0 deletions

core/src/cz/nic/tablexia/Tablexia.java
core/src/cz/nic/tablexia/TablexiaApplication.java 3 additions, 11 deletions

core/src/cz/nic/tablexia/TablexiaApplication.java
core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java 2 additions, 12 deletions

core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
core/src/cz/nic/tablexia/loader/TablexiaAtlasManager.java 1 addition, 5 deletions

core/src/cz/nic/tablexia/loader/TablexiaAtlasManager.java
core/src/cz/nic/tablexia/menu/MainMenu.java 8 additions, 2 deletions

core/src/cz/nic/tablexia/menu/MainMenu.java
core/src/cz/nic/tablexia/menu/MainMenuContainer.java 8 additions, 0 deletions

core/src/cz/nic/tablexia/menu/MainMenuContainer.java
core/src/cz/nic/tablexia/menu/MainMenuDimmer.java 6 additions, 20 deletions

core/src/cz/nic/tablexia/menu/MainMenuDimmer.java
core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java 0 additions, 4 deletions

core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java
core/src/cz/nic/tablexia/screen/preferences/PreferencesScreen.java 6 additions, 2 deletions

...cz/nic/tablexia/screen/preferences/PreferencesScreen.java
core/src/cz/nic/tablexia/util/ui/ViewPager.java 17 additions, 7 deletions

core/src/cz/nic/tablexia/util/ui/ViewPager.java

with 59 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment