Merge remote-tracking branch 'origin/main' into main

outfrost · Apr 26, 2021 · 45c6e6d · 45c6e6d
2 parents 0505ee2 + e38f26d
commit 45c6e6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/character/Enemy.tscn b/character/Enemy.tscn
@@ -38,6 +38,7 @@ animation = "idle_down"
 offset = Vector2( 0, -16 )
 
 [node name="FxSprite" type="AnimatedSprite" parent="."]
+visible = false
 frames = ExtResource( 18 )
 animation = "idle"
 offset = Vector2( 0, -14 )

diff --git a/project.godot b/project.godot
@@ -137,3 +137,4 @@ quality/shadow_atlas/size.mobile=1024
 environment/default_clear_color=Color( 0.19, 0.19, 0.19, 1 )
 quality/depth/hdr=false
 environment/default_environment="res://default_env.tres"
+quality/dynamic_fonts/use_oversampling=false