chore: storing version and changelog
This commit is contained in:
@@ -1,3 +1,12 @@
|
|||||||
|
## [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)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Avoid globals starting with 'i/' ([#556](https://github.com/godot-escoria/escoria-demo-game/issues/556)) ([05f139e](https://github.com/godot-escoria/escoria-demo-game/commit/05f139ef1af50a02182882e8724591d50537260f))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [4.0.0-alpha.156](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.156) (2022-04-08)
|
## [4.0.0-alpha.156](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.156) (2022-04-08)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -50,14 +50,14 @@ func run(command_params: Array) -> int:
|
|||||||
"",
|
"",
|
||||||
ESCTransitionPlayer.TRANSITION_MODE.OUT
|
ESCTransitionPlayer.TRANSITION_MODE.OUT
|
||||||
)
|
)
|
||||||
|
|
||||||
if transition_id != ESCTransitionPlayer.TRANSITION_ID_INSTANT:
|
if transition_id != ESCTransitionPlayer.TRANSITION_ID_INSTANT:
|
||||||
while yield(
|
while yield(
|
||||||
escoria.main.scene_transition,
|
escoria.main.scene_transition,
|
||||||
"transition_done"
|
"transition_done"
|
||||||
) != transition_id:
|
) != transition_id:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if command_params[0] == "main":
|
if command_params[0] == "main":
|
||||||
escoria.game_scene.hide_main_menu()
|
escoria.game_scene.hide_main_menu()
|
||||||
elif command_params[0] == "pause":
|
elif command_params[0] == "pause":
|
||||||
|
|||||||
@@ -49,14 +49,14 @@ func run(command_params: Array) -> int:
|
|||||||
"",
|
"",
|
||||||
ESCTransitionPlayer.TRANSITION_MODE.OUT
|
ESCTransitionPlayer.TRANSITION_MODE.OUT
|
||||||
)
|
)
|
||||||
|
|
||||||
if transition_id != ESCTransitionPlayer.TRANSITION_ID_INSTANT:
|
if transition_id != ESCTransitionPlayer.TRANSITION_ID_INSTANT:
|
||||||
while yield(
|
while yield(
|
||||||
escoria.main.scene_transition,
|
escoria.main.scene_transition,
|
||||||
"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":
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ func register_object(object: ESCObject, room: ESCRoom = null, force: bool = fals
|
|||||||
# changes.
|
# changes.
|
||||||
room_key.room_global_id = current_room_key.room_global_id
|
room_key.room_global_id = current_room_key.room_global_id
|
||||||
room_key.room_instance_id = current_room_key.room_instance_id
|
room_key.room_instance_id = current_room_key.room_instance_id
|
||||||
|
|
||||||
if not room_key.is_valid():
|
if not room_key.is_valid():
|
||||||
# This condition should very likely never happen.
|
# This condition should very likely never happen.
|
||||||
escoria.logger.report_errors(
|
escoria.logger.report_errors(
|
||||||
@@ -336,7 +336,7 @@ func unregister_object(object: ESCObject, room_key: ESCRoomObjectsKey) -> void:
|
|||||||
"part of a 'forced' registration, ignore this warning."
|
"part of a 'forced' registration, ignore this warning."
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
var room_objects = _get_room_objects_objects(room_key)
|
var room_objects = _get_room_objects_objects(room_key)
|
||||||
@@ -473,13 +473,13 @@ func _object_exists_in_room(object: ESCObject, room_key: ESCRoomObjectsKey) -> b
|
|||||||
"Cannot check for null objects."
|
"Cannot check for null objects."
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
return false
|
return false
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -229,7 +229,7 @@ func init_room(room: ESCRoom) -> void:
|
|||||||
room,
|
room,
|
||||||
true
|
true
|
||||||
)
|
)
|
||||||
|
|
||||||
if escoria.globals_manager.has(
|
if escoria.globals_manager.has(
|
||||||
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
|
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
|
||||||
):
|
):
|
||||||
@@ -293,7 +293,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
|
||||||
@@ -364,7 +364,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( \
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|
||||||
|
|||||||
@@ -296,7 +296,7 @@ func load_game(id: int):
|
|||||||
## GLOBALS
|
## GLOBALS
|
||||||
for k in save_game.globals.keys():
|
for k in save_game.globals.keys():
|
||||||
var global_value = save_game.globals[k]
|
var global_value = save_game.globals[k]
|
||||||
|
|
||||||
if global_value is String and global_value.empty():
|
if global_value is String and global_value.empty():
|
||||||
global_value = "''"
|
global_value = "''"
|
||||||
|
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ func set_game_paused(p_paused: bool):
|
|||||||
emit_signal("paused")
|
emit_signal("paused")
|
||||||
else:
|
else:
|
||||||
emit_signal("resumed")
|
emit_signal("resumed")
|
||||||
|
|
||||||
var scene_tree = get_tree()
|
var scene_tree = get_tree()
|
||||||
|
|
||||||
if is_instance_valid(scene_tree):
|
if is_instance_valid(scene_tree):
|
||||||
@@ -372,7 +372,7 @@ func _handle_direct_scene_run() -> void:
|
|||||||
if current_scene_root.filename == ProjectSettings.get_setting('application/run/main_scene'):
|
if current_scene_root.filename == ProjectSettings.get_setting('application/run/main_scene'):
|
||||||
# This is a normal, full-game run, so there's nothing to do.
|
# This is a normal, full-game run, so there's nothing to do.
|
||||||
return
|
return
|
||||||
|
|
||||||
if current_scene_root is ESCRoom:
|
if current_scene_root is ESCRoom:
|
||||||
escoria.object_manager.set_current_room(current_scene_root)
|
escoria.object_manager.set_current_room(current_scene_root)
|
||||||
|
|
||||||
|
|||||||
@@ -53,13 +53,13 @@ func set_scene(p_scene: Node) -> void:
|
|||||||
|
|
||||||
escoria.object_manager.set_current_room(p_scene)
|
escoria.object_manager.set_current_room(p_scene)
|
||||||
add_child(p_scene)
|
add_child(p_scene)
|
||||||
|
|
||||||
# In cases where the room being created doesn't return because of a
|
# In cases where the room being created doesn't return because of a
|
||||||
# coroutine, finish_current_scene_init() will already have been called
|
# coroutine, finish_current_scene_init() will already have been called
|
||||||
# and so we don't want to risk repeating ourselves.
|
# and so we don't want to risk repeating ourselves.
|
||||||
if p_scene == current_scene:
|
if p_scene == current_scene:
|
||||||
return
|
return
|
||||||
|
|
||||||
# This actually moves the scene closest to the root node, but will
|
# This actually moves the scene closest to the root node, but will
|
||||||
# still be drawn behind the next node, which should be the previous
|
# still be drawn behind the next node, which should be the previous
|
||||||
# room.
|
# room.
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ func transition(
|
|||||||
return TRANSITION_ID_INSTANT
|
return TRANSITION_ID_INSTANT
|
||||||
|
|
||||||
var material_path = get_transition(transition_name)
|
var material_path = get_transition(transition_name)
|
||||||
|
|
||||||
material = ResourceLoader.load(get_transition(transition_name))
|
material = ResourceLoader.load(get_transition(transition_name))
|
||||||
transition_id += 1
|
transition_id += 1
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user