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

chore: storing version and changelog

Browse Source
This commit is contained in:
balloonpopper
2022-11-28 07:17:47 +00:00
parent fcfd6965b6
commit 62f48621a4
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core/game/core-scripts/esc_item.gd
View File

@@ -326,7 +326,7 @@ func _on_input_event(_viewport: Object, event: InputEvent, _shape_idx: int):
if c.collider.get("global_id") \
and escoria.action_manager.is_object_actionable(c.collider.global_id):
colliding_nodes.push_back(c.collider)
if colliding_nodes.empty():
return
colliding_nodes.sort_custom(HoverStackSorter, "sort_ascending_z_index")

10
addons/escoria-core/game/esc_inputs_manager.gd
View File

@@ -364,7 +364,7 @@ func _on_mouse_entered_item(item: ESCItem) -> void:
hotspot_focused = hover_stack.back().global_id
escoria.main.current_scene.game.element_focused(hotspot_focused)
return
if not escoria.action_manager.is_object_actionable(item.global_id):
escoria.logger.debug(
self,
@@ -446,7 +446,7 @@ func _on_mouse_left_clicked_item(item: ESCItem, event: InputEvent) -> void:
"Ignoring left click on player %s: Player not selectable."
% [item.global_id]
)
# Get next object in hover stack and forward event to it
if not hover_stack.empty():
var next_item = hover_stack.pop_back()
@@ -463,7 +463,7 @@ func _on_mouse_left_clicked_item(item: ESCItem, event: InputEvent) -> void:
hotspot_focused = ""
_on_left_click_on_bg(event.position)
return
# Finally, execute the action on the ESCItem
hotspot_focused = item.global_id
escoria.main.current_scene.game.left_click_on_item(
@@ -490,7 +490,7 @@ func _on_mouse_left_double_clicked_item(
"Ignoring double left click on player %s: Player not selectable."
% [item.global_id]
)
# Get next object in hover stack and forward event to it
if not hover_stack.empty():
var next_item = hover_stack.pop_back()
@@ -507,7 +507,7 @@ func _on_mouse_left_double_clicked_item(
hotspot_focused = ""
_on_double_left_click_on_bg(event.position)
return
# Finally, execute the action on the ESCItem
hotspot_focused = item.global_id
escoria.main.current_scene.game.left_double_click_on_item(