Merge branch 'feature-gamemenu' into 'devel'

Feature gamemenu * Tačítko pro spuštění hry * Prokliky v kanceláři * Parallax See merge request !14

Merge branch 'feature-gamemenu' into 'devel'
Feature gamemenu * Tačítko pro spuštění hry * Prokliky v kanceláři * Parallax See merge request !14
29a352d7 · Matyáš Latner · 566d6046 · 505a281b · 29a352d7 · 29a352d7
Commit 29a352d7 authored 9 years ago by Matyáš Latner
--- a/core/assets/common/screen/gamemenu/bankovniloupez_back.png
+++ b/core/assets/common/screen/gamemenu/bankovniloupez_back.png
--- a/core/assets/common/screen/gamemenu/bankovniloupez_fore.png
+++ b/core/assets/common/screen/gamemenu/bankovniloupez_fore.png
--- a/core/assets/common/screen/gamemenu/bankovniloupez_mid.png
+++ b/core/assets/common/screen/gamemenu/bankovniloupez_mid.png
--- a/core/assets/common/screen/gamemenu/clickablemap.png
+++ b/core/assets/common/screen/gamemenu/clickablemap.png
--- a/core/assets/common/screen/gamemenu/desk.png
+++ b/core/assets/common/screen/gamemenu/desk.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_background.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_background.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_easy.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_easy.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_hard.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_hard.png
--- a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_medium.png
+++ b/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_medium.png
--- a/core/assets/common/screen/gamemenu/encyclopedia_pressed.png
+++ b/core/assets/common/screen/gamemenu/encyclopedia_pressed.png
--- a/core/assets/common/screen/gamemenu/halloffame_pressed.png
+++ b/core/assets/common/screen/gamemenu/halloffame_pressed.png
--- a/core/assets/common/screen/gamemenu/helpbutton_pressed.png
+++ b/core/assets/common/screen/gamemenu/helpbutton_pressed.png
--- a/core/assets/common/screen/gamemenu/helpbutton_unpressed.png
+++ b/core/assets/common/screen/gamemenu/helpbutton_unpressed.png
--- a/core/assets/common/screen/gamemenu/helplayer_clickablemap.png
+++ b/core/assets/common/screen/gamemenu/helplayer_clickablemap.png
--- a/core/assets/common/screen/gamemenu/nocnisledovani_back.png
+++ b/core/assets/common/screen/gamemenu/nocnisledovani_back.png
--- a/core/assets/common/screen/gamemenu/nocnisledovani_fore.png
+++ b/core/assets/common/screen/gamemenu/nocnisledovani_fore.png
--- a/core/assets/common/screen/gamemenu/nocnisledovani_mid.png
+++ b/core/assets/common/screen/gamemenu/nocnisledovani_mid.png
--- a/core/assets/common/screen/gamemenu/potme_back.png
+++ b/core/assets/common/screen/gamemenu/potme_back.png
--- a/core/assets/common/screen/gamemenu/potme_fore.png
+++ b/core/assets/common/screen/gamemenu/potme_fore.png