Commit Graph

425 Commits

Author SHA1 Message Date
betalars 117886d87f debug-me comitting broken state for debug purposes 2025-04-04 19:27:57 +02:00
betalars f588b56bd1 WIP: adding recovery to cardboard 2025-03-31 21:31:09 +02:00
betalars 2b60cb943c fix spelling mistakes in i18n
(cherry picked from commit 2182df5210)
2025-03-31 13:04:26 +02:00
betalars 004c4ed477 fix spelling mistakes in i18n 2025-03-31 12:59:35 +02:00
betalars 2239627905 prevent intro from being played while draeven text is finished and not skipped to avoid illegal animation state 2025-03-28 18:20:21 +01:00
betalars c4f65843d3 godot weirdness 2025-03-28 18:19:21 +01:00
betalars 175c675ecf Fix wing texture import 2025-03-28 13:42:00 +01:00
betalars 536f2acecc add support for different spoken text and audio 2025-03-28 13:41:18 +01:00
betalars d1252f9afd Fix wing texture import 2025-03-28 13:40:45 +01:00
betalars 387f95de0b fix state management issues with settings 2025-03-25 22:35:01 +01:00
betalars 60be14ec01 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars f5c7d47ad7 fix infinite recursion and focus management issues in video settings 2025-03-24 17:17:25 +01:00
betalars bd59bbff91 prevent issues when ui button is pressed but no label is looked at 2025-03-24 17:13:23 +01:00
betalars 14edb234f3 cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 99241aa414 adding enum to id conversion due to new 4.4 display modes 2025-03-23 15:43:24 +01:00
betalars 2a2a33f177 resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars d74ccf8648 fix #109 enhance card board reliability, workaround free not being available in builds 2025-03-23 14:31:00 +01:00
betalars 6e698acf7e renaming for compatibility reasons 2025-03-23 14:22:40 +01:00
betalars 4421dc6462 version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars 88151f6e22 fix #107: resolve syntax and logical errors in scene reference causing scene completion to not register 2025-03-05 22:58:56 +01:00
betalars 43b605fc88 fix #105: removing incorrect null assignment and resolved warnings raised by empty typed array 2025-03-05 19:41:22 +01:00
betalars 2d7eb8d17e Update skip control event 2025-03-03 17:26:46 +01:00
betalars 43d3f0d81f disable save game script due to unneeded save games being generated everywhere 2025-03-03 17:25:32 +01:00
betalars d53c4c3a2d fix #106: pause menu can be closed via the button 2025-03-03 15:29:52 +01:00
betalars 8bdc9d627c misc small updates 2025-02-24 16:14:53 +01:00
betalars 973c1abbc1 further rework of card handling 2025-02-24 16:14:08 +01:00
betalars e384518df0 commit pause Menu script -.- 2025-02-24 16:12:00 +01:00
betalars 0596c7bbf2 small fixes 2025-02-06 19:15:39 +01:00
betalars c64f18bcc2 rework sequence handling 2025-02-06 18:55:05 +01:00
betalars e08af41eb1 removing many mouse movement bugs 2025-01-31 03:22:07 +01:00
betalars faccf301ff ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars 475b052b71 Adding provisionary showroom-scene for events and trailers and stuff 2025-01-16 14:47:06 +01:00
betalars e8c991617b adding chyperacoustic filtering 2024-10-21 11:39:16 +02:00
betalars 7a538f8a15 renaming main theme 2024-10-18 18:08:54 +02:00
betalars ad90053fe4 add a11y settings and class to main menu 2024-10-18 18:04:50 +02:00
betalars 5cd03001a1 resolve card picking issue 2024-10-18 15:46:19 +02:00
betalars fc9cfd587e Adding language switcher to audio settings 2024-10-18 15:42:53 +02:00
betalars 46bac32b58 updating room structure 2024-10-16 12:29:20 +02:00
betalars 058731eb68 implementing save games 2024-10-16 12:24:38 +02:00
betalars ec9247ba53 WIP: chaning save slot from 3 fixed slots to dynamic system 2024-10-07 11:23:19 +02:00
betalars f7a5565968 WIP: enhancing menu animations and adding predit roles 2024-10-07 11:21:36 +02:00
betalars f83cb50c6c WIP: enhancing setting focus handling 2024-10-07 11:16:18 +02:00
betalars 360ee6a8f1 WIP: adding loading and transition animations to main menu 2024-10-06 11:40:42 +02:00
betalars 46aa31d081 implement room initialising from savegame, enhancing room calling strucutre 2024-10-06 11:38:15 +02:00
betalars a2ddd18c0b misc code cleanup 2024-10-06 11:31:47 +02:00
betalars 1b146913ad add support to initialise and save board state to savegame 2024-10-03 01:12:24 +02:00
betalars 52c83c8aa3 implement loading and saving raw data to save file resource 2024-10-03 01:10:35 +02:00
betalars 9b751dcd5b misc 2024-10-02 01:33:58 +02:00
betalars b755fec655 WIP: main menu overhaul, introducing settings 2024-10-02 01:32:59 +02:00
betalars bf69857ba3 introducing dynamic scene loading, main scene rework 2024-10-02 01:30:03 +02:00
betalars 14f61ed4f0 move audio settings into own panel 2024-09-28 01:49:44 +02:00
betalars 76782397df remove debug prints, set changed to false after saving 2024-09-28 00:34:54 +02:00
betalars 61a385070c adding thunder and video settings 2024-09-27 22:02:28 +02:00
betalars fce01abffe converting more objects to lfs 2024-09-23 10:25:13 +02:00
betalars d07caaa947 Git LFS shenanigans 2024-09-19 13:12:43 +02:00
betalars 1a8843c895 resolving upgrade regressions 2024-09-19 12:29:35 +02:00
betalars 1a73b247f8 macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars 5e946deb6d remove debug print statement 2024-09-16 17:08:22 +02:00
betalars bd996eb2ba misc 2024-09-15 15:50:21 +02:00
betalars af3f2b8d3a Updating of rez files 2024-09-15 12:39:47 +02:00
betalars 9454a20d79 moving on 2024-09-15 11:30:31 +02:00
betalars 295897d82d version bump 2024-09-15 11:15:36 +02:00
betalars 9d19480125 Merge branch 'amaze-hotfixes' of gitlab.com:betalars/frame-of-mind into amaze-hotfixes 2024-02-17 23:33:06 +01:00
betalars e07f18ee0c migrating assets to lfs 2024-02-17 23:32:06 +01:00
betalars e80e45626b minor card interface polishes 2024-02-17 23:31:35 +01:00
betalars 78f37023f8 windows in scene will now properly close after not having been focused, cursor showing up and disappearing when intended has been sorted out. 2024-02-14 02:21:08 +01:00
betalars c54b9026e1 fix typo 2024-02-14 02:18:49 +01:00
betalars c72ee61d19 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars ae12e60c4d improved state handling in card picker, implemented animation skipping 2024-02-12 00:24:13 +01:00
betalars b2498761c0 fixed conditions where invalid state could be reached in card board 2024-02-11 22:36:19 +01:00
betalars e725316c46 tweaking minimum sizes of popups to accomondate theme 2024-02-11 22:33:34 +01:00
betalars a50c82f298 fix: multiple StickyNotes can be attatched to a single scene 2024-02-10 13:35:47 +01:00
betalars b08a94a17c player now reduces motion when reduce motion is turned on 2024-02-06 21:58:46 +01:00
betalars 98caa66ab0 adding automatic theme switching 2024-02-06 21:58:29 +01:00
betalars 5e93303f4d further theme developments (WIP) 2024-02-03 22:00:44 +01:00
betalars 674999522e WIP adding system font theme 2024-02-02 12:05:49 +01:00
betalars 6ffad9d7a7 WIP: theme polishing 2024-02-02 01:03:28 +01:00
betalars dbb914ba22 reducing non text audio volumes 2024-02-01 22:40:39 +01:00
April John 322863e62c update to godot 4.2 2023-12-02 14:27:18 +01:00
April John 507a2cc9d2 sanity check highlight 2023-11-30 18:28:04 +01:00
April John 207e8da82c make button closeable 2023-11-29 18:04:14 +01:00
April John b4e80ecc7d fix: remove a draggable between back and start 2023-11-29 18:04:13 +01:00
betalars 0ae3fa4c93 fixing text not being properly displayed on cards 2023-11-02 12:56:15 +01:00
betalars 3765da91e0 finishing up card refactor 2023-11-01 23:19:47 +01:00
TilCreator 6ec59dfc03 reworking state management in card board WIP 2023-10-15 13:27:02 +02:00
betalars 7d6511a149 wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars 4c1bf12aaa WIP: finish cleaning up function architecture 2023-09-24 12:23:26 +02:00
betalars aba626d3a8 wip card bord refactoring 2023-09-23 16:19:58 +02:00
betalars bd2e569c4b WIP: refactoring card_board 2023-08-30 13:23:37 +02:00
betalars 971897d039 merging adis board updates into development 2023-08-30 12:04:51 +02:00
betalars c6955980b0 Improving card reveal handling 2023-08-30 11:11:55 +02:00
betalars 90578c51e2 wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
betalars 8d132553e2 wip: adding prompt to card picker 2023-08-30 11:05:07 +02:00
Adrian Schmid a756c3ee82 left/right clicking in assignment context returns postits to the panel 2023-08-22 20:06:55 +02:00
Adrian Schmid b82834213a postits are now returned to the panel if the group doesn't match 2023-08-22 20:00:33 +02:00
betalars dc86328859 Merge branch 'adi_dev' into 'development'
polishing cards

