Commits · 1627b058562c98cdc6c69a6da59798a425a1e1ff · 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.

Apr 15, 2016
- Merge branch 'feature-gamemenu2' into 'devel' · 1627b058
  Matyáš Latner authored 8 years ago
```
Feature gamemenu2



See merge request !316
```
  1627b058
Apr 14, 2016
- Merge branch 'feature-gamemenu-devel' into 'devel' · ce9851df
  Matyáš Latner authored 8 years ago
```
#309 Fix touch event invoking while scrolling.



See merge request !313
```
  ce9851df
- Merge branch 'feature-loadingscreen' into 'devel' · bc459a33
  Matyáš Latner authored 8 years ago
```
#312 Fixed loading bar rendering glitch



See merge request !314
```
  bc459a33
- Merge branch 'feature-menu' into 'devel' · 0b48abcc
  Matyáš Latner authored 8 years ago
```
#319 Removed currently chosen item from SelectBoxList



See merge request !318
```
  0b48abcc
- Merge branch 'feature-kidnapping' into 'devel' · ead64a15
  Matyáš Latner authored 8 years ago
```
Feature kidnapping



See merge request !320
```
  ead64a15
- #285 Small fixes · 898948fd
  Matyáš Latner authored 8 years ago
  
  898948fd
Apr 11, 2016
- #285 Code refactoring. · 504f464c
  Vitaliy Vashchenko authored 8 years ago
  
  504f464c
- #285 Assets names refactoring. · e050dbd8
  Vitaliy Vashchenko authored 8 years ago
  
  e050dbd8
- #324 Fixed playing of sounds when changing difficulty. · d7428b4d
  Drahomír Karchňák authored 8 years ago
  
  d7428b4d
Apr 08, 2016
- #319 Removed currently chosen item from SelectBoxList · b9e625e2
  Drahomír Karchňák authored 8 years ago
  
  b9e625e2
Apr 07, 2016
- #320 Cropped transparent background from Encyclopedias play and pause button... · 84f61835
  Drahomír Karchňák authored 8 years ago
```
#320 Cropped transparent background from Encyclopedias play and pause button icons to scale better...
```
  84f61835
- #320 Added Yes/No icons for Yes/No dialog buttons. Also did some refactoring... · 3b2b688d
  Drahomír Karchňák authored 8 years ago
```
#320 Added Yes/No icons for Yes/No dialog buttons. Also did some refactoring with ImageTablexiaButton... Fixed some bugs, tweaked some stuff... I forgot to commit for the whole day today :/
```
  3b2b688d
- Merge branch 'feature-gamemenu2' of gitlab.labs.nic.cz:mlatner/tablexia-libgdx... · 34f9f607
  Drahomír Karchňák authored 8 years ago
```
Merge branch 'feature-gamemenu2' of gitlab.labs.nic.cz:mlatner/tablexia-libgdx into feature-gamemenu2
```
  34f9f607
- #314 Fixed annoying gap between game menu pages and overscroll borders · 8c952035
  Drahomír Karchňák authored 8 years ago
  
  8c952035
Apr 06, 2016
- #285 Colored arrows are replaced with white ones. Color changes are based on arrow object state. · 75306860
  Vitaliy Vashchenko authored 8 years ago
  
  75306860
- #317 Resized background for all game menu pages · 5b420c93
  Drahomír Karchňák authored 8 years ago
  
  5b420c93
Apr 05, 2016
- #315 Filled up overscrolls in panorama screen · 3034b8eb
  Drahomír Karchňák authored 8 years ago
  
  3034b8eb
- #314 Added overscroll borders to GameMenuScreen and changed HallOfFame's overscroll borders... · f654683e
  Drahomír Karchňák authored 8 years ago
  
  f654683e
Apr 04, 2016
- #314 Added ScrollPaneWithBorders class, which takes border images and renders... · 9c5f1787
  Drahomír Karchňák authored 8 years ago
```
#314 Added ScrollPaneWithBorders class, which takes border images and renders em instead of overscroll
```
  9c5f1787
Apr 01, 2016
- #312 Fixed loading bar rendering glitch · 65ea5bd9
  Drahomír Karchňák authored 8 years ago
  
  65ea5bd9
- Upgrade to RoboVM 1.7 for AppStore deploy · e96b2230
  Matyáš Latner authored 8 years ago
  
  e96b2230
- iOS manifest modification for AppStore deploy · 059d09f3
  Matyáš Latner authored 8 years ago
  
  059d09f3
Mar 31, 2016
- #309 Fix touch event invoking while scrolling. · 448f60bb
  Vitaliy Vashchenko authored 8 years ago
  
  448f60bb
- Merge branch 'feature-gamemenu-devel' into 'devel' · 2a272889
  Matyáš Latner authored 8 years ago
```
Feature gamemenu devel

Zmenil jsem pozice nekterych obrazku, co jsou na pozadi gamemenu tak, aby text se slozitosti byl lepe citelny. 

![Screenshot_from_2016-03-31_15-06-07](/uploads/80be148036f69c5c976b9896c31a62ba/Screenshot_from_2016-03-31_15-06-07.png)
![Screenshot_from_2016-03-31_15-02-42](/uploads/158f4e3e53f3cc902e2735d22ea70db2/Screenshot_from_2016-03-31_15-02-42.png)



See merge request !311
```
  2a272889
- Merge branch 'feature-createuser' into 'devel' · 5f461f6d
  Matyáš Latner authored 8 years ago
```
#288 updated profile photos, changed order of photos when creating profile



See merge request !310
```
  5f461f6d
- #304 Generating of capital letters for specific words in DE Robbery game text rules · 5d6ebede
  Matyáš Latner authored 8 years ago
  
  5d6ebede
- Corrected position of night watch fore. · 432db180
  Vitaliy Vashchenko authored 8 years ago
  
  432db180
- Corrected position of pursuit fore. · ec668691
  Vitaliy Vashchenko authored 8 years ago
  
  ec668691
- #288 updated profile photos, changed order of photos when creating profile · f98f3854
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  f98f3854
- Merge branch 'feature-translations-de' into devel · b55f3203
  Matyáš Latner authored 8 years ago
  
  b55f3203
- Merge branch 'feature-pursuit_devel' into 'devel' · 14767ef2
  Matyáš Latner authored 8 years ago
```
#280 ArrayIndexOutOfBoundsException fix



See merge request !306
```
  14767ef2
- Merge branch 'feature-encyclopedia' into 'devel' · f79d1b2d
  Matyáš Latner authored 8 years ago
```
#295 Změna uvozovek



See merge request !308
```
  f79d1b2d
- Merge branch 'feature-loadingscreen' into 'devel' · 066fb613
  Matyáš Latner authored 8 years ago
```
#293 Změna DE popisku pro nového detektiva



See merge request !309
```
  066fb613
- Merge branch 'feature-gamemenu2' into 'devel' · eca4e0ae
  Matyáš Latner authored 8 years ago
```
Feature gamemenu2



See merge request !305
```
  eca4e0ae
- #297 Changed DE text in Ecyklopedia play button to "Wiedegabe" and fixed image button sizing · 7f2f2663
  Matyáš Latner authored 8 years ago
  
  7f2f2663
Mar 30, 2016
- #298 mal instead of x (multiply) · 7a0c8fd3
  Vitaliy Vashchenko authored 8 years ago
  
  7a0c8fd3
- #293 DE button for new user -neuer Detektiv- changed to -Neues Profil- · 6efb6d81
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  6efb6d81
- 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
- #298 Corrections in DE texts · 7799904f
  Vitaliy Vashchenko authored 8 years ago
  
  7799904f