Commits · 45644486c7357976bb72d8da0c4ac962c5a21d3c · labs / Tablexia · GitLab

Snippets Groups Projects

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.

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.

Jul 18, 2016
- #341 Accidentaly removed gradle.properties in the last commit. Fixed it. · 45644486
  Drahomír Karchňák authored 8 years ago
  
  45644486
- Merge branch 'devel' into feature-sounds · d26b416e
  Drahomír Karchňák authored 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/TablexiaSettings.java
	core/src/cz/nic/tablexia/menu/AbstractMenu.java
	core/src/cz/nic/tablexia/menu/main/MainMenuDefinition.java
```
  d26b416e
- #341 Added sound muted dialog variants for games and regular screens. Also... · 829c408c
  Drahomír Karchňák authored 8 years ago
```
#341 Added sound muted dialog variants for games and regular screens. Also added sound mute dialog for encyclopedia's play buttons...
```
  829c408c
Jul 15, 2016
- #341 WIP Added new sound mute button and dialog... · 6ef518d8
  Drahomír Karchňák authored 8 years ago
  
  6ef518d8
- Fixed repositury URL for Tablexia-Model git submodule · 6956e733
  Matyáš Latner authored 8 years ago
  
  6956e733
- #341 Sound muting button should work correctly now. Added pop up dialog when... · 653f60c5
  Drahomír Karchňák authored 8 years ago
```
#341 Sound muting button should work correctly now. Added pop up dialog when trying to visit screen that requires sounds while having sounds muted...
```
  653f60c5
Jul 14, 2016
- #341 WIP Added sound mute toggle button to main menu. · 3c72f409
  Drahomír Karchňák authored 8 years ago
  
  3c72f409
Jul 13, 2016
- Revert "Merge branch 'feature-pursuit_devel' into 'devel'" · 2deb5070
  Matyáš Latner authored 8 years ago
```
This reverts merge request !372
```
  2deb5070
- Merge branch 'feature-pursuit_devel' into 'devel' · dbd7ccfb
  Matyáš Latner authored 8 years ago
```
Feature pursuit devel



See merge request !372
```
  dbd7ccfb
Jul 11, 2016
- #344 Removed dragListener. Replaced with move animation on the end of round. · 29486448
  Vitaliy Vashchenko authored 8 years ago
  
  29486448
Jun 24, 2016
- #344 Added looping vehicle sound while animation is lasted. · 575ec0d0
  Vitaliy Vashchenko authored 8 years ago
  
  575ec0d0
- Merge branch 'devel' into feature-pursuit_devel · d2c7da37
  Vitaliy Vashchenko authored 8 years ago
  
  d2c7da37
- #344 Fixed first position been skipped. · cd8914bc
  Vitaliy Vashchenko authored 8 years ago
  
  cd8914bc
Jun 21, 2016
- Merge branch 'V3.2' into 'devel' · a622e887
  Matyáš Latner authored 8 years ago
```
#377 Better conditions for cups count and rank select



See merge request !362
```
  a622e887
- #377 Better conditions for cups count and rank select · 212027ab
  Matyáš Latner authored 8 years ago
  
  3.2B2
  
  212027ab
- Merge branch 'V3.2' into 'devel' · 415bdcd7
  Matyáš Latner authored 8 years ago
```
#374 Fixed double game records while full sync to new device



See merge request !360
```
  415bdcd7
- #374 Fixed double game records while full sync to new device · 0b5eda61
  Matyáš Latner authored 8 years ago
  
  0b5eda61
- Merge branch 'V3.2' into 'devel' · 5528bd93
  Matyáš Latner authored 8 years ago
```
V3.2



See merge request !358
```
  5528bd93
- Merge branch 'feature-menu' into 'V3.2' · 7ba29093
  Matyáš Latner authored 8 years ago
```
Feature menu



See merge request !357
```
  7ba29093
- Merge branch 'feature-gamemenu' into 'V3.2' · e837168a
  Matyáš Latner authored 8 years ago
```
#375 Workaround for difficulty settings



See merge request !356
```
  e837168a
- #377 Fixed initialization on Android platform after game resume · fce361d3
  Matyáš Latner authored 8 years ago
  
  fce361d3
- #376 Fixed description of KidnappingGame · b9a077e8
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  b9a077e8
- #375 Workaround for difficulty settings · e084abad
  Drahomír Karchňák authored 8 years ago
  
  e084abad
- #374 Fixed game records sync doubling · 9dd7c592
  Matyáš Latner authored 8 years ago
  
  9dd7c592
- #344 Added positions for vehicle. · c5b04fca
  Vitaliy Vashchenko authored 8 years ago
  
  c5b04fca
Jun 20, 2016
- Merge branch 'V3.2' into 'devel' · 780e94cd
  Matyáš Latner authored 8 years ago
```
V3.2



See merge request !351
```
  780e94cd
Jun 16, 2016
- Merge branch 'devel' into 'V3.2' · f312bc49
  Matyáš Latner authored 8 years ago
```
Application version naming fix



See merge request !350
```
  3.2B1
  
  f312bc49
- Application version naming fix · fd87caed
  Matyáš Latner authored 8 years ago
  
  fd87caed
- MainMenu button for profile screen · 2fc9bf93
  Matyáš Latner authored 8 years ago
  
  2fc9bf93
- #328 GameMenu rank system progress bar lower position · 61185961
  Matyáš Latner authored 8 years ago
  
  61185961
- Merge branch 'feature-createuser' into 'BETA-3.2' · c796c6bb
  Matyáš Latner authored 8 years ago
```
Feature createuser



See merge request !349
```
  c796c6bb
- #359 Fixed some mistakes in slovak translation · d09e94e6
  Drahomír Karchňák authored 8 years ago
  
  d09e94e6
- #360 Added "Use your finger to sign" text above signature dialog... · 13252fbb
  Drahomír Karchňák authored 8 years ago
  
  13252fbb
Jun 15, 2016
- Merge branch 'devel' into BETA-3.2 · af332dbc
  Matyáš Latner authored 8 years ago
  
  af332dbc
- Merge branch 'feature-gamemenu' into 'BETA-3.2' · e5040bcc
  Matyáš Latner authored 8 years ago
```
Feature gamemenu



See merge request !347
```
  e5040bcc
- Merge branch 'feature-ranksystem' into 'BETA-3.2' · 0fcebf9d
  Matyáš Latner authored 8 years ago
```
Feature ranksystem



See merge request !346
```
  0fcebf9d
- #328 New slovak rank names · 44f9cb84
  Drahomír Karchňák authored 8 years ago
  
  44f9cb84
Jun 14, 2016
- Better application id assembling · 9d7896ca
  Matyáš Latner authored 8 years ago
  
  9d7896ca
- #358 Opening main menu or clicking back button ends initial scroll animation in game menu screen... · b07d4100
  Drahomír Karchňák authored 8 years ago
  
  b07d4100
- Merge branch 'BETA-3.2' into feature-gamemenu · 4d856481
  Drahomír Karchňák authored 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
```
  4d856481