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

This commit is contained in:
2023-09-25 23:07:20 +02:00
35 changed files with 410 additions and 70 deletions

View File

@@ -209,7 +209,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd"
}, {
"base": "Node",
"base": "StateMachine",
"class": "ESCDialogPlayer",
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd"
@@ -289,6 +289,11 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_item.gd"
}, {
"base": "Resource",
"class": "ESCItemCountManager",
"language": "GDScript",
"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd"
}, {
"base": "ESCItem",
"class": "ESCItemWithTooltip",
"language": "GDScript",
@@ -504,12 +509,22 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/inventory_remove.gd"
}, {
"base": "ESCBaseCommand",
"class": "ItemCountAddCommand",
"language": "GDScript",
"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd"
}, {
"base": "Polygon2D",
"class": "ItemOutline",
"language": "GDScript",
"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/item_outline.gd"
}, {
"base": "ESCBaseCommand",
"class": "PlayLibSound",
"language": "GDScript",
"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd"
}, {
"base": "ESCBaseCommand",
"class": "PlaySndCommand",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/play_snd.gd"
@@ -544,6 +559,11 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd"
}, {
"base": "Resource",
"class": "RTMIUiSettings",
"language": "GDScript",
"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd"
}, {
"base": "ESCBaseCommand",
"class": "RandGlobalCommand",
"language": "GDScript",
@@ -766,6 +786,7 @@ _global_script_class_icons={
"ESCInventoryItem": "",
"ESCInventoryManager": "",
"ESCItem": "res://addons/escoria-core/design/esc_item.svg",
"ESCItemCountManager": "",
"ESCItemWithTooltip": "res://addons/escoria-core/design/esc_item.svg",
"ESCLocation": "res://addons/escoria-core/design/esc_location.svg",
"ESCMain": "",
@@ -809,7 +830,9 @@ _global_script_class_icons={
"IncGlobalCommand": "",
"InventoryAddCommand": "",
"InventoryRemoveCommand": "",
"ItemCountAddCommand": "",
"ItemOutline": "res://addons/escoria-core/design/esc_item.svg",
"PlayLibSound": "",
"PlaySndCommand": "",
"PlayVideoCommand": "",
"PrintCommand": "",
@@ -817,6 +840,7 @@ _global_script_class_icons={
"QueueResourceCommand": "",
"RTMISimpleDialogPlugin": "",
"RTMISimpleDialogSettings": "",
"RTMIUiSettings": "",
"RandGlobalCommand": "",
"RepeatCommand": "",
"SayCommand": "",
@@ -938,6 +962,7 @@ rtmi_dialog_simple/left_click_action="Speed up"
rtmi_dialog_simple/stop_talking_animation_on="End of audio"
debug/enable_hover_stack_viewer=true
ui/dialogs_chooser="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd"
rtmi_ui/sound_library_folder="res://gymkhana/sounds/"
[input]