Commit Graph

954 Commits

Author SHA1 Message Date
betalars ff0685fdb8 Merge branch 'main' of gitlab.com:betalars/frame-of-mind 2023-07-18 11:34:33 +02:00
betalars 30034ba63e weird texture diff 2023-07-18 11:34:29 +02:00
betalars d4b5a40aae adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars 16c8c9ad7d add group sharing to postit 2023-07-18 00:13:33 +02:00
betalars 3754cfd786 finalising board of devs 2023-07-18 00:13:17 +02:00
Adrian Schmid 2bc61fc105 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-17 19:00:30 +02:00
Adrian Schmid 4c39faab82 accessibility menu: added function for screenreader toggle 2023-07-17 19:00:17 +02:00
betalars e0dda4be1a imprioving stage complience for player 2023-07-17 14:16:12 +02:00
betalars 29ff7fecf1 card updates 2023-07-17 14:15:40 +02:00
betalars 16c264d8f2 updating audio, importing draeven scene 2023-07-17 14:14:54 +02:00
betalars 092093db6d tracking igg with lfs 2023-07-17 14:13:07 +02:00
betalars 78173f7197 tracking exr with git lfs 2023-07-17 14:12:44 +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 3bb9405e02 importing luna 2023-07-17 14:09:24 +02:00
betalars f73068964f tweaking promo assets 2023-07-17 14:07:27 +02:00
betalars e669e3bda3 Merge commit '56ab26d1d6253d2385c47fa914e692124512bf65' 2023-07-16 01:13:13 +02:00
betalars c9b2f017dd res update? 2023-07-16 00:59:56 +02:00
betalars c090c55c3b configuring startin sequence, wip 2023-07-16 00:59:33 +02:00
betalars 5d3f644424 scene update 2023-07-16 00:58:54 +02:00
betalars d5d7675ea7 adding thank you and disclaimer screen 2023-07-16 00:58:29 +02:00
betalars 91ebfe7b45 adding icons 2023-07-15 18:09:38 +02:00
Adrian Schmid 004a6096d9 add label to display if the board is empty 2023-07-15 16:04:41 +02:00
Adrian Schmid cb10015e9d added quick tween to post its which are attached to cards or returned to the panels 2023-07-15 15:59:22 +02:00
Adrian Schmid cc3f418aa8 post its now float beneath the card they are going to be attached to 2023-07-15 15:26:14 +02:00
betalars de8d645336 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
Adrian Schmid e026722b8c fix: avoid putting post-its on post-its + prevent putting post-its on card with post-its already attached 2023-07-15 14:25:40 +02:00
Adrian Schmid 4d8101e50c fix: sorting was not applied + context was not switched correctly 2023-07-15 14:09:41 +02:00
betalars 066ed6064e wip: restructuring card board so it can handle being empty 2023-07-15 13:05:47 +02:00
betalars 0fbf83e45b fix: cards don"t push each other when highlited 2023-07-15 13:05:08 +02:00
betalars 8c70da59b8 fix: cards now only avoid each other and card colliders 2023-07-15 11:50:24 +02:00
betalars 19782fb26d limiting view layers for player camera 2023-07-15 11:10:29 +02:00
betalars 2cdcd0e9f8 firther room integration 2023-07-15 01:11:34 +02:00
betalars d6ffef1542 improving billboard function of collectables 2023-07-15 01:09:29 +02:00
betalars e45e33b96c integrating card_picker script with room scene 2023-07-15 01:08:42 +02:00
betalars 57dc2b2075 cleaning up collectables scene 2023-07-15 01:07:29 +02:00
betalars 8ea0465869 adding more promo images 2023-07-15 01:06:14 +02:00
Adrian Schmid bd98149eb4 adding borders to keep cards on board 2023-07-14 22:41:32 +02:00
Adrian Schmid b7f273d987 scene update 2023-07-14 22:05:42 +02:00
Adrian Schmid ef64abf7a7 improve detaching post its 2023-07-14 22:03:09 +02:00
Adrian Schmid 1314d351f3 do the same for post-its 2023-07-14 21:36:20 +02:00
Adrian Schmid d8195ec3df improved card handling 2023-07-14 21:20:04 +02:00
Adrian Schmid b2fc23c674 spawning panels by the amount of post its 2023-07-14 21:19:44 +02:00
Adrian Schmid 9edee017fc Revert "adding state handling to post_its"
This reverts commit 7fb7be47a8.
2023-07-14 19:15:15 +02:00
Adrian Schmid c41e646cef Revert "adding stage handling to card"
This reverts commit 1060f7815f.
2023-07-14 19:15:00 +02:00
Adrian Schmid 3416617733 moved bouncy card code to card 2023-07-14 19:13:08 +02:00
Adrian Schmid 88625677f1 Merge branch 'main' into adi_dev 2023-07-14 18:13:35 +02:00
Adrian Schmid 2209571982 new variables for global state 2023-07-14 18:12:17 +02:00
Adrian Schmid a04904e952 meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars 449c77d375 did I mention it is too hot? 2023-07-14 15:39:44 +02:00