CommonParrot/Blobby
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: Blobby raycast collision layers, font, grass idle sway magnitude

Browse Source
This commit is contained in:
Jakob Feldmann 2024-02-01 15:00:32 +01:00
parent 5ffc359cba
commit 14427f14d0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/ui/fonts/kenny_thick.tres
View File

@ -1,8 +1,8 @@
[gd_resource type="DynamicFont" load_steps=2 format=2] [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" font_path = "res://assets/ui/fonts/Kenney Thick.ttf"
[resource] [resource]
size = 8 size = 8
font_data = SubResource( 12 ) font_data = SubResource( 14 )

2
project.godot
View File

@ -329,7 +329,7 @@ threads/thread_model=2
gles3/shaders/shader_compilation_mode=2 gles3/shaders/shader_compilation_mode=2
quality/depth/hdr=false quality/depth/hdr=false
environment/default_environment="res://default_env.tres" 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/stretch/aspect="ignore"
environment/intended_usage/framebuffer_allocation.mobile=0 environment/intended_usage/framebuffer_allocation.mobile=0

4
src/Actors/Blobby/Blobby.tscn
View File

@ -4575,7 +4575,7 @@ unique_name_in_owner = true
position = Vector2( -12, 0 ) position = Vector2( -12, 0 )
enabled = true enabled = true
cast_to = Vector2( 0, 32 ) cast_to = Vector2( 0, 32 )
collision_mask = 8 collision_mask = 152
[node name="SlopeRaycastLeft" type="RayCast2D" parent="."] [node name="SlopeRaycastLeft" type="RayCast2D" parent="."]
visible = false 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/JumpBufferTimer" to="BlobbyStateMachine" method="_on_JumpBufferTimer_timeout"]
[connection signal="timeout" from="BlobbyStateMachine/CrushTimer" to="." method="_on_CrushTimer_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="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="die_for_real" binds= [ -1 ]]
[connection signal="timeout" from="PitfallTimer" to="." method="_on_PitfallTimer_timeout"]

2
src/Environment/Grass/ShaderGrass.gd
View File

@ -104,7 +104,7 @@ func grass_wave_update(delta: float) -> void:
$Timer.stop() $Timer.stop()
is_idle_swinging = true is_idle_swinging = true
var start = displacement_coeff.x if begin_idle else 0.0 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 begin_idle = false
# if(displacement_coeff.x > saved_coeff): # if(displacement_coeff.x > saved_coeff):
# print(displacement_coeff.x) # print(displacement_coeff.x)