Commit Graph

446 Commits

Author SHA1 Message Date
0d38a8646a Updated escoria-demo-game 2023-06-06 19:28:49 +02:00
cdaba3a055 Fullscreen in optionsgit pull 2023-03-09 00:28:33 +01:00
0380acc353 RESTORED ORIGINAL addons/escoria-core/game/escoria.gd 2023-03-07 23:41:30 +01:00
50ad55ce14 MODIFIED escoria.gdgit add . Action manager extended to apply needed changes for monkey UI 2023-03-07 00:29:46 +01:00
b4c2806cce Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main 2023-02-24 18:22:04 +01:00
caa8b348bf CHANGES TO CORE: comments on action_manager 2023-02-19 23:18:10 +01:00
143086c4f3 UNDO CHANGES IN escoria-core 2023-02-13 18:20:52 +01:00
761cb7fcb8 MODIFIED addons/escoria-core/game/core-scripts/esc_game.gd
Created tooltip2_target
2023-02-13 13:40:53 +01:00
91faea0a6e CHANGE TO escoria-core. Added ESCItem.tooltip2_name 2023-02-10 20:08:10 +01:00
8c1e59a40c CHANGE TO escoria-core. action1 and action2 in tooltip 2023-02-10 20:01:48 +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
c5a1583220 file & folder cleanup 2023-02-07 23:10:49 +01:00
Duncan Brown
0ba6c3782a fix: forces current_state updates as options don't always yield 2023-01-26 17:25:46 -05:00
Balloonpopper
c597414659 fix: Fix bug where inventory is invisible by default 2023-01-26 16:39:18 -05:00
balloonpopper
29c38e7e30 Update addons/escoria-core/game/core-scripts/esc_item.gd
Co-authored-by: Julian Murgia <the.straton@gmail.com>
2023-01-19 15:09:55 +01:00
Balloonpopper
1709a25452 fix: Debug message for when an item has no ESCLocation 2023-01-19 15:09:55 +01:00
Duncan Brown
327b72f67b fix: uses proper casting and updates validation checks 2023-01-19 14:34:37 +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
68220ced91 fix: ensures proper number of interpolation placeholders 2023-01-10 16:46:43 +01:00
balloonpopper
da4dd67157 Merge pull request #663 from godot-escoria/turn_to_fix
Fix: wrong argument passed in turn_to error message
2023-01-10 14:49:11 +11:00
Balloonpopper
dc4b6c24fe feat: Wizard - set up combine when selected for inventory items 2023-01-10 13:20:21 +11:00
Balloonpopper
cc0a067b18 fix: Enabled playing of animated sprite by default 2023-01-10 13:20:21 +11:00
Balloonpopper
b0c0c5d61b fix: Wizard - NPCs have to be ESCItems instead of ESCPlayers 2023-01-10 13:20:21 +11:00
Balloonpopper
0610449dbf fix: Populate default animation as the object manager expects it 2023-01-10 13:20:21 +11:00
Balloonpopper
b47e65345f fix: Character creator - add tooltip, fix 8 dir angles, and make character selectable by default 2023-01-10 13:20:21 +11:00
Balloonpopper
6692953385 fix: Remove call to stop dialog to correct player mirroring 2023-01-09 21:20:16 +01:00
Balloonpopper
5f78c026da fix: Corrected error message for angle in esc_movable 2023-01-09 21:02:13 +01:00
Balloonpopper
0ea7b285b7 fix: Movable commands on non-movable items will be handled gracefully. 2022-12-29 23:47:08 +01:00
Balloonpopper
4e146ae78c Fix: wrong argument passed in turn_to error message 2022-12-29 12:37:04 +11:00
Balloonpopper
82ebdc2d6e fix: Correct error message for missing animation player 2022-12-28 13:09:34 -05:00
Duncan Brown
3727f82fbf fix: allows for string joining that's compatible with pre-3.5 Godot 2022-12-28 18:35:45 +01:00
Duncan Brown
6842ed48ea fix: necessary in order to prevent error message from printing out 2022-12-28 00:10:59 -05:00
Duncan Brown
7f1add6505 fix: missing this check to see if the item needs to be combined with something or not 2022-12-28 00:04:16 -05:00
Duncan Brown
b827092176 fix: clears tooltip when event is finished 2022-12-28 00:04:16 -05:00
Balloonpopper
4604e00648 fix: Fix p_child is null exit on quit 2022-12-27 23:56:08 +01:00
Balloonpopper
2a55da5067 feat: Add thinking avatar scene for Mark 2022-12-15 17:14:40 -05:00
Duncan Brown
2db581861a fix: changes the registering of items already in a room from ERROR to WARN. 2022-12-15 17:14:40 -05:00
StraToN
ac3a52b6ee chore: storing version and changelog 2022-12-09 09:43:34 +00:00
Duncan Brown
9398ce96c3 fix: restores state on returning; for some reason, previously state was modified but never restored. 2022-12-09 10:43:15 +01:00
Duncan Brown
328e5efdd9 fix: returns an appropriate RC code when no more options are left at a particular dialog level; this has the somewhat beneficial side effect of moving up a level in dialog if there is one, although this requires a 'stop' command to be present in at least one of the top-most dialog options. 2022-12-09 10:43:15 +01:00
StraToN
9b27bc4b24 chore: storing version and changelog 2022-12-09 09:41:33 +00:00
Duncan Brown
0ff35136ba fix: disallows dialog blocks that aren't properly indented; however, this also changes how dialog options are parsed and will require substantial testing. 2022-12-09 10:41:11 +01:00
StraToN
8cd61cdd2b chore: storing version and changelog 2022-12-04 17:36:23 +00:00
Balloonpopper
f12d78ba51 feat: Added 1 and 2 direction animations to wizard character creator 2022-12-04 18:36:14 +01:00
Duncan Brown
13a600598f feat: adds option to sync talking animation finishing with either audio or text; if with text, now finishes when text is done rendering. 2022-12-04 18:36:00 +01:00
Duncan Brown
f64b59621d feat: adds warnings w/ defaults when using settings; uses same calculation basis for text speeds/times; changes time units to ms 2022-12-04 18:36:00 +01:00
Duncan Brown
e4414141cb fix: prevents illegal WPM values and uses default in those cases. 2022-12-04 18:36:00 +01:00
Duncan Brown
d676e50284 feat: adds additional options to dialog manager, including a left-click action option and a text skipping option 2022-12-04 18:36:00 +01:00
Duncan Brown
d955e2ef1b chore: speech stops immediately when skipping/interrupting 2022-12-04 18:36:00 +01:00