Commit Graph

257 Commits

Author SHA1 Message Date
betalars b5924fdd8b adding thank you and disclaimer screen 2023-07-16 00:58:29 +02:00
Adrian Schmid 56ab26d1d6 add label to display if the board is empty 2023-07-15 16:04:41 +02:00
Adrian Schmid 7de83600f5 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 d93858c122 post its now float beneath the card they are going to be attached to 2023-07-15 15:26:14 +02:00
betalars 7404c172bd 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 042fedd6a8 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 45b1fe3f14 fix: sorting was not applied + context was not switched correctly 2023-07-15 14:09:41 +02:00
betalars 44a5d653fb wip: restructuring card board so it can handle being empty 2023-07-15 13:05:47 +02:00
betalars fc1cd50430 fix: cards don"t push each other when highlited 2023-07-15 13:05:08 +02:00
betalars d215ba58d5 fix: cards now only avoid each other and card colliders 2023-07-15 11:50:24 +02:00
betalars 2a903381d7 limiting view layers for player camera 2023-07-15 11:10:29 +02:00
betalars 716648d29c firther room integration 2023-07-15 01:11:34 +02:00
betalars 2ead9e7a3e improving billboard function of collectables 2023-07-15 01:09:29 +02:00
betalars baf07a3269 integrating card_picker script with room scene 2023-07-15 01:08:42 +02:00
betalars 56f36b0148 cleaning up collectables scene 2023-07-15 01:07:29 +02:00
Adrian Schmid 2af5d11966 adding borders to keep cards on board 2023-07-14 22:41:32 +02:00
Adrian Schmid b2f944379e scene update 2023-07-14 22:05:42 +02:00
Adrian Schmid 381377d51a improve detaching post its 2023-07-14 22:03:09 +02:00
Adrian Schmid bc7c2d6b6d do the same for post-its 2023-07-14 21:36:20 +02:00
Adrian Schmid 4800acd15b improved card handling 2023-07-14 21:20:04 +02:00
Adrian Schmid 191882e991 spawning panels by the amount of post its 2023-07-14 21:19:44 +02:00
Adrian Schmid 1a21997e82 Revert "adding state handling to post_its"
This reverts commit 7fb7be47a8.
2023-07-14 19:15:15 +02:00
Adrian Schmid 181f6a7e26 Revert "adding stage handling to card"
This reverts commit 1060f7815f.
2023-07-14 19:15:00 +02:00
Adrian Schmid 7f542c3412 moved bouncy card code to card 2023-07-14 19:13:08 +02:00
Adrian Schmid df9018ec9e Merge branch 'main' into adi_dev 2023-07-14 18:13:35 +02:00
Adrian Schmid de9d5925db new variables for global state 2023-07-14 18:12:17 +02:00
Adrian Schmid 6da3c847ba meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars 1dee802a7a it is just too hot 2023-07-14 15:37:38 +02:00
betalars efeea078c0 creating a default bug report template 2023-07-14 15:29:53 +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 0bf60900af typo 2023-07-13 16:14:53 +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 04c76c614d Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +02:00
betalars b2794bdcc7 adding jui jitsu scene to room 2023-07-12 18:48:51 +02:00
betalars ce2f6af8f8 fixme: Updating void card logic 2023-07-12 18:48:18 +02:00
betalars fc85ba656b fixing void card 2023-07-12 18:47:31 +02:00
betalars 350ba65a08 adding foundations to Soundterack 2023-07-12 18:46:19 +02:00
betalars aa34c2e93a fixme: setting on stage property of board children when stage is set 2023-07-12 10:22:06 +02:00
betalars 7fb7be47a8 adding state handling to post_its 2023-07-11 23:49:27 +02:00
betalars 1060f7815f adding stage handling to card 2023-07-11 23:13:04 +02:00
betalars 1d8d0f76ec updating board of devs 2023-07-11 23:12:00 +02:00
betalars 8f53ed664d refactor: changing focus naming convention to stage based metaphor 2023-07-11 15:27:44 +02:00
betalars 67cde4ca17 adding focus handling to card board 2023-07-11 15:04:46 +02:00
betalars 079150aa10 physics board cleanup 2023-07-11 15:03:35 +02:00
betalars ef474d1dad disabling mouse filter when not focused 2023-07-11 11:00:47 +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 6ee0cff156 disabling blender import to get rid of warning 2023-07-10 19:18:07 +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 fa8dac7748 declaring scene enums (WIP) 2023-07-09 22:27:07 +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 7d03adf717 removing rotations from physics board ... 2023-07-08 22:07:24 +02:00
betalars 1e7866b5f5 room lighting updates 2023-07-08 22:06:34 +02:00
betalars 2ae327339b fixing error handling when focus list is empty 2023-07-08 22:06:06 +02:00
betalars c31778b314 start using input instead of unhandled input for player, reducing jitter strength 2023-07-08 22:05:18 +02:00
betalars 229b686ca9 updating lava lamp name 2023-07-08 22:04:07 +02:00
betalars 6e9016f096 adding fps counter to main scene 2023-07-08 22:03:39 +02:00
betalars 964c24dcea changing lava lamp scene to correct one ... 2023-07-05 23:54:05 +02:00
betalars 8c029f0684 updating card picker scene for new cards 2023-07-05 23:34:15 +02:00
betalars 91e8739322 card picker now hides itself while not having focus 2023-07-05 23:34:15 +02:00
betalars 32f02117bb card picker will now emit a signal and drop focus when finished 2023-07-05 23:34:15 +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 ea1c88a0cd resetting testing scene 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 c43bfb3291 assembling lava lamp in test scene 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 9c7381bdeb removing debug options 2023-07-05 23:34:12 +02:00
betalars 99c19807f2 creating lavalamp wobble shader 2023-07-05 23:34:12 +02:00
betalars 130230e2d3 Merge remote-tracking branch 'origin/new-card-board' 2023-07-03 21:47:38 +02:00
Adrian Schmid daf073c6b4 populate_board() to spawn cards/postits 2023-07-03 20:27:09 +02:00
Adrian Schmid bfd6649ce9 keyboard controls for the card board 2023-07-02 15:10:33 +02:00
Adrian Schmid 4be0471018 prevent putting multiple post its on one card 2023-07-02 11:50:19 +02:00
Adrian Schmid 0c8e3557ae reset rot./scale after removing post it from card 2023-07-02 11:01:04 +02:00
Adrian Schmid 72825ecae6 improved area movement 2023-07-02 10:42:58 +02:00
Adrian Schmid 45fb225e54 remove dragableType and replace it with meta-type 2023-07-02 10:19:15 +02:00
Adrian Schmid c2188316ab moved dictionary populating to its own function 2023-07-02 10:11:54 +02:00
Adrian Schmid 5c88414c48 added func to sort dict entries on y pos 2023-07-01 16:59:13 +02:00
Adrian Schmid 4a0eddf3e9 add logic to attach post-its to cards 2023-07-01 16:03:22 +02:00
Adrian Schmid ca65c69fdc added same handling for cards + anchor for postIts 2023-07-01 15:20:50 +02:00
Adrian Schmid ea67614da2 moved drag handling to board to avoid issues 2023-07-01 15:19:54 +02:00
Adrian Schmid 00ca4abc1f card-board dictionary + move post-its to dropboard 2023-07-01 13:43:27 +02:00
Adrian Schmid 27d3497fde set anchor for post-it on card 2023-07-01 13:41:19 +02:00
betalars 41f638fe75 updating card scenes 2023-07-01 01:45:28 +02:00
betalars 6629abaf9a supressing editor rotation in card script 2023-07-01 01:41:13 +02:00
betalars 82501b1283 removing provisionary code 2023-07-01 01:19:40 +02:00
betalars af82bcc9b9 searching siblings to find a node that will take focus 2023-07-01 01:14:25 +02:00
betalars 8307380bf0 improving parsing and passing of mouse events 2023-07-01 00:18:40 +02:00
Adrian Schmid bbec8c4f25 fixed missing collider on cards 2023-07-01 00:18:40 +02:00
Adrian Schmid 47d4981d19 added dragging cards and post its with mouse input 2023-07-01 00:16:38 +02:00