Commit Graph

421 Commits

Author SHA1 Message Date
betalars ce38daf22c lighting improvements 2024-02-10 13:35:04 +01:00
betalars 6dfbfc6726 adding fairy lights 2024-02-10 13:34:34 +01:00
betalars 966f80e1ca adding landshark plushie 2024-02-10 13:33:00 +01:00
betalars 70e17bc6b3 wip: adding landshark 2024-02-09 14:13:40 +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 141f53ec8d adding procedural sky to main scene 2024-02-03 22:00:13 +01:00
betalars 9071801a5e unloading subtitle addon 2024-02-03 21:58:14 +01:00
betalars 7109a8d0e3 Merge commit '98e28cca1cefaedb601c0554b4444a7a723871cd' into amaze-hotfixes 2024-02-02 16:47:11 +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 daafbfad90 res shenanigans 2024-02-01 22:41:00 +01:00
betalars dbb914ba22 reducing non text audio volumes 2024-02-01 22:40:39 +01:00
betalars e0c2a49013 sky prototyping 2023-12-03 16:07:08 +01:00
betalars 0dc8899b9a Merge commit 'a2e2e56afc636b2d38a6bd8378f85f32f8e00498' into raeven 2023-12-03 16:05:06 +01:00
April John 9856dade55 [feat] debug youth room 2023-12-02 17:37:49 +01:00
betalars 01c9e633f7 Merge branch 'development' of gitlab.com:betalars/frame-of-mind into development 2023-12-02 17:04:35 +01:00
betalars fc9c71fb9b improving star texture 2023-12-02 17:04:31 +01:00
April John c6fa5932d8 [fix] crash on comic stash 2023-12-02 16:19:14 +01:00
April John 322863e62c update to godot 4.2 2023-12-02 14:27:18 +01:00
betalars 2a4da9da9c initialising branch 2023-12-02 14:13:50 +01:00
April John 3e07a9fd25 [fix] change invisible walls prevent crashes 2023-12-02 14:12:09 +01:00
April John 507a2cc9d2 sanity check highlight 2023-11-30 18:28:04 +01:00
April John ab040dfbae change back from fullscreen to windowed 2023-11-29 18:04:14 +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
April John cbff18e39e Change default window height 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 c808773ea5 fixing missing window frames 2023-11-02 12:55:39 +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 8cd3e1c9a1 misc polish 2023-08-30 11:12:47 +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
betalars 16e52e5ad9 adding realistic window resource 2023-08-30 11:03:56 +02:00
betalars 0c1d64d6f6 updating void card in dev board 2023-08-30 11:03:01 +02:00
betalars a0ae6397f7 reverting version downgrade 2023-08-30 11:01:55 +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
Adrian Schmid 7e99c3e87a moved version back up to 4.1 (sorry Lars) 2023-08-22 19:16:20 +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 8cbf5c7f17 creating outside environemnt 2023-08-06 00:03:26 +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 13c003f9dc export version bump 2023-08-01 10:59:46 +02:00
betalars 46689b1445 updating card handling 2023-08-01 10:59:24 +02:00
betalars 3937816011 fixing missing groups 2023-08-01 10:56:48 +02:00
betalars 819bc13551 adding skipping logic 2023-08-01 10:52:08 +02:00
betalars 1a17114735 updating disclaimer and thank you note 2023-08-01 10:50:24 +02:00
betalars ed4fdf6348 fixing up handling of locked focus in global state 2023-08-01 10:49:42 +02:00
betalars 0ff855377b adding splash screen 2023-08-01 10:48:52 +02:00
betalars 0896d6be6d the least specacular version bumpo of all times 2023-07-19 22:45:57 +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 3376292691 adding provisionary init function, wip 2023-07-19 22:43:00 +02:00
betalars e09b79ec69 finalise cards 2023-07-19 22:42:05 +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 f1d1c8903c final youth room changes 2023-07-19 13:55:04 +02:00
betalars 5378dad463 reclaiming focus when scene is repeated 2023-07-19 13:54:36 +02:00
betalars 55b33b4ec7 resolving some remaining group assignments 2023-07-19 13:53:24 +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 addcc09021 adding bilboard toggle 2023-07-19 13:49:48 +02:00
betalars 6a84e424b0 finalising disclaimers and thank you 2023-07-19 13:49:09 +02:00
betalars 96bf4a3d0c changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
betalars 167133655a re-doing lost goup assignments 2023-07-18 23:25:27 +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 91c2d4ff62 some notes for me + debug function for printing settings 2023-07-18 20:59:00 +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 550a4788e1 global state will quit game when the last focus is dropped 2023-07-18 15:55:54 +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 73bba274fa fix missing group assignment 2023-07-18 15:52:24 +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 713211743a cleaning up scenes 2023-07-18 14:47:59 +02:00
betalars ff0685fdb8 Merge branch 'main' of gitlab.com:betalars/frame-of-mind 2023-07-18 11:34:33 +02:00
betalars 30034ba63e weird texture diff 2023-07-18 11:34:29 +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
betalars 3754cfd786 finalising board of devs 2023-07-18 00:13:17 +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 16c264d8f2 updating audio, importing draeven scene 2023-07-17 14:14:54 +02:00
betalars a7d4e4111a converting wall material to shader 2023-07-17 14:11:05 +02:00
betalars a2f8b4d12d tweaking lava lamp 2023-07-17 14:10:23 +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 c9b2f017dd res update? 2023-07-16 00:59:56 +02:00
betalars c090c55c3b configuring startin sequence, wip 2023-07-16 00:59:33 +02:00
betalars 5d3f644424 scene update 2023-07-16 00:58:54 +02:00
betalars d5d7675ea7 adding thank you and disclaimer screen 2023-07-16 00:58:29 +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 2cdcd0e9f8 firther room integration 2023-07-15 01:11:34 +02:00
betalars d6ffef1542 improving billboard function of collectables 2023-07-15 01:09: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 2209571982 new variables for global state 2023-07-14 18:12:17 +02:00
Adrian Schmid a04904e952 meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars 0b3e13cef2 it is just too hot 2023-07-14 15:37:38 +02:00
betalars 98d491b1cd creating a default bug report template 2023-07-14 15:29:53 +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 bc69c1884b typo 2023-07-13 16:14:53 +02:00
betalars 6752f63f9e stage management updates 2023-07-13 16:14:40 +02:00
betalars 7462247587 shader tweaking 2023-07-13 16:11:44 +02:00
betalars 5e8991f86e Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +02:00
betalars 8930acdcc9 adding jui jitsu scene to room 2023-07-12 18:48:51 +02:00