See merge request betalars/frame-of-mind!3
2023-08-21 06:47:59 +00:00
betalars 50ead5cb0b adding card game graphics 2023-08-21 08:40:25 +02:00
Adrian Schmid 7cb6b265ec added right click to return post it panels 2023-08-12 13:02:00 +02:00
Adrian Schmid 3d380d7ab1 fixed checks for if post it is attached or if card has post it attached 2023-08-12 12:20:05 +02:00
Adrian Schmid b204452a0c fixed positioning of post it on the card 2023-08-12 12:19:27 +02:00
Adrian Schmid 2f4acff8f5 pressing ui left now works as expected 2023-08-12 11:28:23 +02:00
betalars 381fe9526e resetting music slider in startup 2023-08-06 00:02:17 +02:00
betalars 413d27094d reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars 960bc3304d celaning up error sources 2023-08-01 11:01:52 +02:00
betalars 46689b1445 updating card handling 2023-08-01 10:59:24 +02:00
betalars 819bc13551 adding skipping logic 2023-08-01 10:52:08 +02:00
betalars e2260c52fd preventing focus drops 2023-07-19 22:44:29 +02:00
betalars d59144141c card picker is always picking void card 2023-07-19 22:44:07 +02:00
betalars aa1ed8e368 fix: card board now stores an array, instead of an array of arrays 2023-07-19 22:43:44 +02:00
betalars 4926b1685f finalise menus 2023-07-19 22:41:29 +02:00
betalars 72e1c10185 fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 1f09b872d1 Merge commit '522080d52e14899d1d18e41489f45e86f9a6bf4e' into alpha 2023-07-19 13:55:26 +02:00
betalars 5378dad463 reclaiming focus when scene is repeated 2023-07-19 13:54:36 +02:00
betalars 6b72552049 workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars 6b5d6a8981 implement skipping functionality 2023-07-19 13:51:26 +02:00
betalars e71436ec8d making sure card picker can be reset 2023-07-19 13:50:19 +02:00
betalars 96bf4a3d0c changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
Adrian Schmid 48ed646c51 Added settings for final page (+ some notes on the global state) 2023-07-18 22:02:35 +02:00
Adrian Schmid 91f8cb4c86 added code for audio settings 2023-07-18 21:37:04 +02:00
Adrian Schmid 7124580055 1st page accessibility settings (almost working except for fonts and ui scale) 2023-07-18 21:00:21 +02:00
Adrian Schmid 2f0b70e093 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-18 19:01:41 +02:00
betalars 50651b3438 resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars b6b85c8d51 workaround: when board of devs is initialised with processsing disabled, the void cards gets messed up. 2023-07-18 15:55:28 +02:00
betalars bf62262de1 improving card and post it avoidance handling 2023-07-18 15:54:34 +02:00
betalars 779fe08b38 adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +02:00
betalars 3ca0d98f81 cards and posts will pass mouse events even when they are not draggable 2023-07-18 14:58:06 +02:00
betalars d72404279f fixing up issues with internal state handling and animation referencing 2023-07-18 14:48:28 +02:00
betalars d4b5a40aae adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars 16c8c9ad7d add group sharing to postit 2023-07-18 00:13:33 +02:00
Adrian Schmid 2bc61fc105 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-17 19:00:30 +02:00
Adrian Schmid 4c39faab82 accessibility menu: added function for screenreader toggle 2023-07-17 19:00:17 +02:00
betalars e0dda4be1a imprioving stage complience for player 2023-07-17 14:16:12 +02:00
betalars 29ff7fecf1 card updates 2023-07-17 14:15:40 +02:00
betalars 3bb9405e02 importing luna 2023-07-17 14:09:24 +02:00
betalars e669e3bda3 Merge commit '56ab26d1d6253d2385c47fa914e692124512bf65' 2023-07-16 01:13:13 +02:00
betalars c090c55c3b configuring startin sequence, wip 2023-07-16 00:59:33 +02:00
Adrian Schmid 004a6096d9 add label to display if the board is empty 2023-07-15 16:04:41 +02:00
Adrian Schmid cb10015e9d added quick tween to post its which are attached to cards or returned to the panels 2023-07-15 15:59:22 +02:00
Adrian Schmid cc3f418aa8 post its now float beneath the card they are going to be attached to 2023-07-15 15:26:14 +02:00
betalars de8d645336 Merge branch 'adi_dev' into 'main'
finalising card board for alpha release

