mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'lazaroth/Tweaks'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-02-03 20:02:10 +01:00
commit 8292b22e2f
8 changed files with 69 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
files/materials/water.shader
View File

@ -135,20 +135,20 @@
#define VISIBILITY 1500.0 // how far you can look through water #define VISIBILITY 1500.0 // how far you can look through water
#define BIG_WAVES_X 0.3 // strength of big waves #define BIG_WAVES_X 0.1 // strength of big waves
#define BIG_WAVES_Y 0.3 #define BIG_WAVES_Y 0.1
#define MID_WAVES_X 0.3 // strength of middle sized waves #define MID_WAVES_X 0.1 // strength of middle sized waves
#define MID_WAVES_Y 0.15 #define MID_WAVES_Y 0.1
#define SMALL_WAVES_X 0.15 // strength of small waves #define SMALL_WAVES_X 0.1 // strength of small waves
#define SMALL_WAVES_Y 0.1 #define SMALL_WAVES_Y 0.1
#define WAVE_CHOPPYNESS 0.15 // wave choppyness #define WAVE_CHOPPYNESS 0.05 // wave choppyness
#define WAVE_SCALE 75.0 // overall wave scale #define WAVE_SCALE 75.0 // overall wave scale
#define BUMP 1.5 // overall water surface bumpiness #define BUMP 0.5 // overall water surface bumpiness
#define REFL_BUMP 0.08 // reflection distortion amount #define REFL_BUMP 0.15 // reflection distortion amount
#define REFR_BUMP 0.06 // refraction distortion amount #define REFR_BUMP 0.06 // refraction distortion amount
#define SCATTER_AMOUNT 0.3 // amount of sunlight scattering #define SCATTER_AMOUNT 0.3 // amount of sunlight scattering
@ -158,7 +158,6 @@
#define SPEC_HARDNESS 256.0 // specular highlights hardness #define SPEC_HARDNESS 256.0 // specular highlights hardness
// --------------------------------------------------------------- // ---------------------------------------------------------------

4
files/mygui/openmw_enchanting_dialog.layout
View File

@ -117,7 +117,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="0 340 560 60"> <Widget type="HBox" position="0 340 558 60">
<Property key="Padding" value="16"/> <Property key="Padding" value="16"/>
<Widget type="AutoSizedButton" skin="MW_Button" name="TypeButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="TypeButton">
@ -141,8 +141,6 @@
<Property key="Caption" value="0"/> <Property key="Caption" value="0"/>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="BuyButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="BuyButton">
<Property key="Caption" value="#{sBuy}"/> <Property key="Caption" value="#{sBuy}"/>
</Widget> </Widget>

5
files/mygui/openmw_merchantrepair.layout
View File

@ -4,7 +4,6 @@
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 418 248" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 418 248" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 18 418 24" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 18 418 24" align="Right Top">
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
<Property key="Caption" value="#{sRepairServiceTitle}"/> <Property key="Caption" value="#{sRepairServiceTitle}"/>
@ -20,10 +19,10 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="10 210 300 24" name="PlayerGold" align="Right Top"> <Widget type="TextBox" skin="SandText" position="10 206 300 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="343 210 60 24" name="OkButton" align="Right Top"> <Widget type="AutoSizedButton" skin="MW_Button" position="343 210 56 24" name="OkButton" align="Right Top">
<Property key="ExpandDirection" value="Left"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sOK}"/> <Property key="Caption" value="#{sOK}"/>
</Widget> </Widget>

14
files/mygui/openmw_persuasion_dialog.layout
View File

