Merge branch 'feature-crimescenegame-devel' into 'V3.3' (eb55da84) · Commits · labs / Tablexia

Commit eb55da84 authored 8 years ago by

Matyáš Latner

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

#485 #484 #482 #458 #456 #455 Feature crimescenegame devel



See merge request !412

parents ceed404a fc7c285c

Hide whitespace changes

Inline Side-by-side

Showing

android/assets/text/application/application_cs.properties 14 additions, 2 deletions

android/assets/text/application/application_cs.properties
android/assets/text/application/application_de.properties 16 additions, 4 deletions

android/assets/text/application/application_de.properties
android/assets/text/application/application_sk.properties 17 additions, 4 deletions

android/assets/text/application/application_sk.properties
core/assets/common/game/_global/trophy/trophy_crime_scene_10_finished_small.png 0 additions, 0 deletions

...e/_global/trophy/trophy_crime_scene_10_finished_small.png
core/assets/common/game/_global/trophy/trophy_crime_scene_1_finished_small.png 0 additions, 0 deletions

...me/_global/trophy/trophy_crime_scene_1_finished_small.png
core/assets/common/game/_global/trophy/trophy_crime_scene_1_limit_small.png 0 additions, 0 deletions

.../game/_global/trophy/trophy_crime_scene_1_limit_small.png
core/assets/common/game/_global/trophy/trophy_crime_scene_2_limit_small.png 0 additions, 0 deletions

.../game/_global/trophy/trophy_crime_scene_2_limit_small.png
core/assets/common/game/_global/trophy/trophy_crime_scene_5_finished_small.png 0 additions, 0 deletions

...me/_global/trophy/trophy_crime_scene_5_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_10_finished_empty.png 0 additions, 0 deletions

...alloffame/trophy/trophy_crime_scene_10_finished_empty.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_10_finished_full.png 0 additions, 0 deletions

...halloffame/trophy/trophy_crime_scene_10_finished_full.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_1_finished_empty.png 0 additions, 0 deletions

...halloffame/trophy/trophy_crime_scene_1_finished_empty.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_1_finished_full.png 0 additions, 0 deletions

.../halloffame/trophy/trophy_crime_scene_1_finished_full.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_1_limit_empty.png 0 additions, 0 deletions

...en/halloffame/trophy/trophy_crime_scene_1_limit_empty.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_1_limit_full.png 0 additions, 0 deletions

...een/halloffame/trophy/trophy_crime_scene_1_limit_full.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_2_limit_empty.png 0 additions, 0 deletions

...en/halloffame/trophy/trophy_crime_scene_2_limit_empty.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_2_limit_full.png 0 additions, 0 deletions

...een/halloffame/trophy/trophy_crime_scene_2_limit_full.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_5_finished_empty.png 0 additions, 0 deletions

...halloffame/trophy/trophy_crime_scene_5_finished_empty.png
core/assets/common/screen/halloffame/trophy/trophy_crime_scene_5_finished_full.png 0 additions, 0 deletions

.../halloffame/trophy/trophy_crime_scene_5_finished_full.png
core/assets/cs/_preloader/crimescene/help.mp3 0 additions, 0 deletions

core/assets/cs/_preloader/crimescene/help.mp3
core/assets/cs/game/crimescene/sfx/demo_score.mp3 0 additions, 0 deletions

core/assets/cs/game/crimescene/sfx/demo_score.mp3

with 47 additions and 10 deletions

Please register or to comment

Admin message

Admin message

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