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:
StraToN
2022-04-09 14:13:32 +00:00
parent baee79f5a0
commit 7a46908569
6 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@@ -1,3 +1,12 @@
## [4.0.0-alpha.158](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.158) (2022-04-09)
### Features
* reports source of ESC errors when possible ([#568](https://github.com/godot-escoria/escoria-demo-game/issues/568)) ([baee79f](https://github.com/godot-escoria/escoria-demo-game/commit/baee79f5a05249d2dcd16111d4243582887b27ee))
## [4.0.0-alpha.157](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.157) (2022-04-08) ## [4.0.0-alpha.157](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.157) (2022-04-08)

2
addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd
View File

@@ -56,7 +56,7 @@ func run(command_params: Array) -> int:
"transition_done" "transition_done"
) != transition_id: ) != transition_id:
pass pass
if command_params[0] == "main": if command_params[0] == "main":
escoria.game_scene.show_main_menu() escoria.game_scene.show_main_menu()
elif command_params[0] == "pause": elif command_params[0] == "pause":

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

@@ -479,7 +479,7 @@ func _object_exists_in_room(object: ESCObject, room_key: ESCRoomObjectsKey) -> b
for room_container in room_objects: for room_container in room_objects:
if _compare_container_to_key(room_container, room_key) \ if _compare_container_to_key(room_container, room_key) \
and room_container.objects.has(object.global_id): and room_container.objects.has(object.global_id):
return true return true
return false return false

6
addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
View File

@@ -84,7 +84,7 @@ func change_scene(room_path: String, enable_automatic_transitions: bool) -> void
escoria.logger.debug( escoria.logger.debug(
"Awaiting transition %s (out) to be finished." % transition_id "Awaiting transition %s (out) to be finished." % transition_id
) )
yield(escoria.main.scene_transition, "transition_done") yield(escoria.main.scene_transition, "transition_done")
# Hide main and pause menus # Hide main and pause menus
@@ -295,7 +295,7 @@ func _perform_script_events(room: ESCRoom) -> void:
rc = yield(escoria.event_manager, "event_finished") rc = yield(escoria.event_manager, "event_finished")
if rc[0] != ESCExecution.RC_OK: if rc[0] != ESCExecution.RC_OK:
return rc[0] return rc[0]
yielded = true yielded = true
# Hide main and pause menus # Hide main and pause menus
@@ -368,7 +368,7 @@ func _perform_script_events(room: ESCRoom) -> void:
rc = yield(escoria.event_manager, "event_finished") rc = yield(escoria.event_manager, "event_finished")
if rc[0] != ESCExecution.RC_OK: if rc[0] != ESCExecution.RC_OK:
return rc[0] return rc[0]
# Now that :ready is finished, if FORCE_LAST_SCENE_NULL was true, reset it # Now that :ready is finished, if FORCE_LAST_SCENE_NULL was true, reset it
# to false # to false
if escoria.globals_manager.get_global( \ if escoria.globals_manager.get_global( \

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

@@ -205,7 +205,7 @@ func error(string: String, args = [], do_savegame: bool = true):
_log(message, true) _log(message, true)
escoria.set_game_paused(true) escoria.set_game_paused(true)
if is_instance_valid(escoria.main.current_scene): if is_instance_valid(escoria.main.current_scene):
escoria.main.current_scene.game.show_crash_popup(files_to_send) escoria.main.current_scene.game.show_crash_popup(files_to_send)

2
addons/escoria-ui-simplemouse/game.gd
View File

@@ -209,7 +209,7 @@ func element_focused(element_id: String) -> void:
if escoria.action_manager.current_action != VERB_USE \ if escoria.action_manager.current_action != VERB_USE \
and escoria.action_manager.current_tool == null \ and escoria.action_manager.current_tool == null \
and target_obj is ESCItem: and target_obj is ESCItem:
$mouse_layer/verbs_menu.set_by_name( $mouse_layer/verbs_menu.set_by_name(
target_obj.default_action target_obj.default_action
) )