Merge branch 'feature-halloffame_devel' into 'feature-halloffame'

Feature halloffame devel See merge request !4

Merge branch 'feature-halloffame_devel' into 'feature-halloffame'
Feature halloffame devel See merge request !4
f2e8ca58 · Matyáš Latner · 86d0a27a · 8e3512cc · f2e8ca58 · f2e8ca58
Commit f2e8ca58 authored 10 years ago by Matyáš Latner
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_background_carpet.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_background_carpet.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_background_door_pressed.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_background_door_pressed.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_background_door_unpressed.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_background_door_unpressed.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_background_start.jpg
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_background_start.jpg
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_background_tile.jpg
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_background_tile.jpg
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_mouse_pressed.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_mouse_pressed.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_mouse_unpressed.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_mouse_unpressed.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_mys_bubble.9.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_mys_bubble.9.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_00.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_00.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_01.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_01.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_02.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_02.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_03.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_03.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_04.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_04.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_05.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_05.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_06.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_06.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_07.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_07.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_08.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_08.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_09.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_09.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_10.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_10.png
--- a/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_15.png
+++ b/android/assets/screen/halloffame/gfx/screen_halloffame_trophyheap_15.png