Merge pull request #195 from OGSR/dev [skip ci]

.gitattributes

@@ -1,3 +1,3 @@
 # Custom
 *.script text=crlf linguist-language=Lua
-*.ltx    text=crlf linguist-language=INI
+*.ltx    text=crlf linguist-language=INI

.github/README.md

@@ -1,5 +1,10 @@
-# OGSR Engine [![Build Status](https://github.com/OGSR/OGSR-Engine/workflows/Main%20Workflow/badge.svg?branch=dev&event=push)](https://github.com/OGSR/OGSR-Engine/actions?query=branch%3Adev+event%3Apush+workflow%3A%22Main+Workflow%22)
+<p align="center">
+  <a href="https://github.com/OGSR/OGSR-Engine/releases/latest"><img src="https://img.shields.io/github/release/OGSR/OGSR-Engine.svg?style=flat-square" alt="GitHub release"></a>
+  <a href="https://github.com/OGSR/OGSR-Engine/releases/latest"><img src="https://img.shields.io/github/downloads/OGSR/OGSR-Engine/total.svg?style=flat-square" alt="Total downloads"></a>
+  <a href="https://github.com/OGSR/OGSR-Engine/actions?query=branch%3Adev+event%3Apush+workflow%3A%22Main+Workflow%22"><img src="https://img.shields.io/github/workflow/status/OGSR/OGSR-Engine/Main%20Workflow?label=build&logo=github&style=flat-square" alt="Build Status"></a>
+
 ![Logo](https://cdn1.radikalno.ru/uploads/2019/6/13/b1b4c50115286e39d7c118897816d78d-full.png)
+
 ### Цели проекта: ### 
 * Исправление ошибок оригинального движка
 * Улучшение графики и оптимизация

.github/workflows/push.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: "!contains(github.event.head_commit.message, '[skip ci]') || github.event_name == 'release'"
     runs-on: windows-latest
     strategy:
       fail-fast: false

Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_mm.xml

@@ -275,13 +275,7 @@
 	<string id="ui_mm_anisotropic">
 		<text>Ôèëüòðàöèÿ òåêñòóð</text>
 	</string>
-	<string id="ui_mm_r2_aa_mode">
-		<text>Ðåæèì ñãëàæèâàíèÿ (R2)</text>
-	</string>	
-	<string id="fxaa">
-		<text>FXAA</text>
-	</string>
-	<string id="smaa">
+	<string id="st_opt_smaa">
 		<text>SMAA</text>
 	</string>	
 	<string id="ui_mm_r2_sun">
@@ -298,16 +292,21 @@
 	</string>		
 	<string id="ui_mm_r2_sunshafts">
 		<text>Îáú¸ìíûå ëó÷è</text>
-	</string>	
+	</string>
+
 	<string id="ui_mm_r2_sunshafts_mode">
-		<text>Òèï îáú¸ìíûõ ëó÷åé</text>
+		<text>Òèï ñîëíå÷íûõ ëó÷åé</text>
 	</string>
 	<string id="volumetric">
-		<text>S.T.A.L.K.E.R. ×èñòîå Íåáî</text>
+		<text>Volumetric</text>
+	</string>
+	<string id="ss_ogse">
+		<text>Screen space (OGSE)</text>
 	</string>
-	<string id="screen_space">
-		<text>Crysis</text>
+	<string id="ss_manowar">
+		<text>Screen space (Mrmnwar)</text>
 	</string>
+
 	<string id="ui_mm_light_distance">
 		<text>Äàëüíîñòü îñâåùåíèÿ</text>
 	</string>
@@ -410,15 +409,9 @@
 	<string id="ui_mm_r2_gbuffer_opt">
 		<text>Îïòèìèçàöèÿ øåéäåðîâ</text>
 	</string>
-	<string id="ui_mm_ssample">
-		<text>Ñãëàæèâàíèå íà ñòàòè÷åñêîì îñâåùåíèè</text>
-	</string>	
 	<string id="ui_mm_msaa">
 		<text>MSAA</text>
 	</string>
-	<string id="ui_mm_fxaa">
-		<text>FXAA</text>
-	</string>
 	<string id="ui_mm_switch_torch">
 		<text>Èñïîëüçîâàíèå ôîíàðèêîâ AI</text>
 	</string>
@@ -428,7 +421,7 @@
 		<string id="ui_mm_r2_sun_lumscale">
 		<text>ßðêîñòü ñâåòà ñîëíöà</text>
 	</string>
-	<string id="ui_mm_r2_aa">
+	<string id="ui_mm_r_aa_mode">
 		<text>Ñãëàæèâàíèå</text>
 	</string>	
 	<string id="ui_mm_r2_gi">
@@ -655,11 +648,8 @@
 	<string id="video_settings_name_17">
 		<text>×àñòîòà 60Ãö - rs_refresh_60hz</text>
 	</string>
-	<string id="video_settings_name_18">
-		<text>Ñãëàæèâàíèå íà äèíàìè÷åñêîì îñâåùåíèè - r2_aa</text>
-	</string>
 	<string id="video_settings_name_19">
-		<text>Òèï ñãëàæèâàíèÿ íà äèíàìè÷åñêîì îñâåùåíèè - r2_aa_mode</text>
+		<text>Òèï ñãëàæèâàíèÿ - r_aa_mode</text>
 	</string>
 	<string id="video_settings_name_20">
 		<text>Îò÷åòëèâîñòü òåêñòóð íà ðàññòîÿíèè - r__tf_mipbias</text>
@@ -689,14 +679,11 @@
 		<text>Ôîíîâàÿ îñâåùåííîñòü - r2_sun_lumscale_amb</text>
 	</string>
 	<string id="video_settings_name_29">
-		<text>Îáú¸ìíûå ëó÷è - r2_sun_shafts</text>
+		<text>Òèï ñîëíå÷íûõ ëó÷åé - r_sunshafts_mode</text>
 	</string>
 	<string id="ui_mm_r2_sun_quality">
 		<text>Ìÿãêèå òåíè îò ñîëíöà</text>
 	</string>
-	<string id="video_settings_name_30">
-		<text>Òèï îáú¸ìíûõ ëó÷åé - r2_sunshafts_mode</text>
-	</string>
 	<string id="video_settings_name_31">
 		<text>Ìÿãêèå êðàÿ âîäû - r2_soft_water</text>
 	</string>
@@ -824,9 +811,6 @@
 	<string id="video_settings_desc_9">
 		<text>Ýòà íàñòðîéêà âêëþ÷àåò cëåäû îò ïóëåâûõ ïîïàäàíèé íà òåëàõ.</text>
 	</string>
-	<string id="video_settings_desc_10">
-		<text>Ýòà íàñòðîéêà ðåãóëèðóåò êà÷åñòâî ýôôåêòà ïîëíîýêðàííîãî ñãëàæèâàíèÿ äâèæêîì èãðû íà ñòàòè÷åñêîì îñâåùåíèè.</text>
-	</string>
 	<string id="video_settings_desc_11">
 		<text>Ýòà íàñòðîéêà âêëþ÷àåò îòáðàñûâàíèå îáúåêòàìè òåíåé îò ñîëíå÷íîãî ñâåòà. Íà ñëàáûõ ÏÊ îòêëþ÷åíèå ýòîé íàñòðîéêè ìîæåò äàòü ñåðüåçíûé ïðèðîñò ñêîðîñòè.</text>
 	</string>
@@ -848,11 +832,8 @@
 	<string id="video_settings_desc_17">
 		<text>Ýòà íàñòðîéêà çàñòàâëÿåò èãðó âñåãäà èñïîëüçîâàòü âèäåîðåæèì ñ ÷àñòîòîé îáíîâëåíèÿ ýêðàíà 60 Ãåðö. Íàñòðîéêà ïîëåçíà äëÿ îáëàäàòåëåé ìîíèòîðîâ, ó êîòîðûõ èãðà ïðè çàïóñêå íåâåðíî îïðåäåëÿåò ÷àñòîòó îáíîâëåíèÿ ýêðàíà. Îäíàêî, âêëþ÷àòü ýòó íàñòðîéêó ðåêîìåíäóåòñÿ òîëüêî åñëè ó âàñ åñòü òàêàÿ ïðîáëåìà.  íåêîòîðûõ ðåäêèõ ñëó÷àÿõ âêëþ÷åíèå ýòîé íàñòðîéêè ìîæåò âûçûâàòü ëàãè â ïîëíîýêðàííîì ðåæèìå.</text>
 	</string>
-	<string id="video_settings_desc_18">
-		<text>Ýòà íàñòðîéêà âêëþ÷àåò øåéäåðíîå ñãëàæèâàíèå íà äèíàìè÷åñêîì îñâåùåíèè.</text>
-	</string>
 	<string id="video_settings_desc_19">
-		<text>Ýòà íàñòðîéêà ïåðåêëþ÷àåò òèï ñãëàæèâàíèÿ íà äèíàìè÷åñêîì îñâåùåíèè. Äîñòóïíû äâà òèïà ñãëàæèâàíèÿ - FXAA (Fast Approximate AntiAliasing) è SMAA (Subpixel Morphological AntiAliasing).</text>
+		<text>Ýòà íàñòðîéêà ïåðåêëþ÷àåò òèï ñãëàæèâàíèÿ. Äîñòóïåí SMAA (Subpixel Morphological AntiAliasing).</text>
 	</string>
 	<string id="video_settings_desc_20">
 		<text>Ýòà íàñòðîéêà ðåãóëèðóåò äåòàëèçàöèþ ìèï-óðîâíåé òåêñòóð íà ðàññòîÿíèè. Íîðìàëüíîå çíà÷åíèå ýòîãî ïîëçóíêà - ñðåäíåå, ïðè åãî óìåíüøåíèè òåêñòóðû íà ðàññòîÿíèè áóäóò ìåíåå ÷åòêèìè, ïðè óâåëè÷åíèè - áîëåå ÷åòêèìè, íî ÷ðåçìåðíîå óâåëè÷åíèå ìîæåò ïðèâåñòè ê ïîÿâëåíèþ ìóàðà è íåïðèÿòíûõ ãëàçó ìåëüòåøàùèõ òî÷åê íà äàëåêèõ îáúåêòàõ.</text>
@@ -882,10 +863,7 @@
 		<text>Ýòà íàñòðîéêà ðåãóëèðóåò èíòåíñèâíîñòü ðàññåÿíîãî ñâåòà, íåçàâèñèìîãî îò ñîëíöà. ×åì îíà âûøå, òåì ñâåòëåå áóäóò âñå çàòåíåííûå ó÷àñòêè â èãðå, è òåì áëåäíåé áóäó âûãëÿäåòü òåíè îò ñîëíöà. ÂÍÈÌÀÍÈÅ! Ýòî íàñòðîéêà èç ðàçðÿäà \"íà ëþáèòåëÿ\", è åñëè âû íå çíàåòå òî÷íî, ÷òî äåëàåòå - îñòàâüòå å¸ íà çíà÷åíèè ïî-óìîë÷àíèþ. Ïîâûñüòå, åñëè â öåëîì èãðà âàì êàæåòñÿ ñëèøêîì òåìíîé è ïîëçóíêàìè íàñòðîéêè ÿðêîñòè/êîíòðàñòíîñòè âû íå ìîæåòå äîñòè÷ü æåëàåìîãî ýôôåêòà. Íå ðåêîìåíäóåòñÿ çàäèðàòü ñëèøêîì ñèëüíî - èçîáðàæåíèå ïîòåðÿåò â îáúåìíîñòè, ñòàíåò âûãëÿäåòü áîëåå ïëîñêèì.</text>
 	</string>
 	<string id="video_settings_desc_29">
-		<text>Ýòà íàñòðîéêà ðåãóëèðóåò ðåíäåðèíã îáú¸ìíûõ (÷àùå ñîëíå÷íûõ) ëó÷åé íà ïûëè â âîçäóõå.</text>
-	</string>
-	<string id="video_settings_desc_30">
-		<text>Ýòà íàñòðîéêà ïåðåêëþ÷àåò òèï îáú¸ìíûõ ëó÷åé. Ìîæíî âûáðàòü âàðèàíò èç Crysis èëè æå âàðèàíò èç STALKER: ×èñòîå Íåáî. ÂÍÈÌÀÍÈÅ! Îáú¸ìíûå ëó÷è èç ×èñòîãî Íåáà ìîãóò ñóùåñòâåííî ïîíèçèòü ïðîèçâîäèòåëüíîñòü.</text>
+		<text>Ýòà íàñòðîéêà ïåðåêëþ÷àåò òèï ñîëíå÷íûõ ëó÷åé. Âûáåðèòå òîò, êîòîðûé áîëüøå ïîíðàâèòñÿ.</text>
 	</string>
 	<string id="video_settings_desc_31">
 		<text>Ýòà íàñòðîéêà âêëþ÷àåò ýôôåêò ñìÿã÷åíèÿ êðàÿ âîäíûõ ïîâåðõíîñòåé. Ïðè å¸ âêëþ÷åíèè âîäà ó êðàÿ âîäîåìîâ áóäåò ïëàâíî íàáèðàòü ïðîçðà÷íîñòü âïëîòü äî ïîëíîé íåçàìåòíîñòè, ÷òî ïîçâîëÿåò óñòðàíèòü ýôôåêò ðåçêîé è ñèëüíî çàìåòíîé ãðàíèöû ìåæäó âîäîé è ñóøåé.</text>

Game/Resources_SoC_1.0006/gamedata/config/ui/ui_mm_opt.xml

@@ -337,12 +337,18 @@
 			<list_font r="216" g="186" b="140" font="letterica16"/>
         </list_msaa>
 
-        <cap_fxaa x="5" y="5" width="143" height="21">
-            <text font="letterica16" r="215" g="195" b="170">ui_mm_fxaa</text>
-        </cap_fxaa>
-        <check_fxaa x="249" y="0" width="30" height="21">
-            <options_item entry="r2_fxaa" group="mm_opt_video"/>
-        </check_fxaa>
+		<cap_aa x="5" y="5" width="143" height="21">
+            <text font="letterica16" r="215" g="195" b="170">ui_mm_r_aa_mode</text>
+        </cap_aa>
+        <list_aa x="249" y="0" width="190" height="21" list_length="2" always_show_scroll="0">
+            <options_item entry="r_aa_mode" group="mm_opt_video_adv" depend="vid"/>
+			<text_color>
+				<e r="216" g="186" b="140"/>
+				<d r="227" g="199" b="178"/>
+			</text_color>
+			<list_font_s r="240" g="217" b="182"/>
+			<list_font r="216" g="186" b="140" font="letterica16"/>
+        </list_aa>
 
         <cap_ssample x="5" y="5" width="143" height="21">
             <text font="letterica16" r="215" g="195" b="170">ui_mm_ssample</text>
@@ -442,10 +448,10 @@
         </check_60hz>
 
         <cap_sun_shafts x="5" y="5" width="143" height="21">
-            <text font="letterica16" r="215" g="195" b="170">ui_mm_sun_shafts</text>
+            <text font="letterica16" r="215" g="195" b="170">ui_mm_r2_sunshafts_mode</text>
         </cap_sun_shafts>
         <list_sun_shafts x="249" y="0" width="190" height="21" always_show_scroll="1">
-            <options_item entry="r2_sun_shafts" group="mm_opt_video" depend="vid"/>
+            <options_item entry="r_sunshafts_mode" group="mm_opt_video" depend="vid"/>
 			<text_color>
 				<e r="216" g="186" b="140"/>
 				<d r="227" g="199" b="178"/>

Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_video_adv.script

@@ -31,8 +31,8 @@ local adv_vid_opt_params = {
 	{ "texture_lod",           "track", 1, hint_colors.yellow, "video_settings_name_7" , "video_settings_desc_7"  },
 	{ "aniso",                 "track", 0, hint_colors.yellow, "video_settings_name_8" , "video_settings_desc_8"  },
 	--
+	{ "aa",                    "list",  0, hint_colors.green , "video_settings_name_19", "video_settings_desc_19", only_2a_and_more_mode },
 	{ "msaa",                  "list",  1, hint_colors.red   , "", ""                                            , only_3_and_more_mode  },
-	{ "fxaa",                  "check", 0, hint_colors.green , "", ""                                            , only_2a_and_more_mode },
 	{ "ssample",               "track", 0, hint_colors.green , "", ""                                            , only_1_mode  },
 	--
 	{ "detail_density",        "track", 0, hint_colors.red   , "video_settings_name_4" , "video_settings_desc_4"  },
@@ -49,7 +49,7 @@ local adv_vid_opt_params = {
 	{ "r2_detail_bump",        "check", 0, hint_colors.yellow, "video_settings_name_44", "video_settings_desc_44", only_2_and_more_mode },
 	{ "r2_steep_parallax",     "check", 0, hint_colors.red   , "video_settings_name_39", "video_settings_desc_39", only_25_and_more_mode },
 	{ "r2_sun_quality",        "list",  0, hint_colors.red   , "", ""                                            , only_25_and_more_mode },
-	{ "sun_shafts",            "list",  0, hint_colors.red   , "video_settings_name_29", "video_settings_desc_29", only_25_and_more_mode },
+	{ "sun_shafts",            "list",  0, hint_colors.red   , "video_settings_name_29", "video_settings_desc_29", only_2a_and_more_mode },
 	{ "ssao_mode",             "list",  1, hint_colors.yellow, "video_settings_name_38", "video_settings_desc_38", only_25_and_more_mode },
 	{ "ssao",                  "list",  1, hint_colors.yellow, "video_settings_name_37", "video_settings_desc_37", only_25_and_more_mode },
 	{ "soft_water",            "check", 0, hint_colors.green , "video_settings_name_31", "video_settings_desc_31", only_25_and_more_mode },