Skip to content

Commit 4c6a8bc

Browse files
committed
Merge from dev [skip ci]
2 parents 7ab5bb7 + 2bab758 commit 4c6a8bc

File tree

134 files changed

+706
-711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+706
-711
lines changed

.github/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
### [>>Latest release<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
2323
### [Write here](https://github.com/OGSR/OGSR-Engine/issues) to report bugs ###
2424
### [Write here](https://github.com/OGSR/OGSR-Engine/discussions) your suggestions, questions and everything else ###
25-
#### For the engine to work with the worldwide version of SoC, use the ` -steam` launch parameter ####
2625

2726
### Compilation guide: ###
2827
* Latest version of Visual Studio 2017 or 2019 or 2022 required
@@ -56,7 +55,6 @@ And everyone else whose work has been used. If you are not mentioned, send a mes
5655
### [>>Свежий релиз<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
5756
### Баги можно присылать [сюда](https://github.com/OGSR/OGSR-Engine/issues) ###
5857
### Предложения, вопросы и тп можно писать [сюда](https://github.com/OGSR/OGSR-Engine/discussions) ###
59-
#### Для того, чтобы движок работал с WW-версией SHOC - используйте специальный ключ запуска ` -steam` ####
6058

6159
### Инструкции по сборке: ###
6260
* Требуется актуальная версия Visual Studio 2017 или 2019 или 2022

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,9 @@
581581
<string id="ui_mm_small_font">
582582
<text>Small font (requires restart)</text>
583583
</string>
584+
<string id="ui_mm_crosshair_hard">
585+
<text>Realistic crosshair</text>
586+
</string>
584587
<!-- Controls menu -->
585588
<string id="ui_mm_controls">
586589
<text>Controls</text>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,9 @@
581581
<string id="ui_mm_small_font">
582582
<text>Óìåíüøåííûé øðèôò (òðåáóåòñÿ ïåðåçàïóñê èãðû)</text>
583583
</string>
584+
<string id="ui_mm_crosshair_hard">
585+
<text>Ðåàëèñòè÷íûé ïðèöåë</text>
586+
</string>
584587
<!-- Îêíî "Óïðàâëåíèå" -->
585588
<string id="ui_mm_controls">
586589
<text>Óïðàâëåíèå</text>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,11 @@
700700
<text font="letterica16" r="215" g="195" b="170">ui_mm_small_font</text>
701701
</check_small_font>
702702

703+
<check_crosshair_hard x="20" y="305" width="243" height="21">
704+
<options_item entry="hud_crosshair_hard" group="mm_opt_gameplay"/>
705+
<text font="letterica16" r="215" g="195" b="170">ui_mm_crosshair_hard</text>
706+
</check_crosshair_hard>
707+
703708
</tab_gameplay>
704709
<tab_controls>
705710
<cap_mousesens x="20" y="25" width="150" height="21">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ function opt_gameplay:InitControls(x, y, xml)
2525
xml:InitCheck("tab_gameplay:check_ammunition_on_belt", self)
2626
xml:InitCheck("tab_gameplay:check_build_crosshair", self)
2727
xml:InitCheck("tab_gameplay:check_small_font", self)
28+
xml:InitCheck("tab_gameplay:check_crosshair_hard", self)
2829
xml:InitComboBox("tab_gameplay:list_difficulty", self)
2930
end
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)