Commit Graph

460 Commits

Author SHA1 Message Date
betalars a0c7b92585 tab space conversion 2024-10-02 01:31:33 +02:00
betalars 9bc4e03621 introducing dynamic scene loading, main scene rework 2024-10-02 01:30:03 +02:00
betalars 96f07a4943 WIP: specifying save file variables 2024-10-02 01:26:54 +02:00
betalars 078413d767 i18n progress 2024-10-02 01:26:10 +02:00
betalars 9add15a8ed move audio settings into own panel 2024-09-28 01:49:44 +02:00
betalars e33134cc9b remove debug prints, set changed to false after saving 2024-09-28 00:34:54 +02:00
betalars e9b332ae3b adding thunder and video settings 2024-09-27 22:02:28 +02:00
betalars 906498ddc6 making main menu dedicated scene 2024-09-27 22:00:19 +02:00
betalars 78c39e83c1 converting more objects to lfs 2024-09-23 10:25:13 +02:00
betalars 036c865f15 properly configuring macos export 2024-09-23 10:23:52 +02:00
betalars 0bbb5ad40b rephrasing texts to better reflect state of the project, adding steam app ID 2024-09-19 12:32:47 +02:00
betalars 711e090bf8 enhancing material naming convention and texture references for youth room 2024-09-19 12:31:49 +02:00
betalars 382dd26fe2 resolving upgrade regressions 2024-09-19 12:29:35 +02:00
betalars 78e88d85a7 updating export configuration 2024-09-19 12:27:27 +02:00
betalars b3d44a0216 macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars a1df171db3 updating graphical assets 2024-09-19 12:19:55 +02:00
betalars 47a3a8932d remove debug print statement 2024-09-16 17:08:22 +02:00
betalars d89c44bf9a i18n update 2024-09-16 17:07:00 +02:00
betalars 0a54ea72b1 updating font import files 2024-09-16 17:05:32 +02:00
betalars 61992889cd resolve errors due to missing tool declaration in global state 2024-09-16 17:04:44 +02:00
betalars 5c8f6f12a0 WIP material reference updates to youch_room 2024-09-16 17:02:35 +02:00
betalars 41919de13d more misc 2024-09-15 15:54:02 +02:00
betalars 9012395b91 misc 2024-09-15 15:50:21 +02:00
betalars cfa08535f5 Updating of rez files 2024-09-15 12:39:47 +02:00
betalars 4f4c36e781 moving on 2024-09-15 11:30:31 +02:00
betalars b7fab4afed WIP: adding internationalisation 2024-09-15 11:20:06 +02:00
betalars d013802853 version bump 2024-09-15 11:15:36 +02:00
betalars e86acf9063 material import, lighting tests 2024-02-19 00:23:41 +01:00
betalars ed97c86e3e WIP: importing assets for volunteer room 2024-02-18 02:03:42 +01:00
betalars 905bfbf7ac Merge branch 'amaze-hotfixes' of gitlab.com:betalars/frame-of-mind into amaze-hotfixes 2024-02-17 23:33:06 +01:00
betalars 6f93715b03 minor card interface polishes 2024-02-17 23:31:35 +01:00
betalars 3aaf426492 room polishes 2024-02-17 23:27:30 +01:00
betalars 5240786900 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 d71ee48b33 fix typo 2024-02-14 02:18:49 +01:00
betalars c76f4ecca3 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars 95f197b3b6 fixme: disabling player upon load to prevent illegal state in main menu 2024-02-12 01:16:22 +01:00
betalars a2a299f9fa improved state handling in card picker, implemented animation skipping 2024-02-12 00:24:13 +01:00
betalars 4c1a027371 fixed conditions where invalid state could be reached in card board 2024-02-11 22:36:19 +01:00
betalars 43a2a2a441 testing animation behaviours 2024-02-11 22:34:34 +01:00
betalars 6d0f7df80d tweaking minimum sizes of popups to accomondate theme 2024-02-11 22:33:34 +01:00
betalars 6f49f81eb5 fix: multiple StickyNotes can be attatched to a single scene 2024-02-10 13:35:47 +01:00
betalars 2522c90eef lighting improvements 2024-02-10 13:35:04 +01:00
betalars 09451a8d74 adding fairy lights 2024-02-10 13:34:34 +01:00
betalars 716b3cf1fb adding landshark plushie 2024-02-10 13:33:00 +01:00
betalars ba5b3c3a63 wip: adding landshark 2024-02-09 14:13:40 +01:00
betalars 8f82fb0b5e player now reduces motion when reduce motion is turned on 2024-02-06 21:58:46 +01:00
betalars f24ce5357c adding automatic theme switching 2024-02-06 21:58:29 +01:00
betalars 3ee2fe9944 further theme developments (WIP) 2024-02-03 22:00:44 +01:00
betalars 41b934f194 adding procedural sky to main scene 2024-02-03 22:00:13 +01:00
betalars 71e26a0c95 unloading subtitle addon 2024-02-03 21:58:14 +01:00
betalars 5c5c4f12ad Merge commit '98e28cca1cefaedb601c0554b4444a7a723871cd' into amaze-hotfixes 2024-02-02 16:47:11 +01:00
betalars dccf4dc6c4 WIP adding system font theme 2024-02-02 12:05:49 +01:00
betalars b490aa6144 WIP: theme polishing 2024-02-02 01:03:28 +01:00
betalars 52fb7507cf res shenanigans 2024-02-01 22:41:00 +01:00
betalars def2f3d4b2 reducing non text audio volumes 2024-02-01 22:40:39 +01:00
betalars c06c1e115c sky prototyping 2023-12-03 16:07:08 +01:00
betalars ed9de82f63 Merge commit 'a2e2e56afc636b2d38a6bd8378f85f32f8e00498' into raeven 2023-12-03 16:05:06 +01:00
April John 71cb6e74d8 [feat] debug youth room 2023-12-02 17:37:49 +01:00
betalars a77c3fae91 Merge branch 'development' of gitlab.com:betalars/frame-of-mind into development 2023-12-02 17:04:35 +01:00
betalars 17405999b7 improving star texture 2023-12-02 17:04:31 +01:00
April John 9db87a3a01 [fix] crash on comic stash 2023-12-02 16:19:14 +01:00
April John 3df9abef9f update to godot 4.2 2023-12-02 14:27:18 +01:00
betalars d7f5911566 initialising branch 2023-12-02 14:13:50 +01:00
April John 9b244ec55c [fix] change invisible walls prevent crashes 2023-12-02 14:12:09 +01:00
April John 9377041867 sanity check highlight 2023-11-30 18:28:04 +01:00
April John 82b652d3b3 change back from fullscreen to windowed 2023-11-29 18:04:14 +01:00
April John ed9ec2b2f0 make button closeable 2023-11-29 18:04:14 +01:00
April John 53a211547e fix: remove a draggable between back and start 2023-11-29 18:04:13 +01:00
April John 5b7c2269ff Change default window height 2023-11-29 18:04:13 +01:00
betalars d7b0c7b169 fixing text not being properly displayed on cards 2023-11-02 12:56:15 +01:00
betalars bcf232b778 fixing missing window frames 2023-11-02 12:55:39 +01:00
betalars 10f79096f1 finishing up card refactor 2023-11-01 23:19:47 +01:00
TilCreator b9169ebb94 reworking state management in card board WIP 2023-10-15 13:27:02 +02:00
betalars f820eb2f1e wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars 27b5252df7 WIP: finish cleaning up function architecture 2023-09-24 12:23:26 +02:00
betalars bd1a7972b1 wip card bord refactoring 2023-09-23 16:19:58 +02:00
betalars 64ef2d5475 WIP: refactoring card_board 2023-08-30 13:23:37 +02:00
betalars df33071a0e merging adis board updates into development 2023-08-30 12:04:51 +02:00
betalars 4470dd63e4 misc polish 2023-08-30 11:12:47 +02:00
betalars 5195c4ef15 Improving card reveal handling 2023-08-30 11:11:55 +02:00
betalars 0264c303ae wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
betalars 6289a56c2f wip: adding prompt to card picker 2023-08-30 11:05:07 +02:00
betalars d04feab22b adding realistic window resource 2023-08-30 11:03:56 +02:00
betalars 9d59d9c029 updating void card in dev board 2023-08-30 11:03:01 +02:00
betalars 61e9880f97 reverting version downgrade 2023-08-30 11:01:55 +02:00
Adrian Schmid 30d0ab1469 left/right clicking in assignment context returns postits to the panel 2023-08-22 20:06:55 +02:00
Adrian Schmid 4e7677915b postits are now returned to the panel if the group doesn't match 2023-08-22 20:00:33 +02:00
Adrian Schmid 8a7eb8ea3e moved version back up to 4.1 (sorry Lars) 2023-08-22 19:16:20 +02:00
betalars 109bcba916 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 84da923f91 adding card game graphics 2023-08-21 08:40:25 +02:00
Adrian Schmid 5d2f24c32a added right click to return post it panels 2023-08-12 13:02:00 +02:00
Adrian Schmid 39c1969677 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 57f9fc7c07 fixed positioning of post it on the card 2023-08-12 12:19:27 +02:00
Adrian Schmid 53e28108d7 pressing ui left now works as expected 2023-08-12 11:28:23 +02:00
betalars daba2c64e6 creating outside environemnt 2023-08-06 00:03:26 +02:00
betalars 03e6ba5e61 resetting music slider in startup 2023-08-06 00:02:17 +02:00
betalars 4235748412 reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars 9897fa2b33 celaning up error sources 2023-08-01 11:01:52 +02:00
betalars b7968fc989 export version bump 2023-08-01 10:59:46 +02:00
betalars d9977d3108 updating card handling 2023-08-01 10:59:24 +02:00
betalars cdfabe42af fixing missing groups 2023-08-01 10:56:48 +02:00
betalars 83f73ce5da adding skipping logic 2023-08-01 10:52:08 +02:00
betalars 4f1f1e5ffc updating disclaimer and thank you note 2023-08-01 10:50:24 +02:00
betalars a252ab0dfd fixing up handling of locked focus in global state 2023-08-01 10:49:42 +02:00
betalars c9b75f2db4 adding splash screen 2023-08-01 10:48:52 +02:00
betalars 82927c3398 the least specacular version bumpo of all times 2023-07-19 22:45:57 +02:00
betalars 86fe7e59a6 preventing focus drops 2023-07-19 22:44:29 +02:00
betalars 2c9837d6b6 card picker is always picking void card 2023-07-19 22:44:07 +02:00
betalars 132d9cd118 fix: card board now stores an array, instead of an array of arrays 2023-07-19 22:43:44 +02:00
betalars a8a3e9f054 adding provisionary init function, wip 2023-07-19 22:43:00 +02:00
betalars 02ec893a2c finalise cards 2023-07-19 22:42:05 +02:00
betalars 7a43e8e902 finalise menus 2023-07-19 22:41:29 +02:00
betalars 88c26caa5b fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 9a1eafb2bc Merge commit '522080d52e14899d1d18e41489f45e86f9a6bf4e' into alpha 2023-07-19 13:55:26 +02:00
betalars b05cbe6b29 final youth room changes 2023-07-19 13:55:04 +02:00
betalars 5ede0fbe86 reclaiming focus when scene is repeated 2023-07-19 13:54:36 +02:00
betalars 2e50009aee resolving some remaining group assignments 2023-07-19 13:53:24 +02:00
betalars 0cbf306ba8 workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars 5b7fb7d1f5 implement skipping functionality 2023-07-19 13:51:26 +02:00
betalars aef423ad55 making sure card picker can be reset 2023-07-19 13:50:19 +02:00
betalars bc7a81eece adding bilboard toggle 2023-07-19 13:49:48 +02:00
betalars 03c0381242 finalising disclaimers and thank you 2023-07-19 13:49:09 +02:00
betalars d12883a5ca changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
betalars 4a99dd7376 re-doing lost goup assignments 2023-07-18 23:25:27 +02:00
Adrian Schmid 9365ea9fb1 Added settings for final page (+ some notes on the global state) 2023-07-18 22:02:35 +02:00
Adrian Schmid d76242d7d0 added code for audio settings 2023-07-18 21:37:04 +02:00
Adrian Schmid 559d60eeef 1st page accessibility settings (almost working except for fonts and ui scale) 2023-07-18 21:00:21 +02:00
Adrian Schmid 51026dcbdb some notes for me + debug function for printing settings 2023-07-18 20:59:00 +02:00
Adrian Schmid 51134d504a Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-18 19:01:41 +02:00
betalars 587fa702d9 resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars 3e9a22bfbe global state will quit game when the last focus is dropped 2023-07-18 15:55:54 +02:00
betalars 4141ef4e85 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 20181ca8fe improving card and post it avoidance handling 2023-07-18 15:54:34 +02:00
betalars 33481c28e4 adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +02:00
betalars 91ba021f79 fix missing group assignment 2023-07-18 15:52:24 +02:00
betalars 17ca359b3b cards and posts will pass mouse events even when they are not draggable 2023-07-18 14:58:06 +02:00
betalars 26244f8259 fixing up issues with internal state handling and animation referencing 2023-07-18 14:48:28 +02:00
betalars 59636aa318 cleaning up scenes 2023-07-18 14:47:59 +02:00
betalars 25be37fc23 adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars c45b01bf65 add group sharing to postit 2023-07-18 00:13:33 +02:00
betalars c604843f16 finalising board of devs 2023-07-18 00:13:17 +02:00
Adrian Schmid 929bba5355 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-17 19:00:30 +02:00
Adrian Schmid 2ab816dda5 accessibility menu: added function for screenreader toggle 2023-07-17 19:00:17 +02:00
betalars 61b00722db imprioving stage complience for player 2023-07-17 14:16:12 +02:00
betalars fd1350a41f card updates 2023-07-17 14:15:40 +02:00
betalars af81d83ed9 updating audio, importing draeven scene 2023-07-17 14:14:54 +02:00
betalars a14ff6d28a converting wall material to shader 2023-07-17 14:11:05 +02:00
betalars f5348f7e76 tweaking lava lamp 2023-07-17 14:10:23 +02:00
betalars 9f2a9ce05e importing luna 2023-07-17 14:09:24 +02:00
betalars e06f233ddb Merge commit '56ab26d1d6253d2385c47fa914e692124512bf65' 2023-07-16 01:13:13 +02:00