Commits · f8a8630d18bc7ce3d02e346451587a2ea4998e90 · 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.

Nov 18, 2016
- Fixed copyright · f8a8630d
  Matyáš Latner authored 8 years ago
  
  f8a8630d
- Merge branch 'V3.4' into feature-nightwatch-newrules · 343302a6
  Matyáš Latner authored 8 years ago
  
  343302a6
- Merge branch 'feature-kidnapping' into 'V3.4' · 451b3acb
  Matyáš Latner authored 8 years ago
```
#353 #606 Feature kidnapping

See merge request !493
```
  451b3acb
- #353 Small fixes · f6503ffe
  Matyáš Latner authored 8 years ago
  
  f6503ffe
- #353 Fixed copyright · 21a8e5b5
  Matyáš Latner authored 8 years ago
  
  21a8e5b5
- Merge branch 'V3.4' into feature-kidnapping · ddd95a4a
  Matyáš Latner authored 8 years ago
  
  ddd95a4a
- Merge branch 'feature-test-trophies' into 'V3.4' · e042357a
  Matyáš Latner authored 8 years ago
```
#400 Added some unit tests for TrophyHelper

See merge request !497
```
  e042357a
- Merge branch 'V3.4' into feature-test-trophies · 958283f3
  Matyáš Latner authored 8 years ago
  
  958283f3
- Merge branch 'feature-small-fixes' into 'V3.4' · 0ed48160
  Matyáš Latner authored 8 years ago
```
#605 Game now saves locale properly when the locale is set to system locale.

See merge request !498
```
  0ed48160
- Merge branch 'V3.4' into feature-small-fixes · 510ce72c
  Matyáš Latner authored 8 years ago
  
  510ce72c
- Merge branch 'feature-pursuit' into 'V3.4' · 653880fd
  Matyáš Latner authored 8 years ago
```
#608 Fixed old animation resume after starting new game.

See merge request !499
```
  653880fd
- Merge branch 'V3.4' into feature-pursuit · 72bb8d38
  Matyáš Latner authored 8 years ago
  
  72bb8d38
- Merge branch 'feature-inthedarkness' into 'V3.4' · 46def526
  Matyáš Latner authored 8 years ago
```
#464 Fixed bug where invalid tile was generated, causing crashing of application

*  Fixed bug where invalid tile was generated, causing crashing of application
* JUnit test adjusted

See merge request !500
```
  46def526
- Merge branch 'V3.4' into feature-inthedarkness · 1ae78763
  Matyáš Latner authored 8 years ago
  
  1ae78763
- Merge branch 'feature-qr-code-ios' into 'V3.4' · 9bedb43a
  Matyáš Latner authored 8 years ago
```
#558 #557 #531 Feature qr code ios & android

See merge request !488
```
  9bedb43a
- #558 Fixed copyrights · ac365d59
  Matyáš Latner authored 8 years ago
  
  ac365d59
- #558 PrintStackTrace changed for Log · f9e7aa61
  Matyáš Latner authored 8 years ago
  
  f9e7aa61
- #558 Fixed NPE for QR code sync · 35c65df9
  Matyáš Latner authored 8 years ago
  
  35c65df9
- Merge branch 'V3.4' into feature-qr-code-ios · a607ef1b
  Matyáš Latner authored 8 years ago
  
  a607ef1b
Nov 16, 2016
- #604 Fixed problem with computing score with new rules in NightWatch game · 8f303ef9
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  8f303ef9
- #604 Merge branch 'V3.4' into feature-nightwatch-newrules · 90b15710
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
```
Conflicts:
	core/external/copyright-test
	core/external/tablexia-shared
	core/src/cz/nic/tablexia/game/games/night_watch/NightWatchGame.java
	core/src/cz/nic/tablexia/game/games/night_watch/helper/GameRulesHelper.java
```
  90b15710
Nov 15, 2016
- Merge branch 'feature-copyright2' into 'V3.4' · b78203da
  Matyáš Latner authored 8 years ago
```
Feature copyright2

See merge request !502
```
  b78203da
- Tablexia-Shared use devel version · a6f87548
  Matyáš Latner authored 8 years ago
  
  a6f87548
- Merge branch 'V3.4' into feature-copyright2 · b5b8934a
  Matyáš Latner authored 8 years ago
  
  b5b8934a
- Merge branch 'feature_reports' into 'V3.4' · e61a050c
  Matyáš Latner authored 8 years ago
```
Feature reports

See merge request !501
```
  e61a050c
- Copyright test fixed to 1.0 · 2d417b36
  Matyáš Latner authored 8 years ago
  
  2d417b36
- Updated copyright to version without email · c9630ff5
  Matyáš Latner authored 8 years ago
  
  c9630ff5
- Copyright test now checks xml files in Android project and all gradle files · 24765ae2
  Matyáš Latner authored 8 years ago
  
  24765ae2
Nov 14, 2016
- Merge branch 'V3.4' into feature-nightwatch-newrules · 5519f2f7
  Anton Danilov authored 8 years ago
  
  5519f2f7
Nov 11, 2016
- #464 Fixed bug where invalid tile was generated, causing crashing of... · c334677c
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
```
#464 Fixed bug where invalid tile was generated, causing crashing of application, JUnit test adjusted
```
  c334677c
Nov 10, 2016
- #608 Fixed old animation resume after starting new game. · dd77fdcc
  Vitaliy Vashchenko authored 8 years ago
  
  dd77fdcc
- #605 Game now saves locale properly when the locale is set to system locale. · 9960ba77
  Drahomír Karchňák authored 8 years ago
  
  9960ba77
- #606 Fixed wrong z order of arrow image in some cases. · 031735b7
  Vitaliy Vashchenko authored 8 years ago
  
  031735b7
- #353 Reverted some changes. Code refactoring. · 7c668da9
  Vitaliy Vashchenko authored 8 years ago
  
  7c668da9
Nov 09, 2016
- #400 Added some unit tests for TrophyHelper · 121483da
  Vitaliy Vashchenko authored 8 years ago
  
  121483da
Nov 08, 2016
- #603 Removed switches, improved code · 654c3b7b
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  654c3b7b
Nov 07, 2016
- #366 Fixed tests. Added copyright where needed! · 0a4266cb
  Drahomír Karchňák authored 8 years ago
  
  0a4266cb
- #366 Moved GameResultResolvers to model project. Refactoring... · d2c37311
  Drahomír Karchňák authored 8 years ago
  
  d2c37311
Nov 04, 2016
- Created project specific CopyrightTest from utility AbstractCopyrightTest · f48d746f
  Matyáš Latner authored 8 years ago
  
  f48d746f
- Copyright test moved to separated project · 5d143974
  Matyáš Latner authored 8 years ago
  
  5d143974