Merge branch 'dev' of https://dev.ds-servers.com/sip/engine into dev

build/gamesource/config/game/controls.cfg

+[section_0]
+__name__ = Движение
+
+cmd_0 = +forward 
+txt_0 = Вперед
+
+cmd_1 = +backward
+txt_1 = Назад
+
+cmd_2 = +left
+txt_2 = Шаг влево
+
+cmd_3 = +right
+txt_3 = Шаг вправо
+
+cmd_4 = +boost
+txt_4 = Бег
+
+cmd_5 = +jump
+txt_5 = Прыжок
+
+cmd_6 = crouch_toggle
+txt_6 = Приседание (нажать)
+
+cmd_7 = +crouch
+txt_7 = Приседание (удерживать)
+
+cmd_8 = crawl_toggle
+txt_8 = Лечь (нажать)
+
+cmd_9 = +crawl
+txt_9 = Лечь (удерживать)
+
+[section_1]
+__name__ = Бой
+
+cmd_0 = +attack
+txt_0 = Стрельба
+
+cmd_1 = +attack2
+txt_1 = Прицел / Альтернативный огонь
+
+cmd_2 = reload
+txt_2 = Перезарядка
+
+cmd_3 = switch_firemode
+txt_3 = Режим огня
+
+[section_2]
+__name__ = Разное
+
+cmd_0 = +use
+txt_0 = Действие
+
+cmd_1 = flashlight
+txt_1 = Фонарь
+
+
+
+

source/game/GameData.cpp

@@ -367,7 +367,7 @@ GameData::GameData(HWND hWnd, bool isGame):
 			StringW sLevelName = ev->target->getAttribute(L"level_name");
 			if(ev->target->getAttribute(L"has_preview")[0] == L'1')
 			{
-				StringW sPreview = StringW(L"../../levels/") + sLevelName + L"/preview.png";
+				StringW sPreview = StringW(L"../../levels/") + sLevelName + L"/preview.bmp";
 				pNode->getStyleSelf()->background_image->set(sPreview);
 			}
 			else