Skip to content

Commit c8e20a2

Browse files
klorfmorfklorfmorf
committed
Fix crash when accessing uncached segment, change scissor behavior in widescreen.
1 parent b7f1467 commit c8e20a2

File tree

11 files changed

+123
-412
lines changed

11 files changed

+123
-412
lines changed

‎assets/config_menu/general.rml‎

Lines changed: 0 additions & 236 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,6 @@
66
<div class="config__hz-wrapper" id="conf-general__hz-wrapper">
77
<!-- Options -->
88
<div class="config__wrapper" data-event-mouseout="set_cur_config_index(-1)" id="conf-general__wrapper">
9-
<!-- targeting mode -->
10-
<div class="config-option" data-event-mouseover="set_cur_config_index(0)" id="conf-general__Targeting-Mode">
11-
<label class="config-option__title">Targeting Mode</label>
12-
<div class="config-option__list">
13-
<input
14-
type="radio"
15-
data-event-blur="set_cur_config_index(-1)"
16-
data-event-focus="set_cur_config_index(0)"
17-
name="targeting_mode"
18-
data-checked="targeting_mode"
19-
value="Switch"
20-
id="tm_switch"
21-
style="nav-up: #tab_general; nav-down: #rumble_strength_input"
22-
/>
23-
<label class="config-option__tab-label" for="tm_switch">Switch</label>
24-
25-
<input
26-
type="radio"
27-
data-event-blur="set_cur_config_index(-1)"
28-
data-event-focus="set_cur_config_index(0)"
29-
name="targeting_mode"
30-
data-checked="targeting_mode"
31-
value="Hold"
32-
id="tm_hold"
33-
style="nav-up: #tab_general; nav-down: #rumble_strength_input"
34-
/>
35-
<label class="config-option__tab-label" for="tm_hold">Hold</label>
36-
</div>
37-
</div>
38-
399
<!-- rumble strength -->
4010
<div class="config-option" data-event-mouseover="set_cur_config_index(1)">
4111
<label class="config-option__title">Rumble Strength</label>
@@ -54,44 +24,6 @@
5424
/>
5525
</div>
5626
</div>
57-
58-
<!-- gyro sensitivity -->
59-
<div class="config-option" data-event-mouseover="set_cur_config_index(2)">
60-
<label class="config-option__title">Gyro Sensitivity</label>
61-
<div class="config-option__range-wrapper config-option__list">
62-
<label class="config-option__range-label">{{gyro_sensitivity}}%</label>
63-
<input
64-
class="nav-vert"
65-
data-event-blur="set_cur_config_index(-1)"
66-
data-event-focus="set_cur_config_index(2)"
67-
id="gyro_sensitivity_input"
68-
type="range"
69-
min="0"
70-
max="100"
71-
style="flex: 1; margin: 0dp;"
72-
data-value="gyro_sensitivity"
73-
/>
74-
</div>
75-
</div>
76-
77-
<!-- mouse sensitivity -->
78-
<div class="config-option" data-event-mouseover="set_cur_config_index(3)">
79-
<label class="config-option__title">Mouse Sensitivity</label>
80-
<div class="config-option__range-wrapper config-option__list">
81-
<label class="config-option__range-label">{{mouse_sensitivity}}%</label>
82-
<input
83-
class="nav-vert"
84-
data-event-blur="set_cur_config_index(-1)"
85-
data-event-focus="set_cur_config_index(3)"
86-
id="mouse_sensitivity_input"
87-
type="range"
88-
min="0"
89-
max="100"
90-
style="flex: 1; margin: 0dp;"
91-
data-value="mouse_sensitivity"
92-
/>
93-
</div>
94-
</div>
9527

