Commit Graph

323 Commits

Author SHA1 Message Date
betalars a5abbbe339 visual updates to youth and volunteer room 2025-10-29 22:40:15 +01:00
betalars 2c6dd043f1 fix #250 revert change that accidentally deleted the text 2025-10-13 20:16:06 +02:00
betalars 5b615954e0 WIP: volunteer room update 2025-10-08 01:35:55 +02:00
betalars 67daec23dd transition scene groundwork 2025-10-08 00:37:05 +02:00
betalars 8e9b3e5dcc youth room lighting update 2025-10-08 00:35:55 +02:00
betalars 6ba9a4d71f HDR prototyping 2025-09-25 15:55:00 +02:00
betalars 48b4596f50 bulk resource update 2025-09-21 00:24:32 +02:00
betalars 92daf043fc WIP: adding frame to collectable ui so objects can be viewed in the scene 2025-09-05 02:01:28 +02:00
betalars eeed4f68dd cancel ui collapse animation when mouse enters again 2025-09-05 01:59:58 +02:00
betalars e31047639c adding support and resolving crashes when running room scenes in debug mode 2025-09-05 01:54:21 +02:00
betalars c54d9c5d22 WIP #102 enhancing crouching behavior 2025-08-18 00:13:20 +02:00
betalars 6f3a7cc039 enhancing performance related to #213 2025-08-16 16:25:20 +02:00
betalars 87e96d5ed1 misc cleanup 2025-08-13 20:25:27 +02:00
betalars 9b8541b3d5 import story texts 2025-07-29 00:03:46 +02:00
betalars 6eb1832adb WIP: importing train asset and vfx development 2025-07-21 14:47:40 +02:00
betalars d104715a3f import german audio for demo 2025-07-21 14:33:04 +02:00
betalars e2ae1bc5e3 station draft 2025-07-01 14:40:48 +02:00
betalars 305fa1523c WIP: updating/completing german spoken text, fix i18n issues 2025-06-23 18:37:01 +02:00
betalars fe115ecdd1 hitfixes: remove unintentional audio mute during childhood scene, support skip events in burner ui, rework focus handling for player and collectables 2025-06-10 21:09:47 +02:00
betalars 4fc9298dc2 prevent undesired start initial state for scenes 2025-06-08 18:31:59 +02:00
betalars 16ebfbfb10 mini fixes 2025-06-06 23:52:10 +02:00
betalars 699fb27a6b downscale voxel gi 2025-06-04 15:39:26 +02:00
betalars a4178faecc performance optimisation, polish and obscurifcation support 2025-06-04 15:39:06 +02:00
betalars cfa35a7626 add transition loading 2025-06-03 23:17:29 +02:00
betalars 7bc780ebc2 add lore feedback 2025-05-30 16:10:44 +02:00
betalars 23f1e8c417 WIP: import subway traincar, cleanup 2025-05-30 13:45:14 +02:00
betalars 57ded43713 #166 fix skip control 2025-05-26 21:40:13 +02:00
betalars 5d37875c45 importing first station properly 2025-05-21 19:41:00 +02:00
betalars eaf16c40cc fix language mismatch in demo 2025-05-21 11:13:44 +02:00
betalars c1eecd8980 Merge commit 'dad9d42e7307900ea7ca7ba86ccf17cd7df020be' into development 2025-05-12 19:17:12 +02:00
betalars dad9d42e73 fix mistakes in resolving i18n mistakes and typos 2025-05-12 19:07:36 +02:00
betalars 60e0335353 hotfix 2 2025-05-10 15:59:52 +02:00
betalars 5f6dab8f4c ugly bulk commit 2025-05-10 15:23:58 +02:00
betalars f0a8bc9437 fix #158 by modifying sequence handling, enhance music transitions, add thunder in jui jitsu 2025-05-09 17:28:23 +02:00
betalars 277e52b3c6 #153 importing new audio clips 2025-05-09 17:18:57 +02:00
betalars d9924e5d49 misc cleanup 2025-05-07 19:53:55 +02:00
betalars 8d607e5c89 resolve fixme #148 remove redundant dnd workaround resolved by stage handling by now 2025-05-07 19:36:35 +02:00
betalars 6115eb6438 implement #144 scrolling support for mouse input 2025-05-07 19:30:55 +02:00
betalars 58db7dd199 fix #139 replace paragraph formatting marks from i18n file 2025-05-07 00:19:09 +02:00
betalars b3392c9fcf Merge branch 'setam-demo' into development 2025-04-30 18:26:14 +02:00
betalars c09f45858b adding surround sound compatibility by limiting text to the center channel 2025-04-30 16:35:11 +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 1a814b157a Merge commit 'cdcb3c618e8169a74a4e9f60e6fa0869b91ec05f' into development 2025-04-13 19:31:39 +02:00
betalars 8998c93480 WIP implement temporary workaround 2025-04-04 23:17:31 +02:00
betalars 3df6840b70 fix spelling mistakes in i18n
(cherry picked from commit 2182df5210)
2025-03-31 13:04:26 +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 022053a078 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars 4baa16794c cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 7b8423bbad resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars 47ad59c2ff remove warning when Skip Control is accessed in engine 2025-03-23 14:52:45 +01:00
betalars 320c3d8932 misc 2025-03-23 14:32:24 +01:00
betalars bb8302113f version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars 1682e3edc2 resolve sync issues 2025-03-03 17:39:20 +01:00
betalars 7c3d060383 misc small updates 2025-02-24 16:14:53 +01:00
betalars 89a53457d2 create foam and include graffiti in first station 2025-02-24 16:09:51 +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 9b70ea60d3 meep 2025-02-06 19:11:05 +01:00
betalars 85125fb32d rework sequence handling 2025-02-06 18:55:05 +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 f3965c8085 Adding provisionary showroom-scene for events and trailers and stuff 2025-01-16 14:47:06 +01:00
betalars 980d160fae misc updates 2024-10-18 18:12:40 +02:00
betalars ab366420dd room initialisation enhancements 2024-10-18 18:10:51 +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 2972ee0ad6 misc 2024-10-02 01:33:58 +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 c2d3ce2265 adding thunder and video settings 2024-09-27 22:02:28 +02:00
betalars 77fa8bc19f converting more objects to lfs 2024-09-23 10:25:13 +02:00
betalars eecfae5e81 Git LFS shenanigans 2024-09-19 13:12:43 +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 540cbd913b macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +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 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 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 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 50732ae525 tweaking minimum sizes of popups to accomondate theme 2024-02-11 22:33:34 +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 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 4d76db1261 Merge commit '98e28cca1cefaedb601c0554b4444a7a723871cd' into amaze-hotfixes 2024-02-02 16:47:11 +01:00
betalars 2e7c286079 res shenanigans 2024-02-01 22:41:00 +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
betalars 17516068df fixing missing window frames 2023-11-02 12:55:39 +01:00
betalars f236a764a6 misc polish 2023-08-30 11:12:47 +02:00
betalars 11570409b5 adding realistic window resource 2023-08-30 11:03:56 +02:00
betalars 247f5a99f7 adding card game graphics 2023-08-21 08:40:25 +02:00
betalars 246e7f9fab creating outside environemnt 2023-08-06 00:03:26 +02:00
betalars 68cc589bff celaning up error sources 2023-08-01 11:01:52 +02:00
betalars 221fc5e9af adding provisionary init function, wip 2023-07-19 22:43:00 +02:00
betalars 5e751d7fe6 final youth room changes 2023-07-19 13:55:04 +02:00
betalars 2ae99f087b resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars bc38a177d5 cleaning up scenes 2023-07-18 14:47:59 +02:00
betalars 15fea8330d weird texture diff 2023-07-18 11:34:29 +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 25bb0091d9 scene update 2023-07-16 00:58:54 +02:00
betalars 716648d29c firther room integration 2023-07-15 01:11:34 +02:00
betalars c08173dd06 cleaining up player animation and ladder behavior 2023-07-13 20:59:10 +02:00
betalars 97fbfce1ee implementing signaling and staging, wip 2023-07-13 16:16:42 +02:00
betalars 7b21cbfa10 stage management updates 2023-07-13 16:14:40 +02:00
betalars 5484c47904 shader tweaking 2023-07-13 16:11:44 +02:00
betalars b2794bdcc7 adding jui jitsu scene to room 2023-07-12 18:48:51 +02:00
betalars 350ba65a08 adding foundations to Soundterack 2023-07-12 18:46:19 +02:00
betalars 8f53ed664d refactor: changing focus naming convention to stage based metaphor 2023-07-11 15:27:44 +02:00
betalars ae3d2f6686 naming updates, hiding unused ui eleemnts in animation 2023-07-11 10:58:51 +02:00
betalars d81168fdbf cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars d20c0c4ae6 removing the audio stream that blew up the scene 2023-07-11 01:02:38 +02:00
betalars 67d7fb76b6 restructuring youth scene 2023-07-11 00:58:17 +02:00
betalars b1036212cf changing light range of desk to brigthen room 2023-07-10 19:19:01 +02:00
betalars df4673ce40 Updating Room colission, lighting overhaul, tweaking starting perspective 2023-07-10 16:20:37 +02:00
betalars 971ffb472d tweaking starlight shader 2023-07-10 16:19:40 +02:00
betalars 3ea69b7a7b fixing light probe settings (interior is not appropriate for our use case) 2023-07-09 22:26:05 +02:00
betalars 1e7866b5f5 room lighting updates 2023-07-08 22:06:34 +02:00
betalars 229b686ca9 updating lava lamp name 2023-07-08 22:04:07 +02:00
betalars 964c24dcea changing lava lamp scene to correct one ... 2023-07-05 23:54:05 +02:00
betalars 9064b84e65 room lighting overhaul 2023-07-05 23:34:15 +02:00
betalars 510c121568 porting starlight shader to godot4 2023-07-05 23:34:15 +02:00
betalars 39b5cb5757 finalizing lava lamp 2023-07-05 23:34:15 +02:00
betalars cbef24495c start re-importing starlight shader 2023-07-05 23:34:15 +02:00
betalars 5f16a4e555 updating room lighting, wip 2023-07-05 23:34:14 +02:00
betalars 7dd7a9bdc4 privosionary lava mesh 2023-07-05 23:34:14 +02:00
betalars 76f265cf67 adding starlight projector target material 2023-07-05 23:34:13 +02:00
betalars 8ba78560d0 creating LavaLamp mesh 2023-07-05 23:34:12 +02:00
betalars 99c19807f2 creating lavalamp wobble shader 2023-07-05 23:34:12 +02:00
betalars 36529e8208 update room handle state management 2023-06-25 23:49:36 +02:00
betalars 0fa2cae3a4 provisionary importing mask into player controller and youth room, WIP 2023-06-25 23:49:02 +02:00
betalars 07cae4619d changes to state management, probably in need of refactoring 2023-05-18 09:40:52 +02:00
betalars e1c93f7be0 Changed Focus Handling to que-based pattern, WIP 2023-04-22 15:11:10 +02:00
betalars 8eedcc6752 Importing new voice Lines 2023-04-22 15:08:35 +02:00
betalars c9cbe4f8c1 Changes to main scenes to accomondate focus 2023-04-15 16:07:01 +02:00
betalars 18eeea5539 fixed glich, where you'd get stuck below when you've missed your chance at going up with the ladder 2023-03-27 19:44:01 +02:00
betalars 6c3260eaf1 created particle system to indicate missing objects 2023-03-27 19:18:48 +02:00
betalars 16b4c36f26 added states to room handle, may get depricated 2023-03-27 00:29:25 +02:00
betalars f29abf03b8 introduced FPS cap 2023-03-21 23:06:45 +01:00
betalars 0035f97307 start implementing scenery-ui 2023-03-15 14:27:04 +01:00
betalars b67ca9e328 starting work on Main Menu, theming improvements 2023-03-13 13:15:43 +01:00
betalars bbad43efc1 Importing Audio to youth Room, WIP 2023-03-13 13:15:23 +01:00
betalars 38e4f25dea Developing theming for a11y settings, initialising blobal state singleton 2023-03-09 22:54:22 +01:00
betalars 63397c7424 tweaking Material Paths, importing audio, misc room improvements 2023-03-06 15:07:49 +01:00
betalars 82f96f7049 started building theme for Startup-Sreen 2023-03-06 15:06:05 +01:00
betalars 05128b69be reimporting youth_room 2023-03-04 18:21:00 +01:00
betalars cfe003584b Youth Room Import and Lighting (broken) 2023-03-04 18:14:27 +01:00