oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Huge cleanup (#420)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-10-25 08:59:07 +02:00
committed by GitHub
parent 3de06adcf9
commit 94d86d24d5
101 changed files with 1091 additions and 67952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
addons/escoria-ui-9verbs/game.gd
View File

@@ -32,7 +32,8 @@ Implement methods to react to inputs.
onready var verbs_menu = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/VerbsMargin/verbs_menu
onready var tooltip = $ui/Control/panel_down/VBoxContainer/tooltip
onready var tooltip = $ui/Control/panel_down/VBoxContainer/MarginContainer\
/tooltip
onready var room_select = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/MainMargin/VBoxContainer/room_select
onready var pause_menu = $ui/pause_menu
@@ -46,6 +47,18 @@ func _enter_tree():
self,
"_on_action_finished"
)
var room_selector_parent = $ui/Control/panel_down/VBoxContainer\
/HBoxContainer/MainMargin/VBoxContainer
if ProjectSettings.get_setting("escoria/debug/enable_room_selector") and \
room_selector_parent.get_node_or_null("room_select") == null:
room_selector_parent.add_child(
preload(
"res://addons/escoria-core/ui_library/tools/room_select" +\
"/room_select.tscn"
).instance()
)
func _exit_tree():
escoria.action_manager.disconnect(