Merge branch 'feature-abstractgame' into 'devel'

Feature abstractgame See merge request !125

Merge branch 'feature-abstractgame' into 'devel'
Feature abstractgame See merge request !125
307d2bcf · Matyáš Latner · 1036404c · 0dcd5346 · 307d2bcf · 307d2bcf
Commit 307d2bcf authored 9 years ago by Matyáš Latner
--- a/core/assets/common/_preloader/kidnapping/preloader_anim1_0.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim1_0.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim1_1.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim1_1.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim1_2.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim1_2.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim1_3.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim1_3.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim1_4.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim1_4.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim2_0.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim2_0.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim2_1.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim2_1.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim2_2.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim2_2.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim2_3.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim2_3.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim2_4.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim2_4.png
--- a/core/assets/common/_preloader/kidnapping/preloader_anim2_5.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_anim2_5.png
--- a/core/assets/common/_preloader/kidnapping/preloader_info.png
+++ b/core/assets/common/_preloader/kidnapping/preloader_info.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_0.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_0.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_1.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_1.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_10.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_10.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_11.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_11.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_12.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_12.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_13.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_13.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_14.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_14.png
--- a/core/assets/common/_preloader/nightwatch/preloader_anim_15.png
+++ b/core/assets/common/_preloader/nightwatch/preloader_anim_15.png