revert demo changes

This commit is contained in:
betalars 2025-03-25 22:33:01 +01:00
parent b2e7464201
commit bdf78a55c0
5 changed files with 448 additions and 745 deletions

View File

@ -5,7 +5,7 @@ platform="Linux"
runnable=true runnable=true
advanced_options=true advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="Demo" custom_features=""
export_filter="all_resources" export_filter="all_resources"
include_filter="" include_filter=""
exclude_filter="" exclude_filter=""
@ -51,7 +51,7 @@ platform="Windows Desktop"
runnable=true runnable=true
advanced_options=true advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="Demo" custom_features=""
export_filter="all_resources" export_filter="all_resources"
include_filter="" include_filter=""
exclude_filter="" exclude_filter=""
@ -122,7 +122,7 @@ platform="macOS"
runnable=true runnable=true
advanced_options=true advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="Demo" custom_features=""
export_filter="all_resources" export_filter="all_resources"
include_filter="" include_filter=""
exclude_filter="" exclude_filter=""

View File

@ -122,12 +122,5 @@ func get_room_path_from_id(id: State.rooms) -> String:
_: _:
return ending_path return ending_path
func start_demo():
#FIXME this causes the room to reload
#load_save(SaveGame.new())
$DemoMenue.hide()
current_room.start_room()
in_game = true
func pause_mode_changed(): func pause_mode_changed():
print(get_tree().paused) print(get_tree().paused)

File diff suppressed because it is too large Load Diff

View File

@ -259,24 +259,22 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_njt06")
script = ExtResource("2_rm576") script = ExtResource("2_rm576")
[node name="TextureRect" type="TextureRect" parent="."] [node name="TextureRect" type="TextureRect" parent="."]
visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = 3 anchors_preset = -1
anchor_left = 1.0 anchor_left = 1.0
anchor_top = 1.0 anchor_top = 1.0
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_left = -553.0 offset_left = -437.0
offset_top = -546.0 offset_top = -434.0
offset_right = 471.0 offset_right = 587.0
offset_bottom = 478.0 offset_bottom = 590.0
grow_horizontal = 0 grow_horizontal = 0
grow_vertical = 0 grow_vertical = 0
scale = Vector2(0.5, 0.5) scale = Vector2(0.4, 0.4)
texture = ExtResource("3_xb2np") texture = ExtResource("3_xb2np")
[node name="PanelContainer" type="VBoxContainer" parent="."] [node name="PanelContainer" type="VBoxContainer" parent="."]
visible = false
layout_mode = 1 layout_mode = 1
offset_left = 67.0 offset_left = 67.0
offset_top = 70.0 offset_top = 70.0
@ -301,6 +299,7 @@ text = "settings"
flat = false flat = false
item_count = 5 item_count = 5
popup/item_0/text = "Accessibility" popup/item_0/text = "Accessibility"
popup/item_0/id = 0
popup/item_1/text = "Video" popup/item_1/text = "Video"
popup/item_1/id = 1 popup/item_1/id = 1
popup/item_2/text = "Audio" popup/item_2/text = "Audio"
@ -341,7 +340,7 @@ script = ExtResource("4_k8jo0")
[node name="AnimationPlayer" type="AnimationPlayer" parent="SettingsPopup"] [node name="AnimationPlayer" type="AnimationPlayer" parent="SettingsPopup"]
root_node = NodePath("../TabContainer/Video Settings") root_node = NodePath("../TabContainer/Video Settings")
libraries = { libraries = {
"": SubResource("AnimationLibrary_lmxul") &"": SubResource("AnimationLibrary_lmxul")
} }
autoplay = "RESET" autoplay = "RESET"
@ -399,7 +398,6 @@ metadata/_tab_index = 4
[node name="SaveGameHandle" type="CenterContainer" parent="."] [node name="SaveGameHandle" type="CenterContainer" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
process_mode = 4
visible = false visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
@ -407,4 +405,25 @@ anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
mouse_filter = 2
script = ExtResource("8_o0cpj") script = ExtResource("8_o0cpj")
metadata/_custom_type_script = "uid://dugfwcvp7i01k"
[node name="CenterContainer" type="CenterContainer" parent="."]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer"]
clip_contents = false
custom_minimum_size = Vector2(0, 900)
layout_mode = 2
horizontal_scroll_mode = 0
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/ScrollContainer"]
layout_mode = 2
theme_override_constants/separation = 0

View File

@ -155,11 +155,6 @@ zoom_in_controller={
"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null) "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null)
] ]
} }
reset_demo={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":82,"location":0,"echo":false,"script":null)
]
}
toggle_fullscreen={ toggle_fullscreen={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194342,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194342,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
@ -194,5 +189,6 @@ locale/test="de"
textures/vram_compression/import_etc2_astc=true textures/vram_compression/import_etc2_astc=true
anti_aliasing/quality/msaa_3d=2 anti_aliasing/quality/msaa_3d=2
scaling_3d/scale=0.4
environment/screen_space_reflection/roughness_quality=2 environment/screen_space_reflection/roughness_quality=2
anti_aliasing/quality/screen_space_aa=1 anti_aliasing/quality/screen_space_aa=1