Commit Graph

228 Commits

Author SHA1 Message Date
betalars ffdf75efe4 Merge commit 'cdcb3c618e8169a74a4e9f60e6fa0869b91ec05f' into development 2025-04-13 19:31:39 +02:00
betalars d84bd63def WIP implement temporary workaround 2025-04-04 23:17:31 +02:00
betalars 2b60cb943c fix spelling mistakes in i18n
(cherry picked from commit 2182df5210)
2025-03-31 13:04:26 +02:00
betalars 004c4ed477 fix spelling mistakes in i18n 2025-03-31 12:59:35 +02:00
betalars 2239627905 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 c4f65843d3 godot weirdness 2025-03-28 18:19:21 +01:00
betalars 60be14ec01 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars 14edb234f3 cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 2a2a33f177 resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars 320949ec9d remove warning when Skip Control is accessed in engine 2025-03-23 14:52:45 +01:00
betalars d1b5576892 misc 2025-03-23 14:32:24 +01:00
betalars 4421dc6462 version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars 5d1185f36e resolve sync issues 2025-03-03 17:39:20 +01:00
betalars 8bdc9d627c misc small updates 2025-02-24 16:14:53 +01:00
betalars ebae4f6e3a create foam and include graffiti in first station 2025-02-24 16:09:51 +01:00
betalars e6b3e174f7 WIP: adding new subway map 2025-02-24 15:58:43 +01:00
betalars c077162d12 WIP: adding two new graffiti for subway 2025-02-24 15:56:52 +01:00
betalars 006d346354 meep 2025-02-06 19:11:05 +01:00
betalars c64f18bcc2 rework sequence handling 2025-02-06 18:55:05 +01:00
betalars 907a4f90db WIP: create, modify and import assets for transition scene 2025-01-16 17:39:03 +01:00
betalars faccf301ff ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars 475b052b71 Adding provisionary showroom-scene for events and trailers and stuff 2025-01-16 14:47:06 +01:00
betalars 76fecbb139 misc updates 2024-10-18 18:12:40 +02:00
betalars 58184d0d56 room initialisation enhancements 2024-10-18 18:10:51 +02:00
betalars 46aa31d081 implement room initialising from savegame, enhancing room calling strucutre 2024-10-06 11:38:15 +02:00
betalars a2ddd18c0b misc code cleanup 2024-10-06 11:31:47 +02:00
betalars 9b751dcd5b misc 2024-10-02 01:33:58 +02:00
betalars 59b1c0b17f tab space conversion 2024-10-02 01:31:33 +02:00
betalars bf69857ba3 introducing dynamic scene loading, main scene rework 2024-10-02 01:30:03 +02:00
betalars 61a385070c adding thunder and video settings 2024-09-27 22:02:28 +02:00
betalars fce01abffe converting more objects to lfs 2024-09-23 10:25:13 +02:00
betalars d07caaa947 Git LFS shenanigans 2024-09-19 13:12:43 +02:00
betalars 7c84e9db2c enhancing material naming convention and texture references for youth room 2024-09-19 12:31:49 +02:00
betalars 1a8843c895 resolving upgrade regressions 2024-09-19 12:29:35 +02:00
betalars 1a73b247f8 macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars b3676b63e6 WIP material reference updates to youch_room 2024-09-16 17:02:35 +02:00
betalars 8ca1af6ab2 more misc 2024-09-15 15:54:02 +02:00
betalars bd996eb2ba misc 2024-09-15 15:50:21 +02:00
betalars af3f2b8d3a Updating of rez files 2024-09-15 12:39:47 +02:00
betalars 9454a20d79 moving on 2024-09-15 11:30:31 +02:00
betalars 295897d82d version bump 2024-09-15 11:15:36 +02:00
betalars ffd9be413a material import, lighting tests 2024-02-19 00:23:41 +01:00
betalars f83b5a718b WIP: importing assets for volunteer room 2024-02-18 02:03:42 +01:00
betalars 9d19480125 Merge branch 'amaze-hotfixes' of gitlab.com:betalars/frame-of-mind into amaze-hotfixes 2024-02-17 23:33:06 +01:00
betalars a001dedec5 room polishes 2024-02-17 23:27:30 +01:00
betalars 78f37023f8 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 c72ee61d19 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars 560e525f6b fixme: disabling player upon load to prevent illegal state in main menu 2024-02-12 01:16:22 +01:00
betalars ae12e60c4d improved state handling in card picker, implemented animation skipping 2024-02-12 00:24:13 +01:00
betalars e725316c46 tweaking minimum sizes of popups to accomondate theme 2024-02-11 22:33:34 +01:00
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 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 7109a8d0e3 Merge commit '98e28cca1cefaedb601c0554b4444a7a723871cd' into amaze-hotfixes 2024-02-02 16:47:11 +01:00
betalars daafbfad90 res shenanigans 2024-02-01 22:41:00 +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
betalars c808773ea5 fixing missing window frames 2023-11-02 12:55:39 +01:00
betalars 8cd3e1c9a1 misc polish 2023-08-30 11:12:47 +02:00
betalars 16e52e5ad9 adding realistic window resource 2023-08-30 11:03:56 +02:00
betalars 50ead5cb0b adding card game graphics 2023-08-21 08:40:25 +02:00
betalars 8cbf5c7f17 creating outside environemnt 2023-08-06 00:03:26 +02:00
betalars 960bc3304d celaning up error sources 2023-08-01 11:01:52 +02:00
betalars 3376292691 adding provisionary init function, wip 2023-07-19 22:43:00 +02:00
betalars f1d1c8903c final youth room changes 2023-07-19 13:55:04 +02:00
betalars 50651b3438 resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars 713211743a cleaning up scenes 2023-07-18 14:47:59 +02:00
betalars 30034ba63e weird texture diff 2023-07-18 11:34:29 +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 5d3f644424 scene update 2023-07-16 00:58:54 +02:00
betalars 2cdcd0e9f8 firther room integration 2023-07-15 01:11:34 +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 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 8930acdcc9 adding jui jitsu scene to room 2023-07-12 18:48:51 +02:00
betalars cad40ed7d4 adding foundations to Soundterack 2023-07-12 18:46:19 +02:00
betalars c5d60035b0 refactor: changing focus naming convention to stage based metaphor 2023-07-11 15:27:44 +02:00
betalars 720d871453 naming updates, hiding unused ui eleemnts in animation 2023-07-11 10:58:51 +02:00
betalars 41a9b0954f cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars ba0af1f99b removing the audio stream that blew up the scene 2023-07-11 01:02:38 +02:00
betalars da14e1f1fc restructuring youth scene 2023-07-11 00:58:17 +02:00
betalars b2a79283ca changing light range of desk to brigthen room 2023-07-10 19:19:01 +02:00
betalars 0268b1da2c Updating Room colission, lighting overhaul, tweaking starting perspective 2023-07-10 16:20:37 +02:00
betalars 221906ac37 tweaking starlight shader 2023-07-10 16:19:40 +02:00
betalars d20ceb4fd4 fixing light probe settings (interior is not appropriate for our use case) 2023-07-09 22:26:05 +02:00
betalars c24a16dd83 room lighting updates 2023-07-08 22:06:34 +02:00
betalars 82b9533600 updating lava lamp name 2023-07-08 22:04:07 +02:00
betalars cabdd5c41e changing lava lamp scene to correct one ... 2023-07-05 23:54:05 +02:00
betalars 7c3814cbb9 room lighting overhaul 2023-07-05 23:34:15 +02:00
betalars a47b8506cc porting starlight shader to godot4 2023-07-05 23:34:15 +02:00
betalars c58f2fee33 finalizing lava lamp 2023-07-05 23:34:15 +02:00
betalars ef6ca4cba3 start re-importing starlight shader 2023-07-05 23:34:15 +02:00
betalars 82435a009e updating room lighting, wip 2023-07-05 23:34:14 +02:00
betalars a2e768a953 privosionary lava mesh 2023-07-05 23:34:14 +02:00
betalars e0fa89a1c2 adding starlight projector target material 2023-07-05 23:34:13 +02:00
betalars f94016851d creating LavaLamp mesh 2023-07-05 23:34:12 +02:00
betalars caa2cf06bc creating lavalamp wobble shader 2023-07-05 23:34:12 +02:00
betalars 92c7f1b15a update room handle state management 2023-06-25 23:49:36 +02:00
betalars 06b045f6a1 provisionary importing mask into player controller and youth room, WIP 2023-06-25 23:49:02 +02:00
betalars 01e8e36985 changes to state management, probably in need of refactoring 2023-05-18 09:40:52 +02:00
betalars 46ca9df1e3 Changed Focus Handling to que-based pattern, WIP 2023-04-22 15:11:10 +02:00
betalars 99b1c8b6ca Importing new voice Lines 2023-04-22 15:08:35 +02:00
betalars 952641ad69 Changes to main scenes to accomondate focus 2023-04-15 16:07:01 +02:00
betalars ecd5889bf6 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 3ac28ad7c8 created particle system to indicate missing objects 2023-03-27 19:18:48 +02:00
betalars 8d58782a66 added states to room handle, may get depricated 2023-03-27 00:29:25 +02:00
betalars 4148f4b2dd introduced FPS cap 2023-03-21 23:06:45 +01:00
betalars 6135f77856 start implementing scenery-ui 2023-03-15 14:27:04 +01:00
betalars 7f287f8b0d starting work on Main Menu, theming improvements 2023-03-13 13:15:43 +01:00
betalars b856f241cf Importing Audio to youth Room, WIP 2023-03-13 13:15:23 +01:00
betalars 47c64d8fd9 Developing theming for a11y settings, initialising blobal state singleton 2023-03-09 22:54:22 +01:00
betalars d80d81283b tweaking Material Paths, importing audio, misc room improvements 2023-03-06 15:07:49 +01:00
betalars 6644d8bcc1 started building theme for Startup-Sreen 2023-03-06 15:06:05 +01:00
betalars aa4d12713a reimporting youth_room 2023-03-04 18:21:00 +01:00
betalars b6dd29a8e7 Youth Room Import and Lighting (broken) 2023-03-04 18:14:27 +01:00