Merge branch 'main' of git.fosil.eu:gymkhana/gymkhana

This commit is contained in:
2024-02-13 00:11:09 +01:00
3 changed files with 1 additions and 2 deletions

View File

@@ -1,6 +1,5 @@
extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd" extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd"
func _init(): func _init():
_create_states() _create_states()
_add_states_to_machine() _add_states_to_machine()

View File

@@ -1,5 +1,4 @@
extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
func enter(): func enter():
escoria.logger.trace(self, "Dialog State Machine: Entered 'idle'.") escoria.logger.trace(self, "Dialog State Machine: Entered 'idle'.")

View File

@@ -118,6 +118,7 @@ _global_script_classes=[ {
"class": "ESCActionManagerMonkey", "class": "ESCActionManagerMonkey",
"language": "GDScript", "language": "GDScript",
"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd" "path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "ESCAnimationName", "class": "ESCAnimationName",