diff --git a/assets/ui/fonts/kenny_thick.tres b/assets/ui/fonts/kenny_thick.tres index 1c1ccc6..ceed08b 100644 --- a/assets/ui/fonts/kenny_thick.tres +++ b/assets/ui/fonts/kenny_thick.tres @@ -1,8 +1,8 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[sub_resource type="DynamicFontData" id=12] +[sub_resource type="DynamicFontData" id=14] font_path = "res://assets/ui/fonts/Kenney Thick.ttf" [resource] size = 8 -font_data = SubResource( 12 ) +font_data = SubResource( 14 ) diff --git a/project.godot b/project.godot index eee7ac1..7a9efd8 100644 --- a/project.godot +++ b/project.godot @@ -329,7 +329,7 @@ threads/thread_model=2 gles3/shaders/shader_compilation_mode=2 quality/depth/hdr=false environment/default_environment="res://default_env.tres" -environment/2d/use_nvidia_rect_flicker_workaround=true +environment/2d/use_nvidia_rect_flicker_workaround=false environment/stretch/aspect="ignore" environment/intended_usage/framebuffer_allocation.mobile=0 diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index bf4b40e..80f039f 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -4575,7 +4575,7 @@ unique_name_in_owner = true position = Vector2( -12, 0 ) enabled = true cast_to = Vector2( 0, 32 ) -collision_mask = 8 +collision_mask = 152 [node name="SlopeRaycastLeft" type="RayCast2D" parent="."] visible = false @@ -4623,5 +4623,5 @@ one_shot = true [connection signal="timeout" from="BlobbyStateMachine/JumpBufferTimer" to="BlobbyStateMachine" method="_on_JumpBufferTimer_timeout"] [connection signal="timeout" from="BlobbyStateMachine/CrushTimer" to="." method="_on_CrushTimer_timeout"] [connection signal="timeout" from="InvincibilityTimer" to="." method="_on_InvincibilityTimer_timeout"] -[connection signal="timeout" from="PitfallTimer" to="." method="_on_PitfallTimer_timeout"] [connection signal="timeout" from="PitfallTimer" to="." method="die_for_real" binds= [ -1 ]] +[connection signal="timeout" from="PitfallTimer" to="." method="_on_PitfallTimer_timeout"] diff --git a/src/Environment/Grass/ShaderGrass.gd b/src/Environment/Grass/ShaderGrass.gd index 18b49e7..5ed1a0b 100644 --- a/src/Environment/Grass/ShaderGrass.gd +++ b/src/Environment/Grass/ShaderGrass.gd @@ -104,7 +104,7 @@ func grass_wave_update(delta: float) -> void: $Timer.stop() is_idle_swinging = true var start = displacement_coeff.x if begin_idle else 0.0 - displacement_coeff.x = start * exp(-0.2 * (time-start_swing_time)) + 0.3 * -sin(2.0*(time - start_swing_time)) + displacement_coeff.x = start * exp(-0.2 * (time-start_swing_time)) + 0.5 * -sin(2.0*(time - start_swing_time)) begin_idle = false # if(displacement_coeff.x > saved_coeff): # print(displacement_coeff.x)