9628
<!-- joystick deadzone -->
9729
<div class="config-option" data-event-mouseover="set_cur_config_index(4)">
@@ -141,174 +73,6 @@
14173
<label class="config-option__tab-label" for="bg_input_disabled">Off</label>
14274
</div>
14375
</div>
144-
145-
<!-- autosave -->
146-
<div class="config-option" data-event-mouseover="set_cur_config_index(6)">
147-
<label class="config-option__title">Autosaving</label>
148-
<div class="config-option__list">
149-
<input
150-
type="radio"
151-
data-event-blur="set_cur_config_index(-1)"
152-
data-event-focus="set_cur_config_index(6)"
153-
name="autosave_mode"
154-
data-checked="autosave_mode"
155-
value="On"
156-
id="autosave_enabled"
157-
style="nav-up: #bg_input_enabled; nav-down: #camera_inversion_none"
158-
/>
159-
<label class="config-option__tab-label" for="autosave_enabled">On</label>
160-
161-
<input
162-
type="radio"
163-
data-event-blur="set_cur_config_index(-1)"
164-
data-event-focus="set_cur_config_index(6)"
165-
name="autosave_mode"
166-
data-checked="autosave_mode"
167-
value="Off"
168-
id="autosave_disabled"
169-
style="nav-up: #bg_input_disabled; nav-down: #camera_inversion_x"
170-
/>
171-
<label class="config-option__tab-label" for="autosave_disabled">Off</label>
172-
</div>
173-
</div>
174-
175-
<!-- camera inversion -->
176-
<div class="config-option" data-event-mouseover="set_cur_config_index(7)">
177-
<label class="config-option__title">Aiming Camera Mode</label>
178-
<div class="config-option__list">
179-
<input
180-
type="radio"
181-
data-event-blur="set_cur_config_index(-1)"
182-
data-event-focus="set_cur_config_index(7)"
183-
name="camera_invert_mode"
184-
data-checked="camera_invert_mode"
185-
value="InvertNone"
186-
id="camera_inversion_none"
187-
style="nav-up: #autosave_enabled; nav-down: #analog_cam_enabled"
188-
/>
189-
<label class="config-option__tab-label" for="camera_inversion_none">None</label>
190-
191-
<input
192-
type="radio"
193-
data-event-blur="set_cur_config_index(-1)"
194-
data-event-focus="set_cur_config_index(7)"
195-
name="camera_invert_mode"
196-
data-checked="camera_invert_mode"
197-
value="InvertX"
198-
id="camera_inversion_x"
199-
style="nav-up: #autosave_disabled; nav-down: #analog_cam_disabled"
200-
/>
201-
<label class="config-option__tab-label" for="camera_inversion_x">Invert X</label>
202-
203-
<input
204-
type="radio"
205-
data-event-blur="set_cur_config_index(-1)"
206-
data-event-focus="set_cur_config_index(7)"
207-
name="camera_invert_mode"
208-
data-checked="camera_invert_mode"
209-
value="InvertY"
210-
id="camera_inversion_y"
211-
style="nav-up: #autosave_disabled; nav-down: #analog_cam_disabled"
212-
/>
213-
<label class="config-option__tab-label" for="camera_inversion_y">Invert Y</label>
214-
215-
<input
216-
type="radio"
217-
data-event-blur="set_cur_config_index(-1)"
218-
data-event-focus="set_cur_config_index(7)"
219-
name="camera_invert_mode"
220-
data-checked="camera_invert_mode"
221-
value="InvertBoth"
222-
id="camera_inversion_both"
223-
style="nav-up: #autosave_disabled; nav-down: #analog_cam_disabled"
224-
/>
225-
<label class="config-option__tab-label" for="camera_inversion_both">Invert Both</label>
226-
</div>
227-
</div>
228-
229-
<!-- analog camera -->
230-
<div class="config-option" data-event-mouseover="set_cur_config_index(8)">
231-
<label class="config-option__title">Analog Camera</label>
232-
<div class="config-option__list">
233-
<input
234-
type="radio"
235-
data-event-blur="set_cur_config_index(-1)"
236-
data-event-focus="set_cur_config_index(8)"
237-
name="analog_cam_mode"
238-
data-checked="analog_cam_mode"
239-
value="On"
240-
id="analog_cam_enabled"
241-
style="nav-up: #camera_inversion_none; nav-down: #analog_camera_inversion_none"
242-
/>
243-
<label class="config-option__tab-label" for="analog_cam_enabled">On</label>
244-
245-
<input
246-
type="radio"
247-
data-event-blur="set_cur_config_index(-1)"
248-
data-event-focus="set_cur_config_index(8)"
249-
name="analog_cam_mode"
250-
data-checked="analog_cam_mode"
251-
value="Off"
252-
id="analog_cam_disabled"
253-
style="nav-up: #camera_inversion_x; nav-down: #analog_camera_inversion_x"
254-
/>
255-
<label class="config-option__tab-label" for="analog_cam_disabled">Off</label>
256-
</div>
257-
</div>
258-
259-
<!-- analog camera inversion -->
260-
<div class="config-option" data-event-mouseover="set_cur_config_index(9)">
261-
<label class="config-option__title">Analog Camera Mode</label>
262-
<div class="config-option__list">
263-
<input
264-
type="radio"
265-
data-event-blur="set_cur_config_index(-1)"
266-
data-event-focus="set_cur_config_index(9)"
267-
name="analog_camera_invert_mode"
268-
data-checked="analog_camera_invert_mode"
269-
value="InvertNone"
270-
id="analog_camera_inversion_none"
271-
style="nav-up: #analog_cam_enabled;"
272-
/>
273-
<label class="config-option__tab-label" for="analog_camera_inversion_none">None</label>
274-
275-
<input
276-
type="radio"
277-
data-event-blur="set_cur_config_index(-1)"
278-
data-event-focus="set_cur_config_index(9)"
279-
name="analog_camera_invert_mode"
280-
data-checked="analog_camera_invert_mode"
281-
value="InvertX"
282-
id="analog_camera_inversion_x"
283-
style="nav-up: #analog_cam_disabled;"
284-
/>
285-
<label class="config-option__tab-label" for="analog_camera_inversion_x">Invert X</label>
286-
287-
<input
288-
type="radio"
289-
data-event-blur="set_cur_config_index(-1)"
290-
data-event-focus="set_cur_config_index(9)"
291-
name="analog_camera_invert_mode"
292-
data-checked="analog_camera_invert_mode"
293-
value="InvertY"
294-
id="analog_camera_inversion_y"
295-
style="nav-up: #analog_cam_disabled;"
296-
/>
297-
<label class="config-option__tab-label" for="analog_camera_inversion_y">Invert Y</label>
298-
299-
<input
300-
type="radio"
301-
data-event-blur="set_cur_config_index(-1)"
302-
data-event-focus="set_cur_config_index(9)"
303-
name="analog_camera_invert_mode"
304-
data-checked="analog_camera_invert_mode"
305-
value="InvertBoth"
306-
id="analog_camera_inversion_both"
307-
style="nav-up: #analog_cam_disabled;"
308-
/>
309-
<label class="config-option__tab-label" for="analog_camera_inversion_both">Invert Both</label>
310-
</div>
311-
</div>
31276
</div>
31377
<!-- Descriptions -->
31478
<div class="config__wrapper">

