Commits · 40bc45d8b409df698bd75862184b3d995ab53e97 · 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.

Mar 30, 2016
- Merge remote-tracking branch 'origin/feature-encyclopedia' into feature-encyclopedia · 40bc45d8
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
	core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java
	core/src/cz/nic/tablexia/util/ui/button/TablexiaButton.java
```
  40bc45d8
- Merge remote-tracking branch 'origin/feature-encyclopedia' into feature-encyclopedia · 62897bdc
  Anton Danilov authored 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
	core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java
	core/src/cz/nic/tablexia/util/ui/button/TablexiaButton.java
```
  62897bdc
- #295 Change type of apostrophes, removed where needed · ec513756
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  ec513756
- Merge branch 'feature-fontnew' into feature-encyclopedia · 1bfcd076
  Anton Danilov authored 8 years ago
  
  1bfcd076
- #295 Added „ and “ to bitmap fonts... · d1a9de32
  Drahomír Karchňák authored 8 years ago
  
  d1a9de32
- Merge branch 'devel' into feature-fontnew · c6e2e48c
  Drahomír Karchňák authored 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java
```
  c6e2e48c
- #300 Fixed DE result text in Robbery game victory dialog · a351fbe2
  Matyáš Latner authored 8 years ago
  
  a351fbe2
- #301 Fixed Robbery game rule bc1bc DE text · 0dd2315a
  Matyáš Latner authored 8 years ago
  
  0dd2315a
- #302 Changed word "beliebtesten" to "Beliebtesten" · c0da32b3
  Matyáš Latner authored 8 years ago
  
  c0da32b3
- #303 Fixed typo in word "Oberteil" and "Unterteil" · bc058b74
  Matyáš Latner authored 8 years ago
  
  bc058b74
- #305 Fixed typo in DE word "gleich" and fixed Robbery DE rule text for rule bc2bc · 6cc65792
  Matyáš Latner authored 8 years ago
  
  6cc65792
- #306 Fixed Robbery DE rule text for rules ca0cc0t and ca1cc · e54c909f
  Matyáš Latner authored 8 years ago
  
  e54c909f
- #307 Fixed Robbery DE rule text for rule CC1CC · ebb9e1ae
  Matyáš Latner authored 8 years ago
  
  ebb9e1ae
Mar 29, 2016
- #292 Fixed typo in DE translation of NightWatch game preloader · 68abe0a1
  Matyáš Latner authored 8 years ago
  
  68abe0a1
- #289 Fixed typo in DE transaltion of RobberyGame and fixed constituent of Beads attribute · 3039d5b3
  Matyáš Latner authored 8 years ago
  
  3039d5b3
- #291 Fixed typo in DE translation for NightWatch game · 8c8813ae
  Matyáš Latner authored 8 years ago
  
  8c8813ae
Mar 23, 2016
- #284 Added "bzw. die Einbrecherin" text in DE Robbery rules · cd71a608
  Matyáš Latner authored 9 years ago
  
  cd71a608
- Merge branch 'feature-panoramascreen' into 'devel' · a1b130a1
  Matyáš Latner authored 9 years ago
```
Feature panoramascreen



See merge request !303
```
  a1b130a1
- Merge branch 'feature-preloader' into 'devel' · 9284eca3
  Matyáš Latner authored 9 years ago
```
Feature preloader



See merge request !302
```
  9284eca3
- #278 Newspaper title image resized. Small changes in panorama images. · 3917d05d
  Vitaliy Vashchenko authored 9 years ago
  
  3917d05d
- Merge branch 'feature-sk-text-fixes' into 'devel' · 8c8ee279
  Matyáš Latner authored 9 years ago
```
#268 Opraveny SK obrázky v novinách



See merge request !301
```
  8c8ee279
- #278 Images resized. Deleted unused asset. · af30c6b4
  Vitaliy Vashchenko authored 9 years ago
  
  af30c6b4
- Merge remote-tracking branch 'remotes/origin/devel' into feature-preloader · 9b3a1833
  Frantisek Simon authored 9 years ago
  
  9b3a1833
- #277 Mouse preloader is now properly centered on Y axis · 9bb8c259
  Frantisek Simon authored 9 years ago
  
  9bb8c259
- #268 Fixed SK articles in newspaper · 529dfbc4
  Anton Danilov authored 9 years ago and Anton Danilov committed 9 years ago
  
  529dfbc4
- Merge branch 'feature-sounds' into 'devel' · ad035000
  Matyáš Latner authored 9 years ago
```
#279 Zvýšení hlasitosti DE zvuků

* Decreased volume of ambient sound, increased volume of sounds in newspaper articles, encyclopedia and kidnapping game

See merge request !300
```
  ad035000
- #279 Small code fixes · ff5c977d
  Matyáš Latner authored 9 years ago
  
  ff5c977d
Mar 22, 2016
- #279 Changed value of sound volume to constant · b0974b6d
  Anton Danilov authored 9 years ago and Anton Danilov committed 9 years ago
  
  b0974b6d
- #279 Decreased volume of ambient sound, increased volume of sounds in... · df114240
  Anton Danilov authored 9 years ago and Anton Danilov committed 9 years ago
```
#279 Decreased volume of ambient sound, increased volume of sounds in newspaper articles, encyclopedia and kidnapping game
```
  df114240
- Merge branch 'feature-gamemenu' into 'devel' · 4734fd7a
  Matyáš Latner authored 9 years ago
```
#252 Changes in GameMenu pursuit layout (SK and CS ) DE changes in #297



See merge request !299
```
  4734fd7a
- #252 Changes in GameMenu pursuit layout (SK and CS ) DE changes in #297 · 2467fec3
  Vitaliy Vashchenko authored 9 years ago
  
  2467fec3
- Merge branch 'feature-panoramascreen' into 'devel' · 5360c75e
  Matyáš Latner authored 9 years ago
```
#269 SK translation fix



See merge request !298
```
  5360c75e
- Merge branch 'feature-germanlanguage' into 'devel' · 6d430fc2
  Matyáš Latner authored 9 years ago
```
Nasazení oprav DE obrázků



See merge request !297
```
  6d430fc2
- #269 SK translation fix · 1c917c83
  Vitaliy Vashchenko authored 9 years ago
  
  1c917c83
- Merge branch 'fix-3.0.1' into devel · c04f392e
  Matyáš Latner authored 9 years ago
  
  c04f392e
- Merge branch 'feature-rest-server' into 'devel' · 7adc7d3b
  Matyáš Latner authored 9 years ago
```
Fixed shared model - server doesn't know about Tablexia classes



See merge request !293
```
  7adc7d3b
- Merge branch 'fix-3.0.1-ios-connection-check' into 'fix-3.0.1' · 1ad52357
  Matyáš Latner authored 9 years ago
```
Fixed network connection check for iOS.



See merge request !295
```
  1ad52357
- Merge branch 'feature-createuser' into 'devel' · 026f33ee
  Matyáš Latner authored 9 years ago
```
#118 Přidány nové avatary



See merge request !292
```
  026f33ee
- #118 Smaller avatars · 6bb6594c
  Matyáš Latner authored 9 years ago
  
  6bb6594c
- #104 Added assets of newspaper and bank · 5493b996
  Anton Danilov authored 9 years ago and Anton Danilov committed 9 years ago
  
  5493b996