Merge branch 'main' into custom-level-loading-rewrite

This commit is contained in:
JHDev2006
2025-10-26 12:33:16 +00:00
158 changed files with 2106 additions and 1148 deletions

View File

@@ -32,7 +32,7 @@ func bounce_player(player: Player) -> void:
$Sprite.play("Idle")
func refresh_hitbox() -> void:
$Hitbox/CollisionShape2D.set_deferred("disabled", true)
$PlayerDetection/CollisionShape2D.set_deferred("disabled", true)
await get_tree().physics_frame
$Hitbox/CollisionShape2D.set_deferred("disabled", false)
$PlayerDetection/CollisionShape2D.set_deferred("disabled", false)

View File

@@ -6,9 +6,6 @@ static var character_save := "Mario"
func _ready() -> void:
activated.get_node("ResourceSetterNew").resource_json = load(get_character_sprite_path(0))
if Settings.file.difficulty.checkpoint_style == 0 and (Global.current_game_mode != Global.GameMode.LEVEL_EDITOR and Global.current_game_mode != Global.GameMode.CUSTOM_LEVEL) or Global.current_campaign == "SMBANN":
owner.queue_free()
return
owner.show()
if owner.passed:
sprite.hide()