From 3304d1157977cc5392d2ccedeb16d224d8f9e966 Mon Sep 17 00:00:00 2001 From: StraToN Date: Wed, 11 May 2022 17:19:59 +0000 Subject: [PATCH] chore: storing version and changelog --- CHANGELOG.md | 4 ++++ .../escoria-core/game/core-scripts/esc/esc_action_manager.gd | 2 +- .../escoria-core/game/core-scripts/esc/esc_event_manager.gd | 4 ++-- addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a5e99e..02171b3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [4.0.0-alpha.183](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.183) (2022-05-11) + + + ## [4.0.0-alpha.182](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.182) (2022-05-11) diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd index 5e482390..daf6d127 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd @@ -526,7 +526,7 @@ func perform_inputevent_on_object( # In case of an interrupted walk, we don't want to proceed. if context == null: return - + destination_position = context.target_position dont_interact = context.dont_interact_on_arrival diff --git a/addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd index 03b2a66f..6fb709b6 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd @@ -297,11 +297,11 @@ func interrupt(exceptions: PoolStringArray = []) -> void: for event in events_queue[channel_name]: if event.name in exceptions: continue - + escoria.logger.debug("Interrupting queued event %s in channel %s..." % [event.name, channel_name]) event.interrupt() - + events_queue[channel_name].clear() diff --git a/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd index 0e4f6017..e34c0064 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd @@ -365,7 +365,7 @@ func _perform_script_events(room: ESCRoom) -> void: ) ] ) - + command_strings.append("%s 0.1" % _wait.get_command_name()) command_strings.append("%s ALL" % _accept_input.get_command_name())