See merge request betalars/frame-of-mind!2
2023-07-15 13:06:07 +00:00
Adrian Schmid e026722b8c fix: avoid putting post-its on post-its + prevent putting post-its on card with post-its already attached 2023-07-15 14:25:40 +02:00
Adrian Schmid 4d8101e50c fix: sorting was not applied + context was not switched correctly 2023-07-15 14:09:41 +02:00
betalars 066ed6064e wip: restructuring card board so it can handle being empty 2023-07-15 13:05:47 +02:00
betalars 0fbf83e45b fix: cards don"t push each other when highlited 2023-07-15 13:05:08 +02:00
betalars 8c70da59b8 fix: cards now only avoid each other and card colliders 2023-07-15 11:50:24 +02:00
betalars 19782fb26d limiting view layers for player camera 2023-07-15 11:10:29 +02:00
betalars e45e33b96c integrating card_picker script with room scene 2023-07-15 01:08:42 +02:00
betalars 57dc2b2075 cleaning up collectables scene 2023-07-15 01:07:29 +02:00
Adrian Schmid bd98149eb4 adding borders to keep cards on board 2023-07-14 22:41:32 +02:00
Adrian Schmid b7f273d987 scene update 2023-07-14 22:05:42 +02:00
Adrian Schmid ef64abf7a7 improve detaching post its 2023-07-14 22:03:09 +02:00
Adrian Schmid 1314d351f3 do the same for post-its 2023-07-14 21:36:20 +02:00
Adrian Schmid d8195ec3df improved card handling 2023-07-14 21:20:04 +02:00
Adrian Schmid b2fc23c674 spawning panels by the amount of post its 2023-07-14 21:19:44 +02:00
Adrian Schmid 9edee017fc Revert "adding state handling to post_its"
This reverts commit 7fb7be47a8.
2023-07-14 19:15:15 +02:00
Adrian Schmid c41e646cef Revert "adding stage handling to card"
This reverts commit 1060f7815f.
2023-07-14 19:15:00 +02:00
Adrian Schmid 3416617733 moved bouncy card code to card 2023-07-14 19:13:08 +02:00
Adrian Schmid 88625677f1 Merge branch 'main' into adi_dev 2023-07-14 18:13:35 +02:00
Adrian Schmid a04904e952 meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars 87a9bf3de8 cleaining up player animation and ladder behavior 2023-07-13 20:59:10 +02:00
betalars fce656e07b implementing signaling and staging, wip 2023-07-13 16:16:42 +02:00
betalars 5e8991f86e Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +02:00
betalars 6a511998cf fixme: Updating void card logic 2023-07-12 18:48:18 +02:00
betalars 748bdc9830 fixing void card 2023-07-12 18:47:31 +02:00
betalars d78ab09240 fixme: setting on stage property of board children when stage is set 2023-07-12 10:22:06 +02:00
betalars c58f4c0983 adding state handling to post_its 2023-07-11 23:49:27 +02:00
betalars 268831f79d adding stage handling to card 2023-07-11 23:13:04 +02:00
betalars c5d60035b0 refactor: changing focus naming convention to stage based metaphor 2023-07-11 15:27:44 +02:00
betalars 7103dc14f1 adding focus handling to card board 2023-07-11 15:04:46 +02:00
betalars 63062ca249 physics board cleanup 2023-07-11 15:03:35 +02:00
betalars bfc59fe7b1 disabling mouse filter when not focused 2023-07-11 11:00:47 +02:00
betalars 41a9b0954f cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars 0268b1da2c Updating Room colission, lighting overhaul, tweaking starting perspective 2023-07-10 16:20:37 +02:00
betalars 6ce8da9e78 removing rotations from physics board ... 2023-07-08 22:07:24 +02:00
betalars 66b113c471 start using input instead of unhandled input for player, reducing jitter strength 2023-07-08 22:05:18 +02:00
betalars c25ffb689c updating card picker scene for new cards 2023-07-05 23:34:15 +02:00
betalars 67c49fc957 card picker now hides itself while not having focus 2023-07-05 23:34:15 +02:00
betalars 3440c2f81d card picker will now emit a signal and drop focus when finished 2023-07-05 23:34:15 +02:00
betalars c26266dc15 Merge remote-tracking branch 'origin/new-card-board' 2023-07-03 21:47:38 +02:00
Adrian Schmid 7e757c15bc populate_board() to spawn cards/postits 2023-07-03 20:27:09 +02:00
Adrian Schmid cfd87e0183 keyboard controls for the card board 2023-07-02 15:10:33 +02:00
Adrian Schmid d8b981f1c0 prevent putting multiple post its on one card 2023-07-02 11:50:19 +02:00
Adrian Schmid 052d56175f reset rot./scale after removing post it from card 2023-07-02 11:01:04 +02:00
Adrian Schmid 686f7529dc improved area movement 2023-07-02 10:42:58 +02:00
Adrian Schmid 0c215c882f remove dragableType and replace it with meta-type 2023-07-02 10:19:15 +02:00
Adrian Schmid c1981d11a7 moved dictionary populating to its own function 2023-07-02 10:11:54 +02:00
Adrian Schmid 9cec5719d5 added func to sort dict entries on y pos 2023-07-01 16:59:13 +02:00
Adrian Schmid cd2b4e3663 add logic to attach post-its to cards 2023-07-01 16:03:22 +02:00
Adrian Schmid a9d1bb0db8 added same handling for cards + anchor for postIts 2023-07-01 15:20:50 +02:00
Adrian Schmid 208267827a moved drag handling to board to avoid issues 2023-07-01 15:19:54 +02:00
Adrian Schmid c2f35b4fa7 card-board dictionary + move post-its to dropboard 2023-07-01 13:43:27 +02:00
Adrian Schmid 2d784f5648 set anchor for post-it on card 2023-07-01 13:41:19 +02:00
betalars 468c75e5b5 updating card scenes 2023-07-01 01:45:28 +02:00
betalars e7ae348c13 supressing editor rotation in card script 2023-07-01 01:41:13 +02:00
betalars 8eaff6e331 removing provisionary code 2023-07-01 01:19:40 +02:00
betalars f4860712a4 improving parsing and passing of mouse events 2023-07-01 00:18:40 +02:00
Adrian Schmid 37a97b4ab5 fixed missing collider on cards 2023-07-01 00:18:40 +02:00
Adrian Schmid 4e74ad228f added dragging cards and post its with mouse input 2023-07-01 00:16:38 +02:00
betalars 7a5ee73dd9 adding mouse support for card picker, WIP 2023-07-01 00:15:26 +02:00
betalars 377a541ef3 moving INI set, so it is set before ready 2023-07-01 00:15:26 +02:00