Commit Graph

135 Commits

Author SHA1 Message Date
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 af6417d667 fix #113 resolving non-unique name 2025-04-27 12:33:11 +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 62227cd331 finish implementing saving and loading 2025-03-25 22:34:13 +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 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 c33959ee05 version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +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 9af5621ddf typo fix 2025-02-24 16:06:21 +01:00
betalars 29069f64d0 small fixes 2025-02-06 19:15:39 +01:00
betalars 118f2ad8ad rework sequence handling 2025-02-06 18:55:05 +01:00
betalars daa3c946de ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars a183b79106 initialising steam demo 2024-10-18 18:13:28 +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 0d1778fac5 implementing save games 2024-10-16 12:24:38 +02:00
betalars 44bc6bbed5 WIP: chaning save slot from 3 fixed slots to dynamic system 2024-10-07 11:23:19 +02:00
betalars 64ce1ab8d8 WIP: enhancing setting focus handling 2024-10-07 11:16:18 +02:00
betalars f8dba6133d implement room initialising from savegame, enhancing room calling strucutre 2024-10-06 11:38:15 +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 96f07a4943 WIP: specifying save file variables 2024-10-02 01:26:54 +02:00
betalars 382dd26fe2 resolving upgrade regressions 2024-09-19 12:29:35 +02:00
betalars b3d44a0216 macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars 4f4c36e781 moving on 2024-09-15 11:30:31 +02: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 c76f4ecca3 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars 43a2a2a441 testing animation behaviours 2024-02-11 22:34:34 +01:00
betalars 41b934f194 adding procedural sky to main scene 2024-02-03 22:00:13 +01:00
betalars c06c1e115c sky prototyping 2023-12-03 16:07:08 +01:00
betalars f820eb2f1e wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars 9d59d9c029 updating void card in dev board 2023-08-30 11:03:01 +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 02ec893a2c finalise cards 2023-07-19 22:42:05 +02:00
betalars 2e50009aee resolving some remaining group assignments 2023-07-19 13:53:24 +02:00
betalars bc7a81eece adding bilboard toggle 2023-07-19 13:49:48 +02:00
betalars 4a99dd7376 re-doing lost goup assignments 2023-07-18 23:25:27 +02:00
betalars 91ba021f79 fix missing group assignment 2023-07-18 15:52:24 +02:00
betalars c604843f16 finalising board of devs 2023-07-18 00:13:17 +02:00
betalars fd1350a41f card updates 2023-07-17 14:15:40 +02:00
betalars 90bd95a3d5 Merge branch 'adi_dev' into 'main'
finalising card board for alpha release

See merge request betalars/frame-of-mind!2
2023-07-15 13:06:07 +00:00
betalars e3ebd61f20 improving billboard function of collectables 2023-07-15 01:09:29 +02:00
Adrian Schmid d37f817cad scene update 2023-07-14 22:05:42 +02:00
betalars 035dc7f05b implementing signaling and staging, wip 2023-07-13 16:16:42 +02:00
betalars de0e1500a8 updating board of devs 2023-07-11 23:12:00 +02:00
betalars cbbc9639df cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars 6412c0bac7 resetting testing scene 2023-07-05 23:34:15 +02:00
betalars f10efb4496 assembling lava lamp in test scene 2023-07-05 23:34:14 +02:00
betalars d12ca45785 removing debug options 2023-07-05 23:34:12 +02:00
betalars 4ad3680d94 creating lavalamp wobble shader 2023-07-05 23:34:12 +02:00
betalars 97fe8a0bf4 updating card scenes 2023-07-01 01:45:28 +02:00
betalars ae76ebd474 rearranging board of devs following card update 2023-07-01 00:15:26 +02:00
betalars 787b9a4064 Revert "destructurising board of devs for easy child acess, this will get reverted"
This reverts commit 6bfead3573.
2023-07-01 00:14:25 +02:00
betalars c79a7044b5 destructurising board of devs for easy child acess, this will get reverted 2023-07-01 00:07:21 +02:00
betalars 10c769ecd6 godot weirdnes 2023-06-25 23:50:51 +02:00
betalars 916da9cbe9 Merge commit '6180c51f7c642b6f858c8f15912a00cada007968' into state_mangement 2023-05-28 22:39:23 +02:00
betalars 02b0a24130 "merge" void card into card 2023-05-28 16:18:26 +02:00
betalars e26a270202 add debug card set to board of devs 2023-05-28 15:17:23 +02:00
betalars 70c5dc17f7 cards ingest their compatible postits based on groups 2023-05-28 12:38:46 +02:00
betalars ff4fbf1ae1 tweaking some post-it wording, assinging postits to groups based on compatibility 2023-05-28 01:42:46 +02:00
betalars 50dfa9ae13 move animation test logic to dev-util 2023-05-24 13:47:53 +02:00
betalars 771a99fe6d finalising void card visuals 2023-05-19 15:26:27 +02:00
betalars 1b95187ba0 ingesting current draft of cards 2023-05-18 09:28:33 +02:00
betalars c88decbfc9 Changed Focus Handling to que-based pattern, WIP 2023-04-22 15:11:10 +02:00
betalars 9a28388184 added z-buffer based transparency to billboard particle shader 2023-04-22 15:10:28 +02:00
tilcreator da1bf34847 Add card board (wip) 2023-04-19 18:53:24 +02:00
betalars d3b88c37fe created particle system to indicate missing objects 2023-03-27 19:18:48 +02:00
betalars 531a970424 introduced FPS cap 2023-03-21 23:06:45 +01:00
betalars e8f54d4b37 Revert "accident"
This reverts commit 48c23c78cf.
2023-03-15 14:30:40 +01:00
betalars cceb2a23cc accident 2023-03-15 14:28:41 +01:00
betalars 3dfc59b530 starting work on Main Menu, theming improvements 2023-03-13 13:15:43 +01:00
betalars 7f51a8d744 Youth Room Import and Lighting (broken) 2023-03-04 18:14:27 +01:00