Commit Graph

267 Commits

Author SHA1 Message Date
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 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 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
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
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 0b3e13cef2 it is just too hot 2023-07-14 15:37:38 +02:00
betalars 98d491b1cd creating a default bug report template 2023-07-14 15:29:53 +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 bc69c1884b typo 2023-07-13 16:14:53 +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 5e8991f86e Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +02:00
betalars 8930acdcc9 adding jui jitsu scene to room 2023-07-12 18:48:51 +02:00
betalars 6a511998cf fixme: Updating void card logic 2023-07-12 18:48:18 +02:00
betalars 748bdc9830 fixing void card 2023-07-12 18:47:31 +02:00
betalars cad40ed7d4 adding foundations to Soundterack 2023-07-12 18:46:19 +02:00
betalars d78ab09240 fixme: setting on stage property of board children when stage is set 2023-07-12 10:22:06 +02:00
betalars c58f4c0983 adding state handling to post_its 2023-07-11 23:49:27 +02:00
betalars 268831f79d adding stage handling to card 2023-07-11 23:13:04 +02:00
betalars 488750ef22 updating board of devs 2023-07-11 23:12:00 +02:00
betalars c5d60035b0 refactor: changing focus naming convention to stage based metaphor 2023-07-11 15:27:44 +02:00
betalars 7103dc14f1 adding focus handling to card board 2023-07-11 15:04:46 +02:00
betalars 63062ca249 physics board cleanup 2023-07-11 15:03:35 +02:00
betalars bfc59fe7b1 disabling mouse filter when not focused 2023-07-11 11:00:47 +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 78d05e6d21 disabling blender import to get rid of warning 2023-07-10 19:18:07 +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 6df0f24009 declaring scene enums (WIP) 2023-07-09 22:27:07 +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 6ce8da9e78 removing rotations from physics board ... 2023-07-08 22:07:24 +02:00
betalars c24a16dd83 room lighting updates 2023-07-08 22:06:34 +02:00
betalars 033e77d1b6 fixing error handling when focus list is empty 2023-07-08 22:06:06 +02:00
betalars 66b113c471 start using input instead of unhandled input for player, reducing jitter strength 2023-07-08 22:05:18 +02:00
betalars 82b9533600 updating lava lamp name 2023-07-08 22:04:07 +02:00
betalars f87196375c adding fps counter to main scene 2023-07-08 22:03:39 +02:00
betalars cabdd5c41e changing lava lamp scene to correct one ... 2023-07-05 23:54:05 +02:00
betalars c25ffb689c updating card picker scene for new cards 2023-07-05 23:34:15 +02:00
betalars 67c49fc957 card picker now hides itself while not having focus 2023-07-05 23:34:15 +02:00
betalars 3440c2f81d card picker will now emit a signal and drop focus when finished 2023-07-05 23:34:15 +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 8803ca8637 resetting testing scene 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 dc420490a3 assembling lava lamp in test scene 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 23243103cd removing debug options 2023-07-05 23:34:12 +02:00
betalars caa2cf06bc creating lavalamp wobble shader 2023-07-05 23:34:12 +02:00
betalars c26266dc15 Merge remote-tracking branch 'origin/new-card-board' 2023-07-03 21:47:38 +02:00
Adrian Schmid 7e757c15bc populate_board() to spawn cards/postits 2023-07-03 20:27:09 +02:00
Adrian Schmid cfd87e0183 keyboard controls for the card board 2023-07-02 15:10:33 +02:00
Adrian Schmid d8b981f1c0 prevent putting multiple post its on one card 2023-07-02 11:50:19 +02:00
Adrian Schmid 052d56175f reset rot./scale after removing post it from card 2023-07-02 11:01:04 +02:00
Adrian Schmid 686f7529dc improved area movement 2023-07-02 10:42:58 +02:00
Adrian Schmid 0c215c882f remove dragableType and replace it with meta-type 2023-07-02 10:19:15 +02:00
Adrian Schmid c1981d11a7 moved dictionary populating to its own function 2023-07-02 10:11:54 +02:00
Adrian Schmid 9cec5719d5 added func to sort dict entries on y pos 2023-07-01 16:59:13 +02:00
Adrian Schmid cd2b4e3663 add logic to attach post-its to cards 2023-07-01 16:03:22 +02:00
Adrian Schmid a9d1bb0db8 added same handling for cards + anchor for postIts 2023-07-01 15:20:50 +02:00