From cea1249334ef6a9a9ab3ecfd3bc395d8badbb85e Mon Sep 17 00:00:00 2001 From: betalars Date: Fri, 30 May 2025 13:54:10 +0200 Subject: [PATCH] misc cleanup --- .gitignore | 3 ++- design/volunteer room/volunteer_room_construction.blend | 4 ++-- src/main.tscn | 8 ++++---- src/main_menu.tscn | 1 + src/project.godot | 5 +---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6249794..0256317 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ src/.godot/ result src/addons/godot-jolt *png~ -*~lock* \ No newline at end of file +*~lock* +*_recovered* diff --git a/design/volunteer room/volunteer_room_construction.blend b/design/volunteer room/volunteer_room_construction.blend index 8bb5c1c..30e92da 100644 --- a/design/volunteer room/volunteer_room_construction.blend +++ b/design/volunteer room/volunteer_room_construction.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09a911109245ddb7c9d35a5530254b8dc9e9ad91ff9c348138020060320a7ccc -size 137554249 +oid sha256:6dfb8c685cfa97eaf31a67e7622b0cbb3ca75c5c60cf40b567cf5ca6b912bb77 +size 137572410 diff --git a/src/main.tscn b/src/main.tscn index 681fa8f..1fde4f2 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -952,7 +952,7 @@ states/start_game/position = Vector2(698, 32) transitions = ["Start", "init", SubResource("AnimationNodeStateMachineTransition_dxdg4"), "init", "loading", SubResource("AnimationNodeStateMachineTransition_0hpxy"), "loading", "loading_done", SubResource("AnimationNodeStateMachineTransition_ipapo"), "loading_done", "start_game", SubResource("AnimationNodeStateMachineTransition_0t1lp"), "start_game", "init", SubResource("AnimationNodeStateMachineTransition_66nmg"), "loading_done", "load_savegame", SubResource("AnimationNodeStateMachineTransition_6b86u"), "load_savegame", "loading_game", SubResource("AnimationNodeStateMachineTransition_y626i"), "loading_game", "start_game", SubResource("AnimationNodeStateMachineTransition_52bss"), "start_game", "credits_roll", SubResource("AnimationNodeStateMachineTransition_x8oth"), "credits_roll", "loading_done", SubResource("AnimationNodeStateMachineTransition_5ge3a"), "loading_done", "credits_roll", SubResource("AnimationNodeStateMachineTransition_44pd3"), "start_game", "reveal_pause_menu", SubResource("AnimationNodeStateMachineTransition_pc6pe"), "reveal_pause_menu", "hide_pause_menu", SubResource("AnimationNodeStateMachineTransition_dx61n"), "hide_pause_menu", "start_game", SubResource("AnimationNodeStateMachineTransition_lp1dx"), "hide_pause_menu", "init", SubResource("AnimationNodeStateMachineTransition_mqlnh")] graph_offset = Vector2(-596.25, -100.734) -[sub_resource type="Shader" id="Shader_duh8f"] +[sub_resource type="Shader" id="Shader_cegan"] code = "shader_type canvas_item; render_mode blend_premul_alpha; @@ -994,7 +994,7 @@ void fragment() { " [sub_resource type="ShaderMaterial" id="ShaderMaterial_knlqd"] -shader = SubResource("Shader_duh8f") +shader = SubResource("Shader_cegan") shader_parameter/nebula_brightness = 2.4 shader_parameter/nebula_scale = Vector2(1.3, 1.6) shader_parameter/starlight_noise = ExtResource("9_l7v4b") @@ -1004,12 +1004,12 @@ shader_parameter/rotation_pivot = Vector2(0.8, 0.8) shader_parameter/drift_compensation = Vector2(0.1, -0.2) shader_parameter/noise_strength = 0.2 -[sub_resource type="Gradient" id="Gradient_7nxov"] +[sub_resource type="Gradient" id="Gradient_82xsv"] interpolation_color_space = 2 colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) [sub_resource type="GradientTexture2D" id="GradientTexture2D_swtmc"] -gradient = SubResource("Gradient_7nxov") +gradient = SubResource("Gradient_82xsv") width = 2048 height = 1536 fill = 1 diff --git a/src/main_menu.tscn b/src/main_menu.tscn index 58c720b..73903a0 100644 --- a/src/main_menu.tscn +++ b/src/main_menu.tscn @@ -317,6 +317,7 @@ text = "Attribution" [node name="BugButton" type="Button" parent="PanelContainer"] layout_mode = 2 +text = "BugButton" script = ExtResource("4_j5v2v") metadata/_custom_type_script = "uid://sa15wakvpj2e" diff --git a/src/project.godot b/src/project.godot index 2344493..2ea5b11 100644 --- a/src/project.godot +++ b/src/project.godot @@ -10,10 +10,7 @@ config_version=5 [application] -config/name="Frame of Mind" -config/name_localized={ -"de": "Frame of Mind - ein Gedankenspiel." -} +config/name="My love my life and my Frame of Mind" run/main_scene="uid://cd63barv73rfx" config/use_custom_user_dir=true config/features=PackedStringArray("4.4", "Forward Plus")