Commit Graph
100 Commits
Author SHA1 Message Date
ad79aa69d1 Big refactor: Fix plugin issues when disabling/reenabling plugins (#598)
Co-authored-by: balloonpopper <5151242+balloonpopper@users.noreply.github.com>
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
2022-07-10 20:40:08 +02:00
Julian Murgia b8983b8b42 fix: manage clearing of current_action when action is interrupted (#584)
* fix: manage clearing of current_action when action is interrupted
* fix: repairs change_scene, add comments and new RC_INTERRUPTED code
* fix: manage ESC commands interruptions, even if running
2022-05-01 12:48:02 +02:00
Julian MurgiaandMathieu Bergounioux d255f781ec Prefixed all Escoria console output with 'ESC' (#591)
Co-authored-by: Mathieu Bergounioux <Mathieu.Bergounioux@sectra.com>
2022-05-01 12:45:44 +02:00
Julian Murgia 8a58aa7efc Fix: disable ESCGame inputs until signal room_ready is emitted (#582)
* Fix: disable ESCGame inputs until signal room_ready is emitted
* fix: add a new function to use in _input() to check for inputs

* Apply suggestions from code review
Co-authored-by: balloonpopper <5151242+balloonpopper@users.noreply.github.com>
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
2022-04-30 20:10:14 +02:00
Julian Murgia b23adae360 Fix: removed calls to inexisting "escoria" singleton after plugin disbld (#578)
* Fix: removed calls to inexisting "escoria" singleton after plugin disabled
* review: added a factory-like function to get the escoria singleton

Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
* Keep a reference of escoria singleton in plugin.gd
2022-04-24 15:30:57 +02:00
Julian Murgia 4b2b6f516e feat: Save objects states in Obj Manager to keep them btwn rooms (#554) 2022-04-23 18:55:21 +02:00
Julian Murgia 2c88786a97 Update CODEOWNERS
Added @balloonpopper as code owner
2022-04-21 10:18:08 +02:00
Julian Murgia 05f139ef1a Fix: Avoid globals starting with 'i/' (#556) 2022-04-08 21:20:20 +02:00
Julian Murgia 284cb0d539 Fix: Mirroed ESCItem's talk animation was conflicting with mirrored idle
Also remove multiple calls to get_animation_player()
Fixes https://github.com/godot-escoria/escoria-issues/issues/201
2022-03-23 13:56:18 +01:00
Julian Murgia 3c0ebf1869 Fix: out of bounds exception in camera_push (#546) 2022-03-21 22:19:11 +01:00
Julian Murgia 9b80aeb154 New logo that looks less like a risen middle finger (#544) 2022-03-18 10:20:41 +01:00
Julian Murgia 0262a75b25 Managed mirrored speak animations in ESCItem
Simplified sprite mirroring in cases of movement and talking


Simplified even more


Fix: simplification again
2022-03-17 22:32:34 +01:00
Julian Murgia cb538edb01 fix: Wrong variable used causing a crash on UI de-registering 2022-03-10 23:41:46 +01:00
Julian MurgiaandDuncan Brown ac2e7ba20e Fix wrong (old) documentation about setup and ready events (#524)
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
2022-03-07 17:27:55 +01:00
Julian Murgia bb4d218277 Fix crash when save folder is empty and manage corrupted savegame file (#497) 2022-02-17 22:23:41 +01:00
Julian Murgia 2384127ca4 Fix: use Escoria plugin version from plugin.cfg in savegames (#489) 2022-02-15 18:21:19 +01:00
Julian Murgia 353b349d1b Set a default implementation for ESCGame._on_event_done() (#486) 2022-02-04 16:27:21 +01:00
Julian Murgia 3e6db46ec6 Fix transitions not happening if the ESCRoom has no ESC script (#485)
Fixes godot-escoria/escoria-issues#95
2022-01-17 09:48:25 +01:00
Julian Murgia 2179b803e0 Implement custom data save in settings and savegames (#484) 2022-01-13 11:09:06 +01:00
Julian Murgia ba0b66656d Fix initial value of globals in signals emissions (#483) 2021-12-31 16:57:10 +01:00
Julian Murgia 3e4d936007 Fix "global_changed" signal arguments order (#482) 2021-12-15 08:49:36 +01:00
Julian Murgia 92e38b245e Fix input being blocked when item is not interactive #91 (#481) 2021-12-14 07:23:37 +01:00
Julian Murgia a0f15af10b Removed ESCController and greatly reworked ESCActionManager (#480) 2021-12-13 14:06:43 +01:00
8e043f56a6 Fix a bug where player angle was wrongly tested around 360 (#471)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: Dennis Ploeger <github.dennis@dieploegers.de>
2021-12-01 13:37:28 +01:00
Julian Murgia b4d5e380e6 Fix: makes dialog players pausable by removing yields (#472) 2021-12-01 09:39:24 +01:00
Julian Murgia 44056673c9 Fixed dialogs pause mode 2021-11-29 23:26:41 +01:00
Julian Murgia b031d69cd9 Save and load game fixes (and some other small fixes) (#466) 2021-11-29 14:21:29 +01:00
Julian Murgia 3a43bac46e Reverted setting ESC_LAST_SCENE too early in ESCRoom (#464) 2021-11-25 23:44:20 +01:00
Julian Murgia a49e5a2690 Fix auto transition when changing room without exit_scene event (#462)
Added a new fourth button in room14 to demonstrate this.
Renamed BYPASS_LAST_SCENE to FORCE_LAST_SCENE_NULL to make it a bit clearer.
Made events "finished" and "interrupted" signals connections as ONESHOT (so they are disconnected once the signal was received).

Also removed some unused files, many others remain.
And fixed some bugs here and there.
2021-11-25 15:24:33 +01:00
Julian Murgia 5a94d9be73 Check that ending animation is not looping before resetting it (#456) 2021-11-22 13:08:47 +01:00
Julian Murgia c9cbd2db80 Fixes ESCMoving angles calculation to make it work with 2-dir animations (#454) 2021-11-21 22:21:30 +01:00
Julian Murgia d9932e964a Connect crash_popup_confirmed signal automatically 2021-11-18 21:49:33 +01:00
Julian Murgia 43f06e38c2 Adds default crash popup, if game.gd doesn't reimplement it (#449) 2021-11-18 21:41:27 +01:00
Julian Murgia bb0520adcb Re-add removed assert(false) (#448) 2021-11-18 21:21:01 +01:00
Julian Murgia 6393a7edd8 Adds a popup on crash, wait for it to close to quit the game (#447) 2021-11-18 20:52:54 +01:00
Julian Murgia 729a60f6c0 Manage save game in case of room loading failure (#441) 2021-11-15 09:18:15 +01:00
Julian Murgia 4221cda1c2 Logger outputs logfile and savegame on crash (#439) 2021-11-14 14:12:18 +01:00
Julian Murgia c4d1432d66 fix: Fixed input problems (#440)
Authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-14 13:36:59 +01:00
Julian Murgia a6beb40b3e Added a check on unknown ESC command at compilation time (#438) 2021-11-13 11:15:03 +01:00
Julian Murgia 555f820254 Fix broken room camera (#437) 2021-11-13 10:14:18 +01:00
Julian Murgia d55c1394fd Fix missing file error (#436) 2021-11-12 23:49:59 +01:00
Julian Murgia bbe885edc2 Ensure player is set at start location if there is one (#435)
This is done even if there is no ESC script attached to the room.
First default position will then be the start ESCLocation if there is one.
Else, fallback to origin (0,0).
2021-11-12 22:57:44 +01:00
Julian Murgia e4bc9ecccf Rename flag NO_HUD to NO_UI (code) (#432) 2021-11-11 22:46:00 +01:00
Julian Murgia 877d31a41f Merge pull request #427 from godot-escoria/issue-48 2021-11-11 22:22:11 +01:00
Julian Murgia c86b802cbb Add show_menu and hide_menu ESC commands
Fixes godot-escoria/escoria-issues#48
Fix: tween was stopped_all before starting


Fix: reload locale from settings in ESCGame

Since main menu and pause menu are now loaded from ESCGame and not from escoria.gd, this must be done here.
Fix: small crash in load game

But save and load are broken at the moment...
Fix: check save and load after main menu changes


Required fixes


Fix: manage the game scene better in show and hide_menu


Enh: transition back in to the previous room if there was one


Fix a bug occurring where change_scene awaits forever for setup to end


Reworked change_scene and esc_room implementation to avoid yielding


Added a controller variable to allow new event run in events_manager


Don't empty the events queue if the running_event was interrupted


Fixed transitions and automatic transitions in change_scene

Added trace log level (for esc_compiler in particular)
Fixed various bugs in ESC scripts
Fix a bug where exit_scene happened multiple times where fast walking

Needed to clear the event queue
Fixes ready event was run because BYPASS_LAST_SCENE wrongly set


Inverted parameter "disable_automatic_transitions"

for change_scene, hide_menu, show_menu commands
Fix broken sched_event


Fixes as requested in PR
2021-11-11 22:20:58 +01:00
Julian Murgia b908a2aeee Fix: Make float dialog follow character (#430) 2021-11-11 21:28:29 +01:00
Julian Murgia 512eff3874 Wrong link 2021-11-01 15:01:44 +01:00
Julian Murgia e6a140a427 Fix link to roadmap 2021-11-01 15:00:59 +01:00
Julian Murgia 891d997d56 Fix Player walk miscaluculation (#425) 2021-10-27 22:27:03 +02:00
Julian Murgia b7b01c5770 Simplified overcomplex test (#423) 2021-10-26 21:30:20 +02:00
Julian Murgia 9dbcf2b58b Make ESCLocation is_start_location work (#421)
Introducing BYPASS_LAST_ROOM global to allow changing scene without considering the previous room
Fixes godot-escoria/escoria-issues#40
2021-10-26 16:36:02 +02:00
Julian Murgia b3cd9abe21 Fix a wrong validation check in camera_set_limits (#418)
Events interruption should now work at all time (added interruption in room_selector scene)
Fixed missing test in game.gd for when the player is not set
Fixed some ESC scripts (worker filled sheet event is now blocking, room13 left door waits simple click, not use verb)
2021-10-22 09:17:03 +02:00
Julian Murgia 89da6924a3 Clean after change room: game scene is cleanly removed from prev room (#416) 2021-10-19 15:48:26 +02:00
Julian Murgia 4fd1d72993 Fix crashes in rooms 9 and 13 (#415) 2021-10-19 15:48:13 +02:00
Julian Murgia c859cffa33 Move Escoria settings load action out of init (#414)
InputMap actions added/removed at plugin enabled/disabled
Some changes to README
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-10-14 21:56:02 +02:00
Julian MurgiaandStraToN 00de7fcc4d Removed hardcoded "camera" name reference and manual tween node camera (#411)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-10-07 08:22:27 +02:00
Julian MurgiaandStraToN 41902b5791 Adds "name" parameter to ESC spawn command (#410)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-10-07 08:22:11 +02:00
Julian Murgia 378f29283d Move settings load and main menu loading in _init method (#408) 2021-10-01 13:22:40 +02:00
Julian MurgiaandStraToN ae34094196 Enhancement: load game scene once to allow run scene directly (#406)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-10-01 07:53:44 +02:00
Julian Murgia 527fe84d3c Changed dialog cursor (#398)
- some modifications in android exports presets
- commented out jump command in worker.esc as not implemented
2021-09-23 12:39:24 +02:00
Julian Murgia bb93dc1ef3 Fixed escoria.current_state when dialog line finishes (#391)
- Fixed connect() errors concerning the player being ready'd 2 times in certain cases, so trying to connect signals twice
2021-09-10 10:04:11 +02:00
Julian MurgiaandStraToN 0e6e8aa161 Re-implemented turn_to command (#390)
* Re-implemented turn_to command

Fixes #385
Fixed a bug in esc_movable blocking player_orients_on_arrival for ESCLocation nodes

* docs: Automatic update of API docs

* Fixes

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-09-09 22:57:03 +02:00
Julian Murgia ad390a6f65 Fix when no speech key is used and translate speech key if used (#389) 2021-09-09 09:15:56 +02:00
Julian Murgia cb711b329b Fix inverted transitions in/out (#388) 2021-09-09 08:23:03 +02:00
Julian MurgiaandStraToN b4bf5b82d6 Event flags implementation (#382)
* Added event flags
* Added transition ESC command
* Also edited .gitignore to ignore .translation files
* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-09-07 09:13:09 +02:00
Julian MurgiaandStraToN 711cfe9888 Added a method to interrupt a running event in ESCEventManager. (#375)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-27 08:16:12 +02:00
Julian MurgiaandStraToN 2ed184ad4a Refactor ESCMovable._process() (#374)
* Refactor ESCMovable._process()
Fixes #348

* Fixes

* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-26 14:29:35 +02:00
Julian MurgiaandStraToN 3ab3d0945c Refactor ESCMovable._is_angle_in_interval() (#373)
* Refactor ESCMovable._is_angle_in_interval().
Fixes #349

* docs: Automatic update of API docs

* Fixes

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-24 15:59:29 +02:00
Julian MurgiaandStraToN b230966fc6 Moved and split escoria._ev_left_click_on_item() function into ESCController (#371)
* Moved and split escoria._ev_left_click_on_item() function into ESCController.
Added a boolean in ESCWalkContext to hold whether interact should happen after destination is reached.

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-24 08:19:55 +02:00
Julian MurgiaandStraToN fc3ea147a7 Implement save overwrite confirmation (#368)
* Implement save overwrite confirmation + fixed pause game not pausing game execution.

* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-13 09:28:38 +02:00
Julian Murgia a00bbd4d4d Removed hardcoded access to node named "sprite" (#364) 2021-08-10 22:20:30 +02:00
Julian MurgiaandStraToN 61726bca81 :setup action is not managed only once anymore (#358)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-08 23:23:11 +02:00
Julian MurgiaandStraToN cbb64df969 Removed hardcoded global_id "player" (#359)
* Removed hardcoded global_id "player"
Removed hardcoded node name "start_position"

* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-08 12:10:46 +02:00
Julian MurgiaandStraToN c711db5d3c Add set_angle 'immediate' parameter. (#357)
* Add set_angle 'immediate' parameter.
Modified fade_in transition to happen between :setup and :ready so that :ready don't start before fade_in is finished.

* docs: Automatic update of API docs

* Same fixes in style and removed a useless test.

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-08 12:10:20 +02:00
Julian Murgia a0218e2998 Add default behaviors in ESCGame click handlers on BG and items. (#356)
If ESCGame functions concerned by this PR are not overridden in user's game.gd script, the default behavior will be used.
NB: if these function are overridden in user's game.gd script, these default behaviors will not be called (unless explicitly called using parent script call by adding a dot before the function: .left_click_on_bg())
2021-08-04 12:57:42 +02:00
Julian MurgiaandStraToN 51e1cfa92b Some fixes in mark_animations and span command (#355)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-08-04 11:02:48 +02:00
392dc2d607 Add ESCAnimationResource to hold characters animations. (#342)
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
2021-08-03 17:48:55 +02:00
Julian Murgia f2991c30c7 Added sound management in savegames and load games. (#337)
Fixes #300
Fix crash on loading game when the saved position was a float while teleport_pos command needs integers.
Fix pause menu missing in simplemouse-ui, causing a crash when calling pause menu.
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-07-29 14:22:42 +02:00
Julian MurgiaandStraToN 2c8107964c Fix tooltip_node wrong references (#332)
* Created a signal room_ready in ESCMain to notify ESCTooltip that it is ready.
Fixes #302

* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-07-29 07:53:44 +02:00
Julian MurgiaandStraToN 387d20ba92 Fix inputs on player CollisionShape2D node causing a crash (#334)
* Fix inputs on player CollisionShape2D node causing a crash

* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-07-28 15:38:54 +02:00
Julian MurgiaandStraToN 7f8555f6a4 Renamed _hover_stack_pop() to _hover_stack_erase_item() (#331)
* Renamed _hover_stack_pop() to _hover_stack_erase_item(). Fixes #313

* docs: Automatic update of API docs

Co-authored-by: StraToN <StraToN@users.noreply.github.com>
2021-07-28 12:37:28 +02:00
Julian Murgia 43dc217359 Add ESCLocation node (#323)
Fixes #306
2021-07-15 09:42:22 +02:00
Julian Murgia 958c8b441b Fix settings being applied a second time with wrong data (#308) 2021-07-15 09:41:29 +02:00
Julian Murgia f84d1be741 Fix bug when leaving a room after a item was picked up 2021-07-06 12:59:46 +02:00
Julian Murgia 7de969d75e Renamed all room folders to use 2 digits. 2021-07-06 10:25:09 +02:00
Julian Murgia dc4cda82ab Moved UI scenes and resources to their own plugin. 2021-07-05 14:34:44 +02:00
Julian Murgia e0de1de1ce Fix bug in a warning not correctly formatted. 2021-07-05 11:23:00 +02:00
Julian Murgia ccb34e319b Added new ESC command rand_global. 2021-07-05 08:04:36 +02:00
Julian Murgia bd4c33cf77 Implement save and loading games (#8) 2021-07-02 23:08:43 +02:00
Julian Murgia a22805d0e6 Merge pull request #5 from deep-entertainment/hotfix/firstscene
fix: ESC script workaround for compiler rewrite
2021-06-06 14:38:52 +02:00
Julian Murgia b19d421b1e Added authors list into README 2021-06-04 16:22:58 +02:00
Julian Murgia f069ab2ffd Merge branch 'main' of github.com:StraToN/unofficial-escoria-reloaded into main 2021-06-01 07:39:00 +02:00
Julian Murgia 5d1df7aaa9 Add sound volume management and language selection
Not all translated yet though
2021-06-01 07:35:50 +02:00
Julian Murgia a5d0f4d2b1 Merge pull request #1 from deep-entertainment/deep-entertainment-contributions
fix: Added inventory container reference
2021-05-15 18:10:06 +02:00
Julian Murgia 909031f536 Added translations management
Prepares work for line voiceovers management.
2021-04-07 08:39:59 +02:00
Julian Murgia 40dd4a6718 Added bg_sound manager and according ESC command.
Started transitions scene.
2021-04-01 08:15:28 +02:00
Julian Murgia 4acb971d54 Added a default action used when item is in inventory. 2021-03-02 07:39:00 +01:00
Julian Murgia b8f668df0a Fixed a bug where bottle in magical closet room 9 had wrong interaction position. 2021-02-26 21:31:50 +01:00
Julian Murgia f743d1089c Added "label" command.
Continued room9 puzzle (not finished)
2021-02-23 23:10:24 +01:00
Julian Murgia 38f554b496 Implemented tooltip follows mouse (not perfect).
Fixed bug when using mousewheel action on inventory items.
Added a debug mode for tooltip following mouse
2021-02-19 07:53:45 +01:00