Merge branch 'development' of gitlab.com:betalars/frame-of-mind into development

src/base-environments/youth_room/import/cheeky-city.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -36,4 +37,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/base-environments/youth_room/import/lava-lamp.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -72,4 +73,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/base-environments/youth_room/import/starlight-mesh.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -48,4 +49,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/base-environments/youth_room/import/windows.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -52,4 +53,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/base-environments/youth_room/import/youth_room.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -168,4 +169,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/base-environments/youth_room/lava-lamp.tscn

@@ -114,10 +114,10 @@ skeleton = NodePath("")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 root_node = NodePath("../raising")
-autoplay = "lavalamp"
 libraries = {
 "": SubResource("AnimationLibrary_88lyq")
 }
+autoplay = "lavalamp"
 
 [node name="falling" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.188474, 0)

src/logic-scenes/board/void_card.tscn

@@ -96,30 +96,28 @@ point_count = 3
 curve = SubResource("Curve_q6cmf")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_by44l"]
+particle_flag_disable_z = true
 emission_shape = 6
 emission_ring_axis = Vector3(0, 0, 1)
 emission_ring_height = 0.0
 emission_ring_radius = 180.0
 emission_ring_inner_radius = 185.0
-particle_flag_disable_z = true
 spread = 180.0
-gravity = Vector3(0, 0, 0)
 initial_velocity_min = -10.0
 initial_velocity_max = 10.0
 angular_velocity_min = -150.0
 angular_velocity_max = -150.0
-orbit_velocity_min = 0.0
+gravity = Vector3(0, 0, 0)
-orbit_velocity_max = 0.0
 radial_accel_min = -20.0
 radial_accel_max = -5.0
 tangential_accel_min = 20.0
 tangential_accel_max = 30.0
+attractor_interaction_enabled = false
 scale_min = 3.0
 scale_max = 5.0
 scale_curve = SubResource("CurveTexture_cg0w1")
 color_ramp = SubResource("GradientTexture1D_xxq8p")
 turbulence_noise_strength = 0.1
-attractor_interaction_enabled = false
 
 [sub_resource type="GDScript" id="GDScript_vjwk7"]
 script/source = "extends GPUParticles2D

src/logic-scenes/card_picker/card_picker.tscn

@@ -1568,10 +1568,10 @@ offset_bottom = -150.0
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="sticky_notes/sticky_note_1"]
 root_node = NodePath(".")
-autoplay = "ini"
 libraries = {
 "": SubResource("AnimationLibrary_ga4dm")
 }
+autoplay = "ini"
 
 [node name="sticky-note" parent="sticky_notes/sticky_note_1" instance=ExtResource("3_ggbxq")]
 text = "Post 1"
@@ -1584,10 +1584,10 @@ offset_bottom = -50.0
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="sticky_notes/sticky_note_2"]
 root_node = NodePath(".")
-autoplay = "ini"
 libraries = {
 "": SubResource("AnimationLibrary_sxnmi")
 }
+autoplay = "ini"
 
 [node name="sticky-note" parent="sticky_notes/sticky_note_2" instance=ExtResource("3_ggbxq")]
 text = "Post 2"
@@ -1600,10 +1600,10 @@ offset_bottom = 50.0
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="sticky_notes/sticky_note_3"]
 root_node = NodePath(".")
-autoplay = "ini"
 libraries = {
 "": SubResource("AnimationLibrary_xs06v")
 }
+autoplay = "ini"
 
 [node name="sticky-note" parent="sticky_notes/sticky_note_3" instance=ExtResource("3_ggbxq")]
 text = "Post 3"
@@ -1616,10 +1616,10 @@ offset_bottom = 150.0
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="sticky_notes/sticky_note_4"]
 root_node = NodePath(".")
-autoplay = "ini"
 libraries = {
 "": SubResource("AnimationLibrary_tdl1s")
 }
+autoplay = "ini"
 
 [node name="sticky-note" parent="sticky_notes/sticky_note_4" instance=ExtResource("3_ggbxq")]
 text = "Post 4"

src/logic-scenes/collectable/import/old-mask.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -48,4 +49,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/logic-scenes/luna/Luna_frame-of-mind.glb.import

@@ -22,6 +22,7 @@ meshes/generate_lods=true
 meshes/create_shadow_meshes=true
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
@@ -1831,4 +1832,5 @@ _subresources={
 }
 }
 }
+gltf/naming_version=0
 gltf/embedded_image_handling=1

src/project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Frame of Mind"
 run/main_scene="res://main.tscn"
-config/features=PackedStringArray("4.1", "Forward Plus")
+config/features=PackedStringArray("4.2", "Forward Plus")
 run/max_fps=60
 boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1)
 boot_splash/image="res://splash.png"

src/vfx/collectable_particles.tscn

@@ -27,8 +27,8 @@ gradient = SubResource("Gradient_c8r4y")
 emission_shape = 1
 emission_sphere_radius = 0.2
 spread = 180.0
-gravity = Vector3(0, 0.02, 0)
 initial_velocity_max = 0.2
+gravity = Vector3(0, 0.02, 0)
 color_ramp = SubResource("GradientTexture1D_2vogp")
 color_initial_ramp = SubResource("GradientTexture1D_d2t20")
 turbulence_enabled = true