Commit Graph

409 Commits

Author SHA1 Message Date
betalars 33481c28e4 adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +02:00
betalars 91ba021f79 fix missing group assignment 2023-07-18 15:52:24 +02:00
betalars 17ca359b3b cards and posts will pass mouse events even when they are not draggable 2023-07-18 14:58:06 +02:00
betalars 26244f8259 fixing up issues with internal state handling and animation referencing 2023-07-18 14:48:28 +02:00
betalars 59636aa318 cleaning up scenes 2023-07-18 14:47:59 +02:00
betalars d7303004e9 Merge branch 'main' of gitlab.com:betalars/frame-of-mind 2023-07-18 11:34:33 +02:00
betalars 21e66f6f24 weird texture diff 2023-07-18 11:34:29 +02:00
betalars 25be37fc23 adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars c45b01bf65 add group sharing to postit 2023-07-18 00:13:33 +02:00
betalars c604843f16 finalising board of devs 2023-07-18 00:13:17 +02:00
Adrian Schmid 929bba5355 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-17 19:00:30 +02:00
Adrian Schmid 2ab816dda5 accessibility menu: added function for screenreader toggle 2023-07-17 19:00:17 +02:00
betalars 61b00722db imprioving stage complience for player 2023-07-17 14:16:12 +02:00
betalars fd1350a41f card updates 2023-07-17 14:15:40 +02:00
betalars af81d83ed9 updating audio, importing draeven scene 2023-07-17 14:14:54 +02:00
betalars 151754ba52 tracking igg with lfs 2023-07-17 14:13:07 +02:00
betalars 7ceb51d6a3 tracking exr with git lfs 2023-07-17 14:12:44 +02:00
betalars a14ff6d28a converting wall material to shader 2023-07-17 14:11:05 +02:00
betalars f5348f7e76 tweaking lava lamp 2023-07-17 14:10:23 +02:00
betalars 9f2a9ce05e importing luna 2023-07-17 14:09:24 +02:00
betalars 13153c9119 tweaking promo assets 2023-07-17 14:07:27 +02:00
betalars e06f233ddb Merge commit '56ab26d1d6253d2385c47fa914e692124512bf65' 2023-07-16 01:13:13 +02:00
betalars 54bb7df16f res update? 2023-07-16 00:59:56 +02:00
betalars 4aef8895a8 configuring startin sequence, wip 2023-07-16 00:59:33 +02:00
betalars 1ca363356b scene update 2023-07-16 00:58:54 +02:00
betalars a880b5c02a adding thank you and disclaimer screen 2023-07-16 00:58:29 +02:00
betalars 24f289f804 adding icons 2023-07-15 18:09:38 +02:00
Adrian Schmid 391e026e72 add label to display if the board is empty 2023-07-15 16:04:41 +02:00
Adrian Schmid ccad0811a8 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 adee139449 post its now float beneath the card they are going to be attached to 2023-07-15 15:26:14 +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
Adrian Schmid 88368e8ce8 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 c865a6bb0d fix: sorting was not applied + context was not switched correctly 2023-07-15 14:09:41 +02:00
betalars d5e0285bdc wip: restructuring card board so it can handle being empty 2023-07-15 13:05:47 +02:00
betalars ae6c50a79f fix: cards don"t push each other when highlited 2023-07-15 13:05:08 +02:00
betalars 535c334bee fix: cards now only avoid each other and card colliders 2023-07-15 11:50:24 +02:00
betalars a9b5a4887f limiting view layers for player camera 2023-07-15 11:10:29 +02:00
betalars dd6d2f92f2 firther room integration 2023-07-15 01:11:34 +02:00
betalars e3ebd61f20 improving billboard function of collectables 2023-07-15 01:09:29 +02:00
betalars 4580dffca9 integrating card_picker script with room scene 2023-07-15 01:08:42 +02:00
betalars 640aa1ccd0 cleaning up collectables scene 2023-07-15 01:07:29 +02:00
betalars f8375ad0b3 adding more promo images 2023-07-15 01:06:14 +02:00
Adrian Schmid bcf96349bd adding borders to keep cards on board 2023-07-14 22:41:32 +02:00
Adrian Schmid d37f817cad scene update 2023-07-14 22:05:42 +02:00
Adrian Schmid 477f23c904 improve detaching post its 2023-07-14 22:03:09 +02:00
Adrian Schmid ff8fe60b3b do the same for post-its 2023-07-14 21:36:20 +02:00
Adrian Schmid 81ff93d814 improved card handling 2023-07-14 21:20:04 +02:00
Adrian Schmid 0e37f8ad8b spawning panels by the amount of post its 2023-07-14 21:19:44 +02:00
Adrian Schmid a019fe937f Revert "adding state handling to post_its"
This reverts commit 7fb7be47a8.
2023-07-14 19:15:15 +02:00
Adrian Schmid 9890a23819 Revert "adding stage handling to card"
This reverts commit 1060f7815f.
2023-07-14 19:15:00 +02:00