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

Added hover stack to manage overlapping Area2Ds

Browse Source 
Added room selector in demo scenes
Modified dialogues in room 1, fixed bug in room 8 and 9
This commit is contained in:
Julian Murgia
2021-02-03 17:26:12 +01:00
parent b789490f63
commit bd3ef71c80
33 changed files with 253 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/escoria-core/game/core-scripts/esc/esc_runner.gd
View File

@@ -375,7 +375,7 @@ func change_scene(params, context, run_events=true):
# Finally we add the setup on to of the events stack so that it is ran first
run_event(events["setup"])
escoria.inputs_manager.is_hotspot_focused = false
escoria.inputs_manager.hotspot_focused = ""
if !scenes_cache_list.has(params[0]):
scenes_cache_list.push_back(params[0])
scenes_cache[room_scene.global_id] = params[0]
@@ -431,7 +431,7 @@ func superpose_scene(params, context, run_events=true):
get_node("/root").add_child(room_scene)
escoria.inputs_manager.is_hotspot_focused = false
escoria.inputs_manager.hotspot_focused = false
if !scenes_cache_list.has(params[0]):
scenes_cache_list.push_back(params[0])
if room_scene.get("global_id"):

8
addons/escoria-core/game/core-scripts/escitem.gd
View File

@@ -9,8 +9,8 @@ func get_class():
ESCItem is a Sprite that defines an item, potentially interactive
"""
signal mouse_entered_item(global_id)
signal mouse_exited_item
signal mouse_entered_item(item)
signal mouse_exited_item(item)
signal mouse_left_clicked_item(global_id)
signal mouse_double_left_clicked_item(global_id)
signal mouse_right_clicked_item(global_id)
@@ -183,10 +183,10 @@ func manage_input(viewport : Viewport, event : InputEvent, shape_idx : int):
func _on_mouse_entered():
emit_signal("mouse_entered_item", global_id)
emit_signal("mouse_entered_item", self)
func _on_mouse_exited():
emit_signal("mouse_exited_item")
emit_signal("mouse_exited_item", self)
################################################################################