Merge branch 'devel' into feature-encyclopedia-devel

ae4d2559 · Vitaliy Vashchenko · fb33c38b · f3f30178 · ae4d2559 · fb33c38b
Commit ae4d2559 authored 9 years ago by Vitaliy Vashchenko
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,6 @@ ios/robovm.properties

 ## core
 core/gen
+
+
+temp/
\ No newline at end of file
--- a/android/assets/gfx/screen_loader_background.jpg
+++ b/android/assets/gfx/screen_loader_background.jpg
--- a/core/assets/common/_global/application/dialog/bubble_arrow_left.9.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_left.9.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_bottom.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_bottom.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_left.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_left.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_right.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_right.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_top.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_bend_left_top.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_bottom.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_bottom.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_left.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_left.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_right.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_right.png
--- a/core/assets/common/_global/application/dialog/bubble_arrow_top.png
+++ b/core/assets/common/_global/application/dialog/bubble_arrow_top.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_bottom.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_bottom.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_left.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_left.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_pure.9.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_pure.9.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_right.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_right.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_round.9.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_round.9.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_square.9.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_square.9.png
--- a/core/assets/common/_global/application/dialog/bubble_classic_top.png
+++ b/core/assets/common/_global/application/dialog/bubble_classic_top.png
--- a/core/assets/common/game/robbery/gamescreen/background_bank.png
+++ b/core/assets/common/game/robbery/gamescreen/background_bank.png
--- a/core/assets/common/game/robbery/gamescreen/background_bank_bottom.png
+++ b/core/assets/common/game/robbery/gamescreen/background_bank_bottom.png