1 | Index: binaries/data/mods/public/gui/session/session.xml
|
---|
2 | ===================================================================
|
---|
3 | --- binaries/data/mods/public/gui/session/session.xml (révision 12260)
|
---|
4 | +++ binaries/data/mods/public/gui/session/session.xml (copie de travail)
|
---|
5 | @@ -228,77 +228,84 @@
|
---|
6 | <!-- ================================ ================================ -->
|
---|
7 | <!-- Settings Window -->
|
---|
8 | <!-- ================================ ================================ -->
|
---|
9 | - <object name="settingsDialogPanel"
|
---|
10 | - style="StoneDialog"
|
---|
11 | - type="image"
|
---|
12 | - size="50%-180 50%-200 50%+180 50%+100"
|
---|
13 | - hidden="true"
|
---|
14 | - >
|
---|
15 | - <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Settings</object>
|
---|
16 | -
|
---|
17 | - <object style="TranslucentPanelThinBorder"
|
---|
18 | - type="image"
|
---|
19 | - size="32 32 100%-32 100%-70"
|
---|
20 | - >
|
---|
21 | - <!-- Settings / shadows -->
|
---|
22 | - <object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
|
---|
23 | - <object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
24 | - <action on="Load">if (renderer.shadows) this.checked = true; else this.checked = false;</action>
|
---|
25 | - <action on="Press">renderer.shadows = this.checked;</action>
|
---|
26 | + <object name="settingsDialogPanel"
|
---|
27 | + style="StoneDialog"
|
---|
28 | + type="image"
|
---|
29 | + size="50%-180 50%-200 50%+180 50%+125"
|
---|
30 | + hidden="true"
|
---|
31 | + >
|
---|
32 | + <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Settings</object>
|
---|
33 | +
|
---|
34 | + <object style="TranslucentPanelThinBorder"
|
---|
35 | + type="image"
|
---|
36 | + size="32 32 100%-32 100%-70"
|
---|
37 | + >
|
---|
38 | + <!-- Settings / shadows -->
|
---|
39 | + <object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
|
---|
40 | + <object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
41 | + <action on="Load">if (renderer.shadows) this.checked = true; else this.checked = false;</action>
|
---|
42 | + <action on="Press">renderer.shadows = this.checked;</action>
|
---|
43 | + </object>
|
---|
44 | +
|
---|
45 | + <!-- Settings / Shadow PCF -->
|
---|
46 | + <object size="0 35 100%-80 60" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
|
---|
47 | + <object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
48 | + <action on="Load">if (renderer.shadowPCF) this.checked = true; else this.checked = false;</action>
|
---|
49 | + <action on="Press">renderer.shadowPCF = this.checked;</action>
|
---|
50 | + </object>
|
---|
51 | +
|
---|
52 | + <!-- Settings / Water -->
|
---|
53 | + <object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Enable Water Reflections</object>
|
---|
54 | + <object name="fancyWaterCheckbox" size="100%-56 65 100%-30 90" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
55 | + <action on="Load">if (renderer.fancyWater) this.checked = true; else this.checked = false;</action>
|
---|
56 | + <action on="Press">renderer.fancyWater = this.checked; </action>
|
---|
57 | + </object>
|
---|
58 | +
|
---|
59 | + <!-- Settings / Advanced Water -->
|
---|
60 | + <object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Enable Advanced Water</object>
|
---|
61 | + <object name="superFancyWaterCheckbox" size="100%-56 90 100%-30 115" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
62 | + <action on="Load">if (renderer.superFancyWater) { if (renderer.fancyWater) this.checked = true; else this.checked = false; }</action>
|
---|
63 | + <action on="Press">renderer.superFancyWater = this.checked; </action>
|
---|
64 | + </object>
|
---|
65 | +
|
---|
66 | + <!-- Settings / Particles -->
|
---|
67 | + <object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
|
---|
68 | + <object name="particlesCheckbox" size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
69 | + <action on="Load">if (renderer.particles) this.checked = true; else this.checked = false;</action>
|
---|
70 | + <action on="Press">renderer.particles = this.checked;</action>
|
---|
71 | + </object>
|
---|
72 | +
|
---|
73 | + <!-- Settings / Unit Silhouettes -->
|
---|
74 | + <object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Enable Unit Silhouettes</object>
|
---|
75 | + <object name="silhouettesCheckbox" size="100%-56 140 100%-30 165" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
76 | + <action on="Load">if (renderer.silhouettes) this.checked = true; else this.checked = false;</action>
|
---|
77 | + <action on="Press">renderer.silhouettes = this.checked;</action>
|
---|
78 | + </object>
|
---|
79 | +
|
---|
80 | + <!-- Settings / Music-->
|
---|
81 | + <object size="0 160 100%-80 185" type="text" style="RightLabelText" ghost="true">Enable Music</object>
|
---|
82 | + <object size="100%-56 165 100%-30 190" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
83 | + <action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
|
---|
84 | + </object>
|
---|
85 | +
|
---|
86 | + <!-- Settings / Dev Overlay -->
|
---|
87 | + <object size="0 185 100%-80 210" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
|
---|
88 | + <object size="100%-56 190 100%-30 215" type="checkbox" style="StoneCrossBox" checked="false">
|
---|
89 | + <action on="Press">toggleDeveloperOverlay();</action>
|
---|
90 | + </object>
|
---|
91 | + </object>
|
---|
92 | +
|
---|
93 | + <!-- Close button -->
|
---|
94 | + <object type="button"
|
---|
95 | + style="StoneButton"
|
---|
96 | + size="50%-64 100%-52 50%+64 100%-24"
|
---|
97 | + tooltip_style="sessionToolTip"
|
---|
98 | + >
|
---|
99 | + Close
|
---|
100 | + <action on="Press">closeSettings(true);</action>
|
---|
101 | + </object>
|
---|
102 | </object>
|
---|
103 |
|
---|
104 | - <!-- Settings / Shadow PCF -->
|
---|
105 | - <object size="0 35 100%-80 60" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
|
---|
106 | - <object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
107 | - <action on="Load">if (renderer.shadowPCF) this.checked = true; else this.checked = false;</action>
|
---|
108 | - <action on="Press">renderer.shadowPCF = this.checked;</action>
|
---|
109 | - </object>
|
---|
110 | -
|
---|
111 | - <!-- Settings / Water -->
|
---|
112 | - <object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Enable Water Reflections</object>
|
---|
113 | - <object name="fancyWaterCheckbox" size="100%-56 65 100%-30 90" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
114 | - <action on="Load">if (renderer.fancyWater) this.checked = true; else this.checked = false;</action>
|
---|
115 | - <action on="Press">renderer.fancyWater = this.checked;</action>
|
---|
116 | - </object>
|
---|
117 | -
|
---|
118 | - <!-- Settings / Particles -->
|
---|
119 | - <object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
|
---|
120 | - <object name="particlesCheckbox" size="100%-56 90 100%-30 115" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
121 | - <action on="Load">if (renderer.particles) this.checked = true; else this.checked = false;</action>
|
---|
122 | - <action on="Press">renderer.particles = this.checked;</action>
|
---|
123 | - </object>
|
---|
124 | -
|
---|
125 | - <!-- Settings / Unit Silhouettes -->
|
---|
126 | - <object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Enable Unit Silhouettes</object>
|
---|
127 | - <object name="silhouettesCheckbox" size="100%-56 115 100%-30 140" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
128 | - <action on="Load">if (renderer.silhouettes) this.checked = true; else this.checked = false;</action>
|
---|
129 | - <action on="Press">renderer.silhouettes = this.checked;</action>
|
---|
130 | - </object>
|
---|
131 | -
|
---|
132 | - <!-- Settings / Music-->
|
---|
133 | - <object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Enable Music</object>
|
---|
134 | - <object size="100%-56 140 100%-30 165" type="checkbox" style="StoneCrossBox" checked="true">
|
---|
135 | - <action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
|
---|
136 | - </object>
|
---|
137 | -
|
---|
138 | - <!-- Settings / Dev Overlay -->
|
---|
139 | - <object size="0 160 100%-80 185" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
|
---|
140 | - <object size="100%-56 165 100%-30 190" type="checkbox" style="StoneCrossBox" checked="false">
|
---|
141 | - <action on="Press">toggleDeveloperOverlay();</action>
|
---|
142 | - </object>
|
---|
143 | - </object>
|
---|
144 | -
|
---|
145 | - <!-- Close button -->
|
---|
146 | - <object type="button"
|
---|
147 | - style="StoneButton"
|
---|
148 | - size="50%-64 100%-52 50%+64 100%-24"
|
---|
149 | - tooltip_style="sessionToolTip"
|
---|
150 | - >
|
---|
151 | - Close
|
---|
152 | - <action on="Press">closeSettings(true);</action>
|
---|
153 | - </object>
|
---|
154 | - </object>
|
---|
155 | -
|
---|
156 | <!-- ================================ ================================ -->
|
---|
157 | <!-- Top Panel -->
|
---|
158 | <!-- ================================ ================================ -->
|
---|
159 | Index: binaries/data/mods/public/art/textures/terrain/types/water/shore_wave.png
|
---|
160 | ===================================================================
|
---|
161 | --- binaries/data/mods/public/art/textures/terrain/types/water/shore_wave.png (révision 0)
|
---|
162 | +++ binaries/data/mods/public/art/textures/terrain/types/water/shore_wave.png (copie de travail)
|
---|
163 | @@ -0,0 +1,73 @@
|
---|
164 | +PNG
|
---|
165 | +
|
---|
166 | +
|
---|
167 | +IHDRÃ>aË pHYs |
---|
168 | |
---|
169 | |
---|