‎assets/config_menu/graphics.rml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -229,44 +229,6 @@
229229
</div>
230230
</div>
231231

232-
<div class="config-option" data-event-mouseover="set_cur_config_index(6)">
233-
<label class="config-option__title">HUD Placement</label>
234-
<div class="config-option__list">
235-
<input type="radio"
236-
data-event-blur="set_cur_config_index(-1)"
237-
data-event-focus="set_cur_config_index(6)"
238-
name="hr-option"
239-
data-checked="hr_option"
240-
value="Original"
241-
id="hr_original"
242-
style="nav-up: #msaa_none; nav-down: #apply_button"
243-
/>
244-
<label class="config-option__tab-label" for="hr_original">Original</label>
245-
<input type="radio"
246-
data-event-blur="set_cur_config_index(-1)"
247-
data-event-focus="set_cur_config_index(6)"
248-
name="hr-option"
249-
data-checked="hr_option"
250-
value="Clamp16x9"
251-
id="hr_16_9"
252-
style="nav-up: #msaa_2x; nav-down: #apply_button"
253-
data-style-nav-up="msaa2x_supported ? '#msaa_2x' : '#msaa_none'"
254-
/>
255-
<label class="config-option__tab-label" for="hr_16_9">16:9</label>
256-
<input type="radio"
257-
data-event-blur="set_cur_config_index(-1)"
258-
data-event-focus="set_cur_config_index(6)"
259-
name="hr-option"
260-
data-checked="hr_option"
261-
value="Full"
262-
id="hr_full"
263-
style="nav-up: #msaa_4x; nav-down: #apply_button"
264-
data-style-nav-up="msaa4x_supported ? '#msaa_4x' : (msaa2x_supported ? '#msaa_2x' : '#msaa_none')"
265-
/>
266-
<label class="config-option__tab-label" for="hr_full">Expand</label>
267-
</div>
268-
</div>
269-
270232
</div>
271233
<div class="config__wrapper">
272234
<p data-if="cur_config_index == 0">

0 commit comments

Comments
 (0)