@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 220 194" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 220 192" name="_Main">
<Widget type="TextBox" skin="NormalText" position="0 6 220 24"> <Widget type="TextBox" skin="NormalText" position="0 4 220 24">
<Property key="Caption" value="#{sPersuasionMenuTitle}"/> <Property key="Caption" value="#{sPersuasionMenuTitle}"/>
<Property key="TextAlign" value="Center"/> <Property key="TextAlign" value="Center"/>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="8 156 208 24" name="GoldLabel">
<Property key="TextAlign" value="Left VCenter"/>
</Widget>
<Widget type="Widget" skin="MW_Box" position="8 32 196 115"> <Widget type="Widget" skin="MW_Box" position="8 32 196 115">
<Widget type="AutoSizedButton" skin="SandTextButton" position="4 0 0 18" name="AdmireButton"> <Widget type="AutoSizedButton" skin="SandTextButton" position="4 0 0 18" name="AdmireButton">
<Property key="Caption" value="#{sAdmire}"/> <Property key="Caption" value="#{sAdmire}"/>
@ -39,7 +35,11 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="204 156 0 24" name="CancelButton"> <Widget type="TextBox" skin="SandText" position="8 152 208 24" name="GoldLabel">
<Property key="TextAlign" value="Left VCenter"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="204 154 0 24" name="CancelButton">
<Property key="ExpandDirection" value="Left"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sCancel}"/> <Property key="Caption" value="#{sCancel}"/>
</Widget> </Widget>

5
files/mygui/openmw_spell_buying_window.layout
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 300" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 306" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 10 450 18" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 10 450 18" align="Right Top">
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
<Property key="Caption" value="#{sSpellServiceTitle}"/> <Property key="Caption" value="#{sSpellServiceTitle}"/>
@ -14,14 +13,12 @@
<Property key="Caption" value="#{sServiceSpellsTitle}"/> <Property key="Caption" value="#{sServiceSpellsTitle}"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch"> <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch">
<Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="SpellsView"> <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="SpellsView">
<Property key="CanvasAlign" value="Left"/> <Property key="CanvasAlign" value="Left"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
</Widget> </Widget>

11
files/mygui/openmw_spellcreation_dialog.layout
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 400" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 394" name="_Main">
<Widget type="HBox" position="12 12 250 30"> <Widget type="HBox" position="12 12 250 30">
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText">
<Property key="Caption" value="#{sName}"/> <Property key="Caption" value="#{sName}"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -16,9 +15,7 @@
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
</Widget> </Widget>
<Widget type="Widget"> <Widget type="Widget"/>
</Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="NormalText" position="280 0 300 24"> <Widget type="TextBox" skin="NormalText" position="280 0 300 24">
@ -33,7 +30,6 @@
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
<Widget type="TextBox" skin="NormalText" position="280 24 300 24"> <Widget type="TextBox" skin="NormalText" position="280 24 300 24">
<Property key="Caption" value="#{sSpellmakingMenu1}"/> <Property key="Caption" value="#{sSpellmakingMenu1}"/>
<Property key="TextAlign" value="Left HCenter"/> <Property key="TextAlign" value="Left HCenter"/>
@ -46,7 +42,6 @@
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
<!-- Available effects --> <!-- Available effects -->
<Widget type="TextBox" skin="NormalText" position="12 48 300 24"> <Widget type="TextBox" skin="NormalText" position="12 48 300 24">
<Property key="Caption" value="#{sMagicEffects}"/> <Property key="Caption" value="#{sMagicEffects}"/>
@ -70,7 +65,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="0 340 560 60"> <Widget type="HBox" position="0 336 558 60">
<Property key="Padding" value="16"/> <Property key="Padding" value="16"/>
<Widget type="Widget" position="0 0 0 0"> <Widget type="Widget" position="0 0 0 0">

6
files/mygui/openmw_travel_window.layout
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 300" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 304" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
<Property key="Caption" value="#{sTravelServiceTitle}"/> <Property key="Caption" value="#{sTravelServiceTitle}"/>
@ -21,11 +20,10 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="375 260 60 24" name="CancelButton" align="Right Top"> <Widget type="AutoSizedButton" skin="MW_Button" position="375 261 60 24" name="CancelButton" align="Right Top">
<Property key="ExpandDirection" value="Left"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sCancel}"/> <Property key="Caption" value="#{sCancel}"/>
</Widget> </Widget>

6
files/settings-default.cfg
View File

@ -173,9 +173,9 @@ device =
# Volumes. master volume affects all other volumes. # Volumes. master volume affects all other volumes.
master volume = 1.0 master volume = 1.0
sfx volume = 1.0 sfx volume = 1.0
music volume = 0.4 music volume = 0.5
footsteps volume = 0.15 footsteps volume = 0.2
voice volume = 1.0 voice volume = 0.8
[Input] [Input]