Merge branch 'feature-gamemenu' into 'V3.2.1' (8ae7d28e) · Commits · labs / Tablexia · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tablexia
- Activity
- Members
- Wiki
- Releases

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

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.

labs
Tablexia
Commits
8ae7d28e

Commit 8ae7d28e authored 8 years ago by

Matyáš Latner

Downloads
- Plain Diff

Merge branch 'feature-gamemenu' into 'V3.2.1'

Feature gamemenu



See merge request !365

parents 183a5475 ad8d4416

Branches

Tags

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

core/src/cz/nic/tablexia/TablexiaSettings.java 0 additions, 15 deletions

core/src/cz/nic/tablexia/TablexiaSettings.java
core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java 15 additions, 6 deletions

core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessGame.java 2 additions, 0 deletions

...ablexia/game/games/in_the_darkness/InTheDarknessGame.java
core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java 1 addition, 0 deletions

core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
core/src/cz/nic/tablexia/game/games/robbery/RobberyGame.java 2 additions, 0 deletions

core/src/cz/nic/tablexia/game/games/robbery/RobberyGame.java
core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeGame.java 2 additions, 0 deletions

...tablexia/game/games/shooting_range/ShootingRangeGame.java
core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java 25 additions, 26 deletions

...c/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
core/src/cz/nic/tablexia/util/ui/Switch.java 4 additions, 4 deletions

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

with 51 additions and 51 deletions

0% 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