Commit Graph

81 Commits

Author SHA1 Message Date
eb6cd6ca54 Deleted escoria-ui-2verbs. escoria-ui-return-monkey-island is the new UI. 2023-02-10 13:04:18 +01:00
ba46a80728 Cloned escoria-ui-9-verbs to escoria-ui-2verbs 2023-02-08 14:40:56 +01:00
eb3399736d Moved escoria-ui-return-monkey-island to gymkhana 2023-02-08 13:41:08 +01:00
db2fd69441 Cloned escoria-ui-simplemouse as escoria-ui-return-monkey-island 2023-02-08 13:37:09 +01:00
e95f081cff go 2023-02-07 23:18:45 +01:00
c5a1583220 file & folder cleanup 2023-02-07 23:10:49 +01:00
38f16ea991 Renamed project 2023-02-07 16:46:11 +01:00
4371d1d386 cambios 2023-02-07 16:21:22 +01:00
balloonpopper
53c900b36e Simplemouse fixes (#669)
* fix: Simplemouse bounding box size fix
* fix: Bug when exiting game with simplemouse with disconnecting non-connected gamepad
* fix: issue-339. Simplemouse gives an error in the debug when you move on/off ESCItems
* fix: tracks mouse position to allow for mouse tracking as well as on-demand tooltip updates on immediate target change, i.e. rendering doesn't lag a frame behind.
* chore: decouple further by using a signal
* fix: Correct action getting randomly lost with simplemouse
* fix: deleted objects aren't always equated to null.
* fix: clear the tooltip when an action is finished.
* fix: clears tooltip only on successful event completion; debug code cleanup.
* Broken room 5
* fix: Item collisions correctly determined when game resolution = screen resolution
* Update addons/escoria-core/game/core-scripts/esc_item.gd
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
* Update addons/escoria-ui-simplemouse/game.gd
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
* fix: Reverted default UI to 9 verbs
Co-authored-by: Balloonpopper <balloonpopper@git.com>
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
2023-01-12 22:38:06 +11:00
Duncan Brown
b827092176 fix: clears tooltip when event is finished 2022-12-28 00:04:16 -05:00
Duncan Brown
bd2f28214b feat: allows for the skipping of dialogue after the text is fully visible; still need to look at integrating with user options 2022-12-04 18:36:00 +01:00
Julian Murgia
a131efcfc2 Fix when ESCPlayer is not selectable or interactive manage click through 2022-11-21 20:40:04 +01:00
Duncan Brown
a3da01e4cc feat: adds adjustable reading speed/display time 2022-11-13 16:38:45 +01:00
Balloonpopper
c660e2d51c Correct bug with 2nd loaded image in item creator showing at the wrong size 2022-10-25 00:00:34 +02:00
Duncan Brown
895700870d feat: allows for default/fallback actions to be specified 2022-09-13 19:27:03 -04:00
Julian Murgia
238b1d28f1 Fix call to interrupt method after acfb3d9ddd 2022-09-01 14:47:53 -04:00
balloonpopper
c9e785142f chore: renames items_autoregister_path to inventory_items_path (#620)
Co-authored-by: Balloonpopper <balloonpopper@git.com>
2022-08-09 08:11:36 +02:00
Duncan Brown
c4afb59121 fix: puts a default avatar path back as it had gone missing for some reason 2022-07-18 19:29:22 -04:00
balloonpopper
73891443ad Issue 272 - fixes buttons in room 11 and Escoria icon being wrong (#612)
Co-authored-by: Balloonpopper <balloonpopper@git.com>
2022-07-18 21:32:27 +02:00
Julian Murgia
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
Duncan Brown
6d98e7bdce fix: should now also prevent areas from spawning events; also removes a superfluous variable 2022-04-08 21:18:57 +02:00
Duncan Brown
114ef2fc55 wip: rough attempt at properly incorporating existing coroutines to correctly place room swapping. 2022-04-08 21:18:57 +02:00
Michael Bolin
a3c8fe882e fix: eliminate escoria/esc/command_paths that duplicates escoria/main/command_directories
It appears that the settings `escoria/esc/command_paths` and
`escoria/main/command_directories` have duplicate purposes.
Unfortunately, they are read in different places, so if you add a
directory to one setting, it will not be present in the other.
Specifically, `ESCCompiler` read from `escoria/esc/command_paths`
while `ESCCommand` and `ESCCommandRegistry` read from
`escoria/main/command_directories`.

As the `COMMAND_PATHS` constant had no references, it seemed more
appropriate to delete.

The `escoria/esc/command_paths` appears to have been set initially in
`project.godot` as part of:

https://github.com/godot-escoria/escoria-demo-game/pull/467
2022-03-23 13:05:09 +01:00
Duncan Brown
99dc1e0110 feat: refactor numerous areas and tokenize string literals where possible; also fixes some small bugs (#487)
Co-authored-by: Duncan Brown <duncan@bhs-consultants.com>
2022-02-04 17:10:40 +01:00
Julian Murgia
2179b803e0 Implement custom data save in settings and savegames (#484) 2022-01-13 11:09:06 +01:00
Duncan Brown
391bf08f21 feat: add esc_current_scene reserved global (#474)
Co-authored-by: Duncan Brown <duncan@bhs-consultants.com>
2021-12-03 08:45:02 +01:00
Dennis Ploeger
b5d5217aa4 feat: Support for Escoria and Game migrations (#473)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-12-01 15:00:19 +01:00
Dennis Ploeger
47fe4df841 feat: Several fixes and optimizations (#467)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-27 20:10:16 +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
Dennis Ploeger
f4c5803646 fix: Safety guard for characters without speaking animations (#457)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-22 15:09:37 +01:00
Dennis Ploeger
e14373b179 feat: New streamlined exit item (#455)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-22 13:08:10 +01:00
Dennis Ploeger
9adc7bbade feat: This introduces background events queue in Escoria (#444)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-22 11:04:35 +01:00
Dennis Ploeger
c2bbefedd3 Issue 58 (#453)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-21 22:18:15 +01:00
Dennis Ploeger
012d978d66 fix: Optimized ESC command docs (#450)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: Duncan Brown <duncan@bhs-consultants.com>
2021-11-21 21:10:56 +01:00
Dennis Ploeger
dbc7415aaf fix: Say command fixes (#452)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-21 21:10:22 +01:00
Dennis Ploeger
c9a6f802c7 feat: Optimizes animation commands (#446)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-18 20:01:03 +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
Dennis Ploeger
15b3e30e28 feat: Optimized ESCCamera (#434)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-12 16:55:26 +01:00
Dennis Ploeger
1823845141 Makes ESCDialog and ESCDialogOption instantiable without an ESC string
and other dialog optimizations
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-11-11 22:55:35 +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
Dennis Ploeger
57ce7fbcae feat: Made dialogs pluggable (#424)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-10-27 08:34:13 +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
Dennis Ploeger
94d86d24d5 fix: Huge cleanup (#420)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-10-25 08:59:07 +02:00
Dennis Ploeger
af26521d3d feat: Rewrote inventory handling basing on ESCItems (#417)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
2021-10-21 21:56:25 +02:00
Julian Murgia
4fd1d72993 Fix crashes in rooms 9 and 13 (#415) 2021-10-19 15:48:13 +02:00
Julian Murgia
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
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
Dennis Ploeger
df78b52b8a feat: This enables user-defined transition and uses a tween to animate the transitions (#405)
* feat: This enables user-defined transition and uses a tween to animate the transitions

fixes #344

* docs: Automatic update of API docs

* docs: Automatic update of API docs

Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
2021-09-28 11:30:40 +02:00
Dennis Ploeger
60ea4d851b Issue 320 (#396) - Mobile fixes
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
2021-09-23 08:32:08 +02:00
Julian Murgia
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