Skip to content
Snippets Groups Projects
Commit a1cbb346 authored by Matyáš Latner's avatar Matyáš Latner
Browse files

Merge branch 'feature-gamemenu' into devel

parents afa4a7fa 5efa62b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
.gitignore
+ 3
− 0
View file @ a1cbb346
......@@ -70,3 +70,6 @@ ios/robovm.properties
## core
core/gen
temp/
\ No newline at end of file
core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png

333 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png

602 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png

383 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png

48.6 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png

213 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png

678 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png
core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/clickablemap.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/clickablemap.png

17.3 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/clickablemap.png

8.04 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/clickablemap.png
core/assets/common/screen/gamemenu/gfx/clickablemap.png
core/assets/common/screen/gamemenu/gfx/clickablemap.png
core/assets/common/screen/gamemenu/gfx/clickablemap.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/desk.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/desk.png

38.7 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/desk.png

165 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/desk.png
core/assets/common/screen/gamemenu/gfx/desk.png
core/assets/common/screen/gamemenu/gfx/desk.png
core/assets/common/screen/gamemenu/gfx/desk.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png

32 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png

83.1 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png
core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png
core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png
core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png

30.2 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png

77.4 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png
core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png
core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png
core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png

36.3 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png

598 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png

26.4 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png

201 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png

128 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png

669 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png
core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/office.jpg
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/office.jpg

373 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/office.jpg

222 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/office.jpg
core/assets/common/screen/gamemenu/gfx/office.jpg
core/assets/common/screen/gamemenu/gfx/office.jpg
core/assets/common/screen/gamemenu/gfx/office.jpg
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/potme_back.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/potme_back.png

10.7 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/potme_back.png

731 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/potme_back.png
core/assets/common/screen/gamemenu/gfx/potme_back.png
core/assets/common/screen/gamemenu/gfx/potme_back.png
core/assets/common/screen/gamemenu/gfx/potme_back.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/potme_fore.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/potme_fore.png

8.89 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/potme_fore.png

50.3 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/potme_fore.png
core/assets/common/screen/gamemenu/gfx/potme_fore.png
core/assets/common/screen/gamemenu/gfx/potme_fore.png
core/assets/common/screen/gamemenu/gfx/potme_fore.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/potme_mid.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/potme_mid.png

283 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/potme_mid.png

547 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/potme_mid.png
core/assets/common/screen/gamemenu/gfx/potme_mid.png
core/assets/common/screen/gamemenu/gfx/potme_mid.png
core/assets/common/screen/gamemenu/gfx/potme_mid.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/profile_pressed.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/profile_pressed.png

5.73 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/profile_pressed.png

173 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/profile_pressed.png
core/assets/common/screen/gamemenu/gfx/profile_pressed.png
core/assets/common/screen/gamemenu/gfx/profile_pressed.png
core/assets/common/screen/gamemenu/gfx/profile_pressed.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png

338 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png

753 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png

70.3 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png

176 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png

234 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png

659 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png
core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png
  • 2-up
  • Swipe
  • Onion skin
core/assets/common/screen/gamemenu/gfx/statistics_pressed.png
+ 0
− 0
View replaced file @ afa4a7fa View file @ a1cbb346
core/assets/common/screen/gamemenu/gfx/statistics_pressed.png

21.9 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/statistics_pressed.png

61.9 KiB | W: | H:

core/assets/common/screen/gamemenu/gfx/statistics_pressed.png
core/assets/common/screen/gamemenu/gfx/statistics_pressed.png
core/assets/common/screen/gamemenu/gfx/statistics_pressed.png
core/assets/common/screen/gamemenu/gfx/statistics_pressed.png
  • 2-up
  • Swipe
  • Onion skin
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment