From 59aff141a302fcdd4632dcbcdad411516344acbb Mon Sep 17 00:00:00 2001 From: StraToN Date: Tue, 19 Apr 2022 14:25:52 +0000 Subject: [PATCH] chore: storing version and changelog --- CHANGELOG.md | 16 ++++++++++++++++ .../game/core-scripts/esc/esc_event_manager.gd | 2 +- addons/escoria-core/game/main.gd | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e736fb..56cde7e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## [4.0.0-alpha.161](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.161) (2022-04-19) + + +### Bug Fixes + +* change hotspots Node to Node2D to allow for proper room visibility swapping ([b985c42](https://github.com/godot-escoria/escoria-demo-game/commit/b985c42e086395e7becc05f325353d5ca75c42e5)) +* fixes issue w/ bottle from room9 and inventory across rooms; fixes issue w/ room10 and text rendering ([9db27c6](https://github.com/godot-escoria/escoria-demo-game/commit/9db27c6a7487b9aab654b6d802f630606906e738)) +* missing this parameter ([4b3b96b](https://github.com/godot-escoria/escoria-demo-game/commit/4b3b96b688f46dcbaa186ded94be5d78a51fd373)) +* moves game scene removal/addition to room until after transition; still needs testing, especially w instant transitions ([8d1b00b](https://github.com/godot-escoria/escoria-demo-game/commit/8d1b00bb90b31018886275ce8e617778a8d563b9)) +* needs instantiation; also small cleanup ([0cf4672](https://github.com/godot-escoria/escoria-demo-game/commit/0cf467216128be9b4c70f1e8271c7e1df7b76fa1)) +* prevents async (i.e. events that are yielded to) from overlapping ([3ff3849](https://github.com/godot-escoria/escoria-demo-game/commit/3ff38492323f2cf075a23d6111c1c52002a285ee)) +* remove duplicate transition out (needs testing) ([c92c4ed](https://github.com/godot-escoria/escoria-demo-game/commit/c92c4edacf6236695080b7dda646ff2a931ec404)) +* should now block for yielding events but only on the same channel ([92e23be](https://github.com/godot-escoria/escoria-demo-game/commit/92e23beb0011c8003ca9c1f6a864e9c9fe3636fb)) + + + ## [4.0.0-alpha.160](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.160) (2022-04-19) 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 f236d56f..308c435f 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 @@ -132,7 +132,7 @@ func _process(delta: float) -> void: escoria.save_manager.save_enabled = false var rc = _running_events[channel_name].run() - + if rc is GDScriptFunctionState: _yielding[channel_name] = true rc = yield(rc, "completed") diff --git a/addons/escoria-core/game/main.gd b/addons/escoria-core/game/main.gd index ca5c9698..7b57ee12 100644 --- a/addons/escoria-core/game/main.gd +++ b/addons/escoria-core/game/main.gd @@ -88,7 +88,7 @@ func set_scene_finish() -> void: # Make our new scene visible. current_scene.visible = true - + clear_previous_scene() emit_signal("room_ready")