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

cursor fix
2023-09-26 00:48:44 +02:00 · 2023-09-26 00:48:27 +02:00
2 changed files with 4 additions and 2 deletions
--- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
@@ -310,7 +310,9 @@ func click_on_inventory_item(item_global_id: String, event: InputEvent, action:

 	# If item needs combination with this action, use the item texture as mouse cursor
 	if action in target_obj.combine_when_selected_action_is_in:
-		Input.set_custom_mouse_cursor(target_obj.inventory_texture)
+		var texture = target_obj.inventory_texture
+		var middleOfTheTexture = Vector2(texture.get_width() / 2, texture.get_height() / 2)
+		Input.set_custom_mouse_cursor(target_obj.inventory_texture, 0, middleOfTheTexture)

 	escoria.action_manager.do(
 		escoria.action_manager.ACTION.ITEM_LEFT_CLICK,
--- a/project.godot
+++ b/project.godot
@@ -204,7 +204,7 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd"
 }, {
-"base": "StateMachine",
+"base": "Node",
 "class": "ESCDialogPlayer",
 "language": "GDScript",
 "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd"
Author	SHA1	Message	Date
oier	9c4df0d4d7	Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main	2023-09-26 00:48:44 +02:00
oier	401de66a9f	cursor fix	2023-09-26 00:48:27 +02:00