Merge branch 'feature-crimescenegame-devel' into 'V3.3'

#527 #538 #543 New assets in CrimeScene Please check only switches left in ResultStars class (if ok, #533 can be also closed) See merge request !450

Merge branch 'feature-crimescenegame-devel' into 'V3.3'
370d16d3 · Matyáš Latner · 1ed3f673 · 78408bb7 · 1ed3f673 · 1ed3f673
Commit 370d16d3 authored 9 years ago by Matyáš Latner
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/book.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/book.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/cat.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/cat.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/clock.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/clock.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/cat_hiss.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/cat_hiss.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/cat_meow.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/cat_meow.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/cat_purr.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/cat_purr.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/medium/level3_4/coin.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/medium/level3_4/coin.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level4/mouse.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level4/mouse.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/curtain.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/curtain.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/door.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/door.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/curtain.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/curtain.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/door.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/door.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/stairs.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/stairs.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/window.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/common/window.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/book_browse.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/book_browse.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/book_fall.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/book_fall.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/clock.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/clock.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/radio.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/radio.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/safe.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level1/safe.png
--- a/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level2/cucumbers_jar.png
+++ b/core/assets/common/game/crimescene/common/gfx/actioncards/easy/level2/cucumbers_jar.png