Commit Graph

617 Commits

Author SHA1 Message Date
betalars e6f8e22d2d fix #116: void card is now again being recognized 2025-04-30 16:29:01 +02:00
betalars 32866b2a85 Merge commit '3de41e6fc8d5ad62ea8a72a2dc9de307df3da3a1' into development 2025-04-28 15:52:04 +02:00
betalars 3de41e6fc8 celanup 2025-04-28 15:46:50 +02:00
betalars f028608c06 resolve oversight in card refactoring 2025-04-27 13:04:11 +02:00
betalars c9416492e3 fix #115: when pause is resumed, it now only captures the mouse while player is on top of the focus stack. 2025-04-27 13:03:07 +02:00
betalars f3a8ef6e46 workaround #114: workaround issues occurring due to ordering of internal children of card 2025-04-27 12:41:30 +02:00
betalars 5e1fb71520 fix #113 resolving non-unique name 2025-04-27 12:33:11 +02:00
betalars ff3ada68b8 wip: adding chat bubbles 2025-04-26 23:33:44 +02:00
betalars 1a814b157a Merge commit 'cdcb3c618e8169a74a4e9f60e6fa0869b91ec05f' into development 2025-04-13 19:31:39 +02:00
betalars cdcb3c618e re-implement card-loading to avoid loading issue 2025-04-13 19:07:31 +02:00
betalars 8067575f2a WIP: converting card loading to hard-coded solution due to load errors 2025-04-07 17:26:06 +02:00
betalars 8998c93480 WIP implement temporary workaround 2025-04-04 23:17:31 +02:00
betalars 00d783a2ba debug-me comitting broken state for debug purposes 2025-04-04 19:27:57 +02:00
betalars ff8145a097 WIP: adding recovery to cardboard 2025-03-31 21:31:09 +02:00
betalars cfad1499ab implement provisional bug button
(merged and cherry picked from commit 23eb1e3ed2)
2025-03-31 13:10:11 +02:00
betalars 3df6840b70 fix spelling mistakes in i18n
(cherry picked from commit 2182df5210)
2025-03-31 13:04:26 +02:00
betalars 23eb1e3ed2 implement provisional bug button 2025-03-31 13:01:07 +02:00
betalars 2182df5210 fix spelling mistakes in i18n 2025-03-31 12:59:35 +02:00
betalars ad64a118cc 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 a38b4d1956 godot weirdness 2025-03-28 18:19:21 +01:00
betalars 78f2216357 Fix wing texture import 2025-03-28 13:42:00 +01:00
betalars 067a70ae4f add support for different spoken text and audio 2025-03-28 13:41:18 +01:00
betalars d2137e0547 Fix wing texture import 2025-03-28 13:40:45 +01:00
betalars 076c7a3315 fix state management issues with settings 2025-03-25 22:35:01 +01:00
betalars 022053a078 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars bdf78a55c0 revert demo changes 2025-03-25 22:33:01 +01:00
betalars 5673f44b2d fix infinite recursion and focus management issues in video settings 2025-03-24 17:17:25 +01:00
betalars edc1603fe5 prevent issues when ui button is pressed but no label is looked at 2025-03-24 17:13:23 +01:00
betalars 4baa16794c cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 3a5a171bcd fixes #111: resetting mouse mode to correct mode in mouse toggle 2025-03-24 17:07:03 +01:00
betalars 1d7d4da05c adding enum to id conversion due to new 4.4 display modes 2025-03-23 15:43:24 +01:00
betalars 7b8423bbad resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars 1bef86f316 fix save files being initialized incorrectly due to variable shadowing 2025-03-23 14:56:09 +01:00
betalars 47ad59c2ff remove warning when Skip Control is accessed in engine 2025-03-23 14:52:45 +01:00
betalars 7d0c8a70ad fix images of save files being saved by the editor 2025-03-23 14:52:21 +01:00
betalars 320c3d8932 misc 2025-03-23 14:32:24 +01:00
betalars 1c975fe554 fix #109 enhance card board reliability, workaround free not being available in builds 2025-03-23 14:31:00 +01:00
betalars d364698c1a renaming for compatibility reasons 2025-03-23 14:22:40 +01:00
betalars d7c8f089a4 fix formatting of childhood and jui jutsu text 2025-03-23 14:21:49 +01:00
betalars bb8302113f version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars 5c2f97cf5e revert incorrect volume setting 2025-03-23 14:02:59 +01:00
betalars b03469ba67 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 60edd018ab adding even more stops to prevent savegame from doing weird stuff it's not yet supposed to do 2025-03-05 22:53:48 +01:00
betalars edd2c57f20 fix #105: removing incorrect null assignment and resolved warnings raised by empty typed array 2025-03-05 19:41:22 +01:00
betalars 1682e3edc2 resolve sync issues 2025-03-03 17:39:20 +01:00
betalars 56e755875e Update skip control event 2025-03-03 17:26:46 +01:00
betalars c8291ab8e4 disable save game script due to unneeded save games being generated everywhere 2025-03-03 17:25:32 +01:00
betalars b187bf241d fix #106: pause menu can be closed via the button 2025-03-03 15:29:52 +01:00
betalars 9926e60aeb add wishlist link to final screen 2025-02-24 16:16:02 +01:00
betalars 1664798979 update splash screen 2025-02-24 16:15:15 +01:00
betalars 7c3d060383 misc small updates 2025-02-24 16:14:53 +01:00
betalars e8e368c362 further rework of card handling 2025-02-24 16:14:08 +01:00
betalars 60d7d7e7ac commit pause Menu script -.- 2025-02-24 16:12:00 +01:00
betalars 89a53457d2 create foam and include graffiti in first station 2025-02-24 16:09:51 +01:00
betalars adc80cfc33 typo fix 2025-02-24 16:06:21 +01:00
betalars e5ca8ea5ef import ubuntu font 2025-02-24 16:05:03 +01:00
betalars 3c4e619ea7 revert me: change steam appid from main application to demo 2025-02-24 16:04:14 +01:00
betalars c9b042971a fix i18 typos 2025-02-24 16:03:09 +01:00
betalars 2259317260 WIP: creating a pause Menu 2025-02-24 16:00:20 +01:00
betalars d6705d665e WIP: adding new subway map 2025-02-24 15:58:43 +01:00
betalars a66c9338de WIP: adding two new graffiti for subway 2025-02-24 15:56:52 +01:00
betalars fadd6efc49 small fixes 2025-02-06 19:15:39 +01:00
betalars 9b70ea60d3 meep 2025-02-06 19:11:05 +01:00
betalars 3322248384 move fullscreen toogle to state 2025-02-06 19:09:53 +01:00
betalars bbe3fe60d1 rework demo text, fix save game handle leak 2025-02-06 19:07:40 +01:00
betalars 85125fb32d rework sequence handling 2025-02-06 18:55:05 +01:00
betalars eca8505d4b remove debug cap 2025-02-06 17:39:48 +01:00
betalars 09e306c974 removing many mouse movement bugs 2025-01-31 03:22:07 +01:00
betalars f5fac26176 WIP: create, modify and import assets for transition scene 2025-01-16 17:39:03 +01:00
betalars 530e86d7bd ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars f9ac1ed5d9 add input prompts (wip) 2025-01-16 16:06:46 +01:00
betalars f3965c8085 Adding provisionary showroom-scene for events and trailers and stuff 2025-01-16 14:47:06 +01:00
betalars d9b4da6a64 further translation work 2025-01-16 13:50:34 +01:00
betalars 8e24de5dd8 adding chyperacoustic filtering 2024-10-21 11:39:16 +02:00
betalars 702c4982c7 spacing 2024-10-18 18:15:46 +02:00
betalars d1c6161091 initialising steam demo 2024-10-18 18:13:28 +02:00
betalars 980d160fae misc updates 2024-10-18 18:12:40 +02:00
betalars fe27e33749 bump 2024-10-18 18:11:58 +02:00
betalars c424e0beff bump testing scene 2024-10-18 18:11:45 +02:00
betalars ab366420dd room initialisation enhancements 2024-10-18 18:10:51 +02:00
betalars 889bc6274d i18n update 2024-10-18 18:09:45 +02:00
betalars 8b85a599c8 renaming main theme 2024-10-18 18:08:54 +02:00
betalars 2d8a3329d3 add a11y settings and class to main menu 2024-10-18 18:04:50 +02:00
betalars 356f9fd24a finalize implement savegame loading trough main menu 2024-10-18 17:31:46 +02:00
betalars 7cede4f0ac resolve card picking issue 2024-10-18 15:46:19 +02:00
betalars b8e1e6ff0f Adding language switcher to audio settings 2024-10-18 15:42:53 +02:00
betalars 41129f0766 updating room structure 2024-10-16 12:29:20 +02:00
betalars 7d25c9cba5 implementing save games 2024-10-16 12:24:38 +02:00
betalars 3a70fab018 adding demo splash 2024-10-16 12:20:40 +02:00
betalars fefadff5dd WIP: chaning save slot from 3 fixed slots to dynamic system 2024-10-07 11:23:19 +02:00
betalars 7f01336587 WIP: enhancing menu animations and adding predit roles 2024-10-07 11:21:36 +02:00
betalars 9566606bdc WIP: enhancing setting focus handling 2024-10-07 11:16:18 +02:00
betalars f64bb5a71c resolve typo in settings path 2024-10-07 11:13:22 +02:00
betalars 355fbc6939 importing markdown label 2024-10-07 11:10:58 +02:00
betalars 23eedfd167 WIP: adding loading and transition animations to main menu 2024-10-06 11:40:42 +02:00
betalars 4208ff368a implement room initialising from savegame, enhancing room calling strucutre 2024-10-06 11:38:15 +02:00
betalars 9103ee4cc1 misc code cleanup 2024-10-06 11:31:47 +02:00
betalars 0692f76d0b add support to initialise and save board state to savegame 2024-10-03 01:12:24 +02:00
betalars efcc3bf694 implement loading and saving raw data to save file resource 2024-10-03 01:10:35 +02:00
betalars 2972ee0ad6 misc 2024-10-02 01:33:58 +02:00
betalars a666ab61c8 WIP: main menu overhaul, introducing settings 2024-10-02 01:32:59 +02:00
betalars a992558c77 tab space conversion 2024-10-02 01:31:33 +02:00
betalars 1c1262af82 introducing dynamic scene loading, main scene rework 2024-10-02 01:30:03 +02:00
betalars db4dea4dcf WIP: specifying save file variables 2024-10-02 01:26:54 +02:00
betalars 502103aa80 i18n progress 2024-10-02 01:26:10 +02:00
betalars dbe3441c1b move audio settings into own panel 2024-09-28 01:49:44 +02:00
betalars cf830dd764 remove debug prints, set changed to false after saving 2024-09-28 00:34:54 +02:00
betalars c2d3ce2265 adding thunder and video settings 2024-09-27 22:02:28 +02:00
betalars 1e0719011a making main menu dedicated scene 2024-09-27 22:00:19 +02:00
betalars 77fa8bc19f converting more objects to lfs 2024-09-23 10:25:13 +02:00
betalars f028be41bb properly configuring macos export 2024-09-23 10:23:52 +02:00
betalars eecfae5e81 Git LFS shenanigans 2024-09-19 13:12:43 +02:00
betalars 64aeb4e6eb rephrasing texts to better reflect state of the project, adding steam app ID 2024-09-19 12:32:47 +02:00
betalars 4f7df5fabf enhancing material naming convention and texture references for youth room 2024-09-19 12:31:49 +02:00
betalars a3a1ad96b2 resolving upgrade regressions 2024-09-19 12:29:35 +02:00
betalars 86a8fdcbd9 updating export configuration 2024-09-19 12:27:27 +02:00
betalars 540cbd913b macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars c76998803f updating graphical assets 2024-09-19 12:19:55 +02:00
betalars d3187ee60e remove debug print statement 2024-09-16 17:08:22 +02:00
betalars 58296ed3b3 i18n update 2024-09-16 17:07:00 +02:00
betalars 285e35b50d updating font import files 2024-09-16 17:05:32 +02:00
betalars 2d54eed71d resolve errors due to missing tool declaration in global state 2024-09-16 17:04:44 +02:00
betalars b07c5b9dbd WIP material reference updates to youch_room 2024-09-16 17:02:35 +02:00
betalars a0c4faa73a more misc 2024-09-15 15:54:02 +02:00
betalars 22a655474f misc 2024-09-15 15:50:21 +02:00
betalars 08d5ec0178 Updating of rez files 2024-09-15 12:39:47 +02:00
betalars 2e52c8d0c1 moving on 2024-09-15 11:30:31 +02:00
betalars ccc09edbac WIP: adding internationalisation 2024-09-15 11:20:06 +02:00
betalars 449edcc288 version bump 2024-09-15 11:15:36 +02:00
betalars 2b54a23d37 material import, lighting tests 2024-02-19 00:23:41 +01:00
betalars d49d14f0da WIP: importing assets for volunteer room 2024-02-18 02:03:42 +01:00
betalars f3bcd84755 converting assets to lfs 2024-02-17 23:42:15 +01:00
betalars 3455715b9d Merge branch 'amaze-hotfixes' of gitlab.com:betalars/frame-of-mind into amaze-hotfixes 2024-02-17 23:33:06 +01:00
betalars eb310ace5e migrating assets to lfs 2024-02-17 23:32:06 +01:00
betalars 80d381b9ed minor card interface polishes 2024-02-17 23:31:35 +01:00
betalars 7babf210d7 room polishes 2024-02-17 23:27:30 +01:00
betalars bc10813c3f 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 736ad84dd0 fix typo 2024-02-14 02:18:49 +01:00
betalars 08ff85d768 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars 0564f994ec fixme: disabling player upon load to prevent illegal state in main menu 2024-02-12 01:16:22 +01:00
betalars 8e81af33ee improved state handling in card picker, implemented animation skipping 2024-02-12 00:24:13 +01:00
betalars 2cddc8284c fixed conditions where invalid state could be reached in card board 2024-02-11 22:36:19 +01:00
betalars 184fb82151 testing animation behaviours 2024-02-11 22:34:34 +01:00
betalars 50732ae525 tweaking minimum sizes of popups to accomondate theme 2024-02-11 22:33:34 +01:00
betalars d9ec5d5d06 fix: multiple StickyNotes can be attatched to a single scene 2024-02-10 13:35:47 +01:00
betalars 7423461464 lighting improvements 2024-02-10 13:35:04 +01:00
betalars afb3f241c4 adding fairy lights 2024-02-10 13:34:34 +01:00
betalars 9dde7abddf adding landshark plushie 2024-02-10 13:33:00 +01:00
betalars a54b9ee992 wip: adding landshark 2024-02-09 14:13:40 +01:00
betalars a64d2235ce properly setting up git lfs tracking 2024-02-09 14:13:25 +01:00
betalars d741913c86 player now reduces motion when reduce motion is turned on 2024-02-06 21:58:46 +01:00
betalars 477bf3b1a4 adding automatic theme switching 2024-02-06 21:58:29 +01:00
betalars 6755b6ab3d further theme developments (WIP) 2024-02-03 22:00:44 +01:00
betalars 6eca6951a4 adding procedural sky to main scene 2024-02-03 22:00:13 +01:00
betalars 7e5977c42d unloading subtitle addon 2024-02-03 21:58:14 +01:00
betalars 4d76db1261 Merge commit '98e28cca1cefaedb601c0554b4444a7a723871cd' into amaze-hotfixes 2024-02-02 16:47:11 +01:00
betalars a575122f6b WIP adding system font theme 2024-02-02 12:05:49 +01:00
betalars ad984a77b9 WIP: theme polishing 2024-02-02 01:03:28 +01:00
betalars 2e7c286079 res shenanigans 2024-02-01 22:41:00 +01:00
betalars 20dec01e88 reducing non text audio volumes 2024-02-01 22:40:39 +01:00
betalars 5d48c3325d sky prototyping 2023-12-03 16:07:08 +01:00
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