Commit Graph

356 Commits

Author SHA1 Message Date
betalars 89f44e2f3f Merge commit 'a2e2e56afc636b2d38a6bd8378f85f32f8e00498' into raeven 2023-12-03 16:05:06 +01:00
April John a2e2e56afc [feat] debug youth room 2023-12-02 17:37:49 +01:00
betalars 7b3b71c8ae Merge branch 'development' of gitlab.com:betalars/frame-of-mind into development 2023-12-02 17:04:35 +01:00
betalars 87ed3c8572 improving star texture 2023-12-02 17:04:31 +01:00
April John a04d27b546 [fix] crash on comic stash 2023-12-02 16:19:14 +01:00
April John 8e2bec20fc update to godot 4.2 2023-12-02 14:27:18 +01:00
betalars bd0aed9b58 initialising branch 2023-12-02 14:13:50 +01:00
April John 2e36db1d68 [fix] change invisible walls prevent crashes 2023-12-02 14:12:09 +01:00
April John d35e789d8e sanity check highlight 2023-11-30 18:28:04 +01:00
April John 321e4cd0e9 change back from fullscreen to windowed 2023-11-29 18:04:14 +01:00
April John dc7962a45d make button closeable 2023-11-29 18:04:14 +01:00
April John c561e855e1 fix: remove a draggable between back and start 2023-11-29 18:04:13 +01:00
April John c5feb97ab5 Change default window height 2023-11-29 18:04:13 +01:00
betalars 7891dc25e9 fixing text not being properly displayed on cards 2023-11-02 12:56:15 +01:00
betalars 17516068df fixing missing window frames 2023-11-02 12:55:39 +01:00
betalars c5f0774b3a finishing up card refactor 2023-11-01 23:19:47 +01:00
TilCreator cf37714035 reworking state management in card board WIP 2023-10-15 13:27:02 +02:00
betalars 0b8ed363ee wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars a2c5217fbf WIP: finish cleaning up function architecture 2023-09-24 12:23:26 +02:00
betalars f91bab668d wip card bord refactoring 2023-09-23 16:19:58 +02:00
betalars 5f1322fe93 WIP: refactoring card_board 2023-08-30 13:23:37 +02:00
betalars a1e186c2c6 merging adis board updates into development 2023-08-30 12:04:51 +02:00
betalars f236a764a6 misc polish 2023-08-30 11:12:47 +02:00
betalars f314c1c1ca Improving card reveal handling 2023-08-30 11:11:55 +02:00
betalars 6824a75e29 wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
betalars f962cdfe7a wip: adding prompt to card picker 2023-08-30 11:05:07 +02:00
betalars 11570409b5 adding realistic window resource 2023-08-30 11:03:56 +02:00
betalars 3be04043ab updating void card in dev board 2023-08-30 11:03:01 +02:00
betalars 74bd049ded reverting version downgrade 2023-08-30 11:01:55 +02:00
Adrian Schmid 12c51f842b left/right clicking in assignment context returns postits to the panel 2023-08-22 20:06:55 +02:00
Adrian Schmid 72efb61d28 postits are now returned to the panel if the group doesn't match 2023-08-22 20:00:33 +02:00
Adrian Schmid 956f2ea3bd moved version back up to 4.1 (sorry Lars) 2023-08-22 19:16:20 +02:00
betalars 80d11da2b7 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 247f5a99f7 adding card game graphics 2023-08-21 08:40:25 +02:00
Adrian Schmid 3640f29170 added right click to return post it panels 2023-08-12 13:02:00 +02:00
Adrian Schmid 5c487f55df 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 d99b9edfdf fixed positioning of post it on the card 2023-08-12 12:19:27 +02:00
Adrian Schmid 64e479b1a5 pressing ui left now works as expected 2023-08-12 11:28:23 +02:00
betalars 246e7f9fab creating outside environemnt 2023-08-06 00:03:26 +02:00
betalars 9e4e3a21f3 resetting music slider in startup 2023-08-06 00:02:17 +02:00
betalars 8d22485bdf reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars 68cc589bff celaning up error sources 2023-08-01 11:01:52 +02:00
betalars 0b3418236c export version bump 2023-08-01 10:59:46 +02:00
betalars a96e5630c8 updating card handling 2023-08-01 10:59:24 +02:00
betalars 7546367370 fixing missing groups 2023-08-01 10:56:48 +02:00
betalars a93e134c26 adding skipping logic 2023-08-01 10:52:08 +02:00
betalars 008279fa83 updating disclaimer and thank you note 2023-08-01 10:50:24 +02:00
betalars 7434426af6 fixing up handling of locked focus in global state 2023-08-01 10:49:42 +02:00
betalars ee9ab8bc68 adding splash screen 2023-08-01 10:48:52 +02:00
betalars 018aa776a0 the least specacular version bumpo of all times 2023-07-19 22:45:57 +02:00
betalars 4bcc1b7da5 preventing focus drops 2023-07-19 22:44:29 +02:00
betalars 111b39c5c3 card picker is always picking void card 2023-07-19 22:44:07 +02:00
betalars e3e98a05f2 fix: card board now stores an array, instead of an array of arrays 2023-07-19 22:43:44 +02:00
betalars 221fc5e9af adding provisionary init function, wip 2023-07-19 22:43:00 +02:00
betalars 61b1210d73 finalise cards 2023-07-19 22:42:05 +02:00
betalars 6807613fb9 finalise menus 2023-07-19 22:41:29 +02:00
betalars cddc0424b6 fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 0b60ce6eba Merge commit '522080d52e14899d1d18e41489f45e86f9a6bf4e' into alpha 2023-07-19 13:55:26 +02:00
betalars 5e751d7fe6 final youth room changes 2023-07-19 13:55:04 +02:00
betalars b44ccd84ef reclaiming focus when scene is repeated 2023-07-19 13:54:36 +02:00
betalars 1ceba08180 resolving some remaining group assignments 2023-07-19 13:53:24 +02:00
betalars 6b5c758e7f workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars 1c6e752237 implement skipping functionality 2023-07-19 13:51:26 +02:00
betalars 3423505322 making sure card picker can be reset 2023-07-19 13:50:19 +02:00
betalars b063842695 adding bilboard toggle 2023-07-19 13:49:48 +02:00
betalars 5a6bb1ee3a finalising disclaimers and thank you 2023-07-19 13:49:09 +02:00
betalars 4d51a21876 changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
betalars 71a22dccef re-doing lost goup assignments 2023-07-18 23:25:27 +02:00
Adrian Schmid 522080d52e Added settings for final page (+ some notes on the global state) 2023-07-18 22:02:35 +02:00
Adrian Schmid 5f8a7d5fdb added code for audio settings 2023-07-18 21:37:04 +02:00
Adrian Schmid 81dc810056 1st page accessibility settings (almost working except for fonts and ui scale) 2023-07-18 21:00:21 +02:00
Adrian Schmid 0d64f4adf6 some notes for me + debug function for printing settings 2023-07-18 20:59:00 +02:00
Adrian Schmid 8be2560943 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-18 19:01:41 +02:00
betalars 2ae99f087b resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars 6f8ceeed25 global state will quit game when the last focus is dropped 2023-07-18 15:55:54 +02:00
betalars 14e310c8eb 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 12226e04f3 improving card and post it avoidance handling 2023-07-18 15:54:34 +02:00
betalars a99433c73c adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +02:00
betalars ced806fa97 fix missing group assignment 2023-07-18 15:52:24 +02:00
betalars 9b632bdf8e cards and posts will pass mouse events even when they are not draggable 2023-07-18 14:58:06 +02:00
betalars f507b9b890 fixing up issues with internal state handling and animation referencing 2023-07-18 14:48:28 +02:00
betalars bc38a177d5 cleaning up scenes 2023-07-18 14:47:59 +02:00
betalars b91153d759 Merge branch 'main' of gitlab.com:betalars/frame-of-mind 2023-07-18 11:34:33 +02:00
betalars 15fea8330d weird texture diff 2023-07-18 11:34:29 +02:00
betalars ccccf040d9 adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars 705274b23d add group sharing to postit 2023-07-18 00:13:33 +02:00
betalars 5e02817f7d finalising board of devs 2023-07-18 00:13:17 +02:00
Adrian Schmid acf7e29c20 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-17 19:00:30 +02:00
Adrian Schmid 28f0a04995 accessibility menu: added function for screenreader toggle 2023-07-17 19:00:17 +02:00
betalars 09fa3f65bc imprioving stage complience for player 2023-07-17 14:16:12 +02:00
betalars 3a295c3887 card updates 2023-07-17 14:15:40 +02:00
betalars bd5a955a7f updating audio, importing draeven scene 2023-07-17 14:14:54 +02:00
betalars be7d63f6e0 converting wall material to shader 2023-07-17 14:11:05 +02:00
betalars 89a1b555a5 tweaking lava lamp 2023-07-17 14:10:23 +02:00
betalars 6c13faac96 importing luna 2023-07-17 14:09:24 +02:00
betalars 47e4fe4a92 Merge commit '56ab26d1d6253d2385c47fa914e692124512bf65' 2023-07-16 01:13:13 +02:00
betalars 34346d482f res update? 2023-07-16 00:59:56 +02:00
betalars 6e7eb9bcc5 configuring startin sequence, wip 2023-07-16 00:59:33 +02:00
betalars 25bb0091d9 scene update 2023-07-16 00:58:54 +02:00
betalars b5924fdd8b adding thank you and disclaimer screen 2023-07-16 00:58:29 +02:00