Commit Graph

612 Commits

Author SHA1 Message Date
betalars 79dc64ec34 fixed #99 2025-04-30 16:33:01 +02:00
betalars bdb1a8d616 fix #116: void card is now again being recognized 2025-04-30 16:29:01 +02:00
betalars 4a52961d43 Merge commit '3de41e6fc8d5ad62ea8a72a2dc9de307df3da3a1' into development 2025-04-28 15:52:04 +02:00
betalars 9acad854a2 celanup 2025-04-28 15:46:50 +02:00
betalars b36e275b49 resolve oversight in card refactoring 2025-04-27 13:04:11 +02:00
betalars 8b527a2b6b 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 284cc0bb90 workaround #114: workaround issues occurring due to ordering of internal children of card 2025-04-27 12:41:30 +02:00
betalars af6417d667 fix #113 resolving non-unique name 2025-04-27 12:33:11 +02:00
betalars ff837c550f wip: adding chat bubbles 2025-04-26 23:33:44 +02:00
betalars 13bf10be60 Merge commit 'cdcb3c618e8169a74a4e9f60e6fa0869b91ec05f' into development 2025-04-13 19:31:39 +02:00
betalars 02a8f31b6c re-implement card-loading to avoid loading issue 2025-04-13 19:07:31 +02:00
betalars 66a3b02816 WIP: converting card loading to hard-coded solution due to load errors 2025-04-07 17:26:06 +02:00
betalars dee8895f08 WIP implement temporary workaround 2025-04-04 23:17:31 +02:00
betalars fc32ca5dc9 debug-me comitting broken state for debug purposes 2025-04-04 19:27:57 +02:00
betalars c87339cca1 WIP: adding recovery to cardboard 2025-03-31 21:31:09 +02:00
betalars 85325b4a38 implement provisional bug button
(merged and cherry picked from commit 23eb1e3ed2)
2025-03-31 13:10:11 +02:00
betalars 74f8d6b0ae fix spelling mistakes in i18n
(cherry picked from commit 2182df5210)
2025-03-31 13:04:26 +02:00
betalars e300dfc8c6 implement provisional bug button 2025-03-31 13:01:07 +02:00
betalars f7f3f6ef1c fix spelling mistakes in i18n 2025-03-31 12:59:35 +02:00
betalars cc55ac2f73 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 424624feda godot weirdness 2025-03-28 18:19:21 +01:00
betalars acefccefbe Fix wing texture import 2025-03-28 13:42:00 +01:00
betalars 923733760c add support for different spoken text and audio 2025-03-28 13:41:18 +01:00
betalars 8999b8ddb3 Fix wing texture import 2025-03-28 13:40:45 +01:00
betalars c651266d16 fix state management issues with settings 2025-03-25 22:35:01 +01:00
betalars 62227cd331 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars 0056851b56 revert demo changes 2025-03-25 22:33:01 +01:00
betalars fc8c702ad2 fix infinite recursion and focus management issues in video settings 2025-03-24 17:17:25 +01:00
betalars 1df921271e prevent issues when ui button is pressed but no label is looked at 2025-03-24 17:13:23 +01:00
betalars 69b97ba112 cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 6588679384 fixes #111: resetting mouse mode to correct mode in mouse toggle 2025-03-24 17:07:03 +01:00
betalars 4f96a33d5e adding enum to id conversion due to new 4.4 display modes 2025-03-23 15:43:24 +01:00
betalars 37161e1613 resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars a0ef7ebd77 fix save files being initialized incorrectly due to variable shadowing 2025-03-23 14:56:09 +01:00
betalars 6c1ffbda6d remove warning when Skip Control is accessed in engine 2025-03-23 14:52:45 +01:00
betalars 3d6faa6b09 fix images of save files being saved by the editor 2025-03-23 14:52:21 +01:00
betalars 59698dd5d5 misc 2025-03-23 14:32:24 +01:00
betalars e4f8e0d06f fix #109 enhance card board reliability, workaround free not being available in builds 2025-03-23 14:31:00 +01:00
betalars 426add579a renaming for compatibility reasons 2025-03-23 14:22:40 +01:00
betalars eefe5d3632 fix formatting of childhood and jui jutsu text 2025-03-23 14:21:49 +01:00
betalars c33959ee05 version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars 79c926a69f revert incorrect volume setting 2025-03-23 14:02:59 +01:00
betalars 1eab42acba 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 9930834fd2 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 f650f8d706 fix #105: removing incorrect null assignment and resolved warnings raised by empty typed array 2025-03-05 19:41:22 +01:00
betalars 28828d46cc resolve sync issues 2025-03-03 17:39:20 +01:00
betalars ab28c2aa9a Update skip control event 2025-03-03 17:26:46 +01:00
betalars 3f5c1cb2d7 disable save game script due to unneeded save games being generated everywhere 2025-03-03 17:25:32 +01:00
betalars c1059072fc fix #106: pause menu can be closed via the button 2025-03-03 15:29:52 +01:00
betalars f132d448c8 add wishlist link to final screen 2025-02-24 16:16:02 +01:00
betalars f055fcaf27 update splash screen 2025-02-24 16:15:15 +01:00
betalars a8c31d4d6f misc small updates 2025-02-24 16:14:53 +01:00
betalars 58e0a4ca8d further rework of card handling 2025-02-24 16:14:08 +01:00
betalars 8ac3d940cd commit pause Menu script -.- 2025-02-24 16:12:00 +01:00
betalars 8842717ece create foam and include graffiti in first station 2025-02-24 16:09:51 +01:00
betalars 9af5621ddf typo fix 2025-02-24 16:06:21 +01:00
betalars dfd7e6a90c import ubuntu font 2025-02-24 16:05:03 +01:00
betalars 780021b542 revert me: change steam appid from main application to demo 2025-02-24 16:04:14 +01:00
betalars 470b0cfa07 fix i18 typos 2025-02-24 16:03:09 +01:00
betalars d025bbcac2 WIP: creating a pause Menu 2025-02-24 16:00:20 +01:00
betalars 578cfc1537 WIP: adding new subway map 2025-02-24 15:58:43 +01:00
betalars 99d46bfc5c WIP: adding two new graffiti for subway 2025-02-24 15:56:52 +01:00
betalars 29069f64d0 small fixes 2025-02-06 19:15:39 +01:00
betalars a22a625dd0 meep 2025-02-06 19:11:05 +01:00
betalars 56969f0913 move fullscreen toogle to state 2025-02-06 19:09:53 +01:00
betalars 01e2f03719 rework demo text, fix save game handle leak 2025-02-06 19:07:40 +01:00
betalars 118f2ad8ad rework sequence handling 2025-02-06 18:55:05 +01:00
betalars fdb85ae014 remove debug cap 2025-02-06 17:39:48 +01:00
betalars 0700c6a64d removing many mouse movement bugs 2025-01-31 03:22:07 +01:00
betalars 12cf1dcc28 WIP: create, modify and import assets for transition scene 2025-01-16 17:39:03 +01:00
betalars daa3c946de ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars cee7382232 add input prompts (wip) 2025-01-16 16:06:46 +01:00
betalars 48ba45c8aa Adding provisionary showroom-scene for events and trailers and stuff 2025-01-16 14:47:06 +01:00
betalars e8fb30108b further translation work 2025-01-16 13:50:34 +01:00
betalars 34f776a8f7 adding chyperacoustic filtering 2024-10-21 11:39:16 +02:00
betalars 320dd57280 spacing 2024-10-18 18:15:46 +02:00
betalars a183b79106 initialising steam demo 2024-10-18 18:13:28 +02:00
betalars 20b55e0da5 misc updates 2024-10-18 18:12:40 +02:00
betalars eecbd829fd bump 2024-10-18 18:11:58 +02:00
betalars 88b6b6f84b bump testing scene 2024-10-18 18:11:45 +02:00
betalars 2b173f82c0 room initialisation enhancements 2024-10-18 18:10:51 +02:00
betalars c882ae7f94 i18n update 2024-10-18 18:09:45 +02:00
betalars 70a02f26dd renaming main theme 2024-10-18 18:08:54 +02:00
betalars 5d0ee9ce3c add a11y settings and class to main menu 2024-10-18 18:04:50 +02:00
betalars 2d3c4c231f finalize implement savegame loading trough main menu 2024-10-18 17:31:46 +02:00
betalars 91260ad9af resolve card picking issue 2024-10-18 15:46:19 +02:00
betalars 189a89bf5c Adding language switcher to audio settings 2024-10-18 15:42:53 +02:00
betalars 7c92ee1a7f updating room structure 2024-10-16 12:29:20 +02:00
betalars 0d1778fac5 implementing save games 2024-10-16 12:24:38 +02:00
betalars 592ff38894 adding demo splash 2024-10-16 12:20:40 +02:00
betalars 44bc6bbed5 WIP: chaning save slot from 3 fixed slots to dynamic system 2024-10-07 11:23:19 +02:00
betalars 708a105de4 WIP: enhancing menu animations and adding predit roles 2024-10-07 11:21:36 +02:00
betalars 64ce1ab8d8 WIP: enhancing setting focus handling 2024-10-07 11:16:18 +02:00
betalars 4be6d98e73 resolve typo in settings path 2024-10-07 11:13:22 +02:00
betalars eb43622c4f importing markdown label 2024-10-07 11:10:58 +02:00
betalars 02594e9a60 WIP: adding loading and transition animations to main menu 2024-10-06 11:40:42 +02:00
betalars f8dba6133d implement room initialising from savegame, enhancing room calling strucutre 2024-10-06 11:38:15 +02:00
betalars abf04c7d90 misc code cleanup 2024-10-06 11:31:47 +02:00
betalars cda6da932f add support to initialise and save board state to savegame 2024-10-03 01:12:24 +02:00
betalars 91b0de97e3 implement loading and saving raw data to save file resource 2024-10-03 01:10:35 +02:00
betalars 6f04a43a7c misc 2024-10-02 01:33:58 +02:00
betalars 1a8c0207b9 WIP: main menu overhaul, introducing settings 2024-10-02 01:32:59 +02:00
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