Commits · 50f515140cac10b06e3b565050c4f8589d67bf12 · 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 08, 2015
- Merge branch 'devel' into feature-abstractgame · 50f51514
  Matyáš Latner authored 9 years ago
  
  50f51514
- Merge feature-gamemenu fix · 858abb57
  Matyáš Latner authored 9 years ago
  
  858abb57
- Merge branch 'feature-gamemenu' into devel · c22c747d
  Matyáš Latner authored 9 years ago
  
  c22c747d
- #11 Difficulty description from enum · e778c3ad
  Matyáš Latner authored 9 years ago
  
  e778c3ad
- #7 Loading of new game assets for each game cycle · 21046069
  Matyáš Latner authored 9 years ago
  
  21046069
Apr 07, 2015
- Debug apk does not change name and Android is sensorLandscape · a9284c57
  Luboš Horáček authored 9 years ago
  
  a9284c57
- Merge branch 'feature-screens' into 'devel' · 987067ce
  Matyáš Latner authored 9 years ago
```
ScreenDefinition refactoring to ChangeScreen events

Odstranění ScreenDefinition a místo toho použití ChangeScreen eventu v mainmenu

See merge request !19
```
  987067ce
- Merge branch 'devel' into feature-abstractgame · 206cbdfb
  Matyáš Latner authored 9 years ago
  
  206cbdfb
- #7 Robbery creatures count fix · 5ec3494e
  Matyáš Latner authored 9 years ago
  
  5ec3494e
- Merge branch 'devel' into feature-abstractgame · 6696ef0c
  Matyáš Latner authored 9 years ago
  
  6696ef0c
- #7 Game data loading lifecycle · e0507a48
  Matyáš Latner authored 9 years ago
  
  e0507a48
- ScreenDefinition refactoring to ChangeScreen events · d779cac0
  Luboš Horáček authored 9 years ago
  
  d779cac0
Apr 03, 2015
- Merge branch 'feature-createuser' into 'devel' · 2351e080
  Matyáš Latner authored 9 years ago
```
#22 Create user

See merge request !18
```
  2351e080
- #22 Initial screen switched back to GAME_MENU · d41f0d51
  Matyáš Latner authored 9 years ago
  
  d41f0d51
- #22 DirecotryAssets tool · b00c5ef0
  Luboš Horáček authored 9 years ago
  
  b00c5ef0
- #22 Create user · f303711c
  Luboš Horáček authored 9 years ago
  
  f303711c
Apr 02, 2015
- Clenaup · b3028745
  Luboš Horáček authored 9 years ago
  
  b3028745
- Merge branch 'devel' into feature-gamemenu · d83fee06
  Luboš Horáček authored 9 years ago
```
Conflicts:
	ios/src/cz/nic/tablexia/IOSLauncher.java
```
  d83fee06
- #11 Using GameDifficulty enum in game menu · 87030869
  Luboš Horáček authored 9 years ago
  
  87030869
- #7 AbstractTablexiaGame data loading fix · 31adb8ed
  Matyáš Latner authored 9 years ago
  
  31adb8ed
- #7 difficulty access and random seed access for AbstractTablexiaGame · 2df4dd99
  Matyáš Latner authored 9 years ago
  
  2df4dd99
- #11 Loading screen animation · 8d4c5572
  Luboš Horáček authored 9 years ago
  
  8d4c5572
- #11 Difficulty chooser alignment · 610fbe54
  Luboš Horáček authored 9 years ago
  
  610fbe54
- Merge branch 'devel' into feature-gamemenu · 76cc368b
  Luboš Horáček authored 9 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/ScreenDefinition.java
```
  76cc368b
- #19 pauseresume feature branch merge fix · a51600f2
  Matyáš Latner authored 9 years ago
  
  a51600f2
- Merge branch 'feature-pauseresume' into devel · 56d8f573
  Luboš Horáček authored 9 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/game/GameDefinition.java
	ios/src/cz/nic/tablexia/IOSLauncher.java
```
  56d8f573
- #11 Difficulty button switch · 925a4754
  Luboš Horáček authored 9 years ago
  
  925a4754
Apr 01, 2015
- Merge branch 'devel' into feature-gamemenu · b1584f94
  Luboš Horáček authored 9 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
```
  b1584f94
- Merge branch 'build_types' into 'devel' · 05b47be9
  Luboš Horáček authored 9 years ago
```
Build types

See merge request !16
```
  05b47be9
- #11 Office pressed states and profile screen · c5de8cc7
  Luboš Horáček authored 9 years ago
  
  c5de8cc7
- #11 Difficulty label style fix · 18ecf127
  Matyáš Latner authored 9 years ago
  
  18ecf127
- #1 building iOS IPA packages with arm64 architecture support · e4034157
  Matyáš Latner authored 9 years ago
  
  e4034157
- Merge branch 'feature-gamemenu' into 'devel' · 29a352d7
  Matyáš Latner authored 9 years ago
```
Feature gamemenu

 * Tačítko pro spuštění hry
 * Prokliky v kanceláři
 * Parallax

See merge request !14
```
  29a352d7
Mar 31, 2015
- #11 Difficulty button snaps to position · 505a281b
  Luboš Horáček authored 9 years ago
  
  505a281b
- #11 Full resolution images · a0904c46
  Luboš Horáček authored 9 years ago
  
  a0904c46
- #11 Game start button pressed state · 12317115
  Luboš Horáček authored 9 years ago
  
  12317115
- #11 Paralax foreground stretch and screen items as actors · d1a75ff2
  Luboš Horáček authored 9 years ago
  
  d1a75ff2
Mar 30, 2015
- #11 Clickmap in office · 05d30971
  Luboš Horáček authored 9 years ago
  
  05d30971
- #11 Paralax movement fix · f60ab1b6
  Luboš Horáček authored 9 years ago
  
  f60ab1b6
Mar 27, 2015
- #1 Singing iOS IPA packages fix · b3a2e493
  Matyáš Latner authored 10 years ago
  
  b3a2e493