Merge branch 'custom-data-components'
This commit is contained in:
@@ -479,6 +479,11 @@ _global_script_classes=[ {
|
||||
"language": "GDScript",
|
||||
"path": "res://addons/escoria-core/game/core-scripts/esc_tooltip.gd"
|
||||
}, {
|
||||
"base": "Resource",
|
||||
"class": "ESCTootltipManager",
|
||||
"language": "GDScript",
|
||||
"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_tooltip_manager.gd"
|
||||
}, {
|
||||
"base": "ColorRect",
|
||||
"class": "ESCTransitionPlayer",
|
||||
"language": "GDScript",
|
||||
@@ -856,7 +861,7 @@ _global_script_class_icons={
|
||||
"ESCObject": "",
|
||||
"ESCObjectManager": "",
|
||||
"ESCPlayer": "res://addons/escoria-core/design/esc_player.svg",
|
||||
"ESCPlayerWithTooltip": "res://addons/escoria-core/design/esc_player.svg",
|
||||
"ESCPlayerWithTooltip": "",
|
||||
"ESCProjectSettingsManager": "",
|
||||
"ESCResourceCache": "",
|
||||
"ESCResourceDescriptor": "",
|
||||
@@ -879,6 +884,7 @@ _global_script_class_icons={
|
||||
"ESCStatement": "",
|
||||
"ESCTerrain": "res://addons/escoria-core/design/esc_terrain.svg",
|
||||
"ESCTooltip": "",
|
||||
"ESCTootltipManager": "",
|
||||
"ESCTransitionPlayer": "",
|
||||
"ESCUtils": "",
|
||||
"ESCWalkContext": "",
|
||||
@@ -891,7 +897,7 @@ _global_script_class_icons={
|
||||
"InventoryAddCommand": "",
|
||||
"InventoryRemoveCommand": "",
|
||||
"ItemCountAddCommand": "",
|
||||
"ItemOutline": "",
|
||||
"ItemOutline": "res://addons/escoria-core/design/esc_item.svg",
|
||||
"PlayLibSound": "",
|
||||
"PlaySndCommand": "",
|
||||
"PlayVideoCommand": "",
|
||||
@@ -960,6 +966,7 @@ default_bus_layout="res://addons/escoria-core/default_bus_layout.tres"
|
||||
[autoload]
|
||||
|
||||
escoria="*res://addons/escoria-core/game/esc_autoload.gd"
|
||||
gymkhana="*res://addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd"
|
||||
|
||||
[display]
|
||||
|
||||
@@ -975,7 +982,6 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
|
||||
[editor_plugins]
|
||||
|
||||
enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" )
|
||||
<<<<<<<HEADenabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" )
|
||||
|
||||
[escoria]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user