Commit Graph

377 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 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 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 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
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
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
Adrian Schmid 61963569fd moved bouncy card code to card 2023-07-14 19:13:08 +02:00
Adrian Schmid d8ae4337ba Merge branch 'main' into adi_dev 2023-07-14 18:13:35 +02:00
Adrian Schmid be29b3aefb new variables for global state 2023-07-14 18:12:17 +02:00
Adrian Schmid 3969644ced meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars 152272ee80 it is just too hot 2023-07-14 15:37:38 +02:00
betalars 7ce5b6120b creating a default bug report template 2023-07-14 15:29:53 +02:00
betalars fb2c731e8c cleaining up player animation and ladder behavior 2023-07-13 20:59:10 +02:00
betalars 035dc7f05b implementing signaling and staging, wip 2023-07-13 16:16:42 +02:00
betalars 2301cd8d3b typo 2023-07-13 16:14:53 +02:00
betalars 1dc75e4b22 stage management updates 2023-07-13 16:14:40 +02:00
betalars ca0fae5f09 shader tweaking 2023-07-13 16:11:44 +02:00
betalars c94ed3dfa3 Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +02:00
betalars 285dc4228d adding jui jitsu scene to room 2023-07-12 18:48:51 +02:00
betalars e761c38a0a fixme: Updating void card logic 2023-07-12 18:48:18 +02:00
betalars 5943ac7f45 fixing void card 2023-07-12 18:47:31 +02:00
betalars bd53394d6e adding foundations to Soundterack 2023-07-12 18:46:19 +02:00
betalars fa0b130523 fixme: setting on stage property of board children when stage is set 2023-07-12 10:22:06 +02:00
betalars c951d525e4 adding state handling to post_its 2023-07-11 23:49:27 +02:00
betalars 1e83e05ac4 adding stage handling to card 2023-07-11 23:13:04 +02:00
betalars de0e1500a8 updating board of devs 2023-07-11 23:12:00 +02:00
betalars b01ccfaeff refactor: changing focus naming convention to stage based metaphor 2023-07-11 15:27:44 +02:00
betalars a56870bdde adding focus handling to card board 2023-07-11 15:04:46 +02:00
betalars 982d061870 physics board cleanup 2023-07-11 15:03:35 +02:00
betalars d78e4caede disabling mouse filter when not focused 2023-07-11 11:00:47 +02:00
betalars 2c6f9c93f0 naming updates, hiding unused ui eleemnts in animation 2023-07-11 10:58:51 +02:00
betalars cbbc9639df cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars 27b58b16d1 removing the audio stream that blew up the scene 2023-07-11 01:02:38 +02:00
betalars 66d176ccfd restructuring youth scene 2023-07-11 00:58:17 +02:00
betalars 018e3ec126 changing light range of desk to brigthen room 2023-07-10 19:19:01 +02:00
betalars 5a63cb504a disabling blender import to get rid of warning 2023-07-10 19:18:07 +02:00
betalars 79b8b09df4 Updating Room colission, lighting overhaul, tweaking starting perspective 2023-07-10 16:20:37 +02:00
betalars 8838cb3e5e tweaking starlight shader 2023-07-10 16:19:40 +02:00
betalars 0059839848 declaring scene enums (WIP) 2023-07-09 22:27:07 +02:00
betalars 32c8128071 fixing light probe settings (interior is not appropriate for our use case) 2023-07-09 22:26:05 +02:00
betalars 132ec8950b removing rotations from physics board ... 2023-07-08 22:07:24 +02:00
betalars 224653732c room lighting updates 2023-07-08 22:06:34 +02:00
betalars 7c6e7fd6c4 fixing error handling when focus list is empty 2023-07-08 22:06:06 +02:00
betalars aba0a85235 start using input instead of unhandled input for player, reducing jitter strength 2023-07-08 22:05:18 +02:00
betalars 2b5275f5de updating lava lamp name 2023-07-08 22:04:07 +02:00
betalars f845940838 adding fps counter to main scene 2023-07-08 22:03:39 +02:00
betalars 584b7d3e2b changing lava lamp scene to correct one ... 2023-07-05 23:54:05 +02:00
betalars 11b18f420c updating card picker scene for new cards 2023-07-05 23:34:15 +02:00
betalars 12eec4c5ef card picker now hides itself while not having focus 2023-07-05 23:34:15 +02:00
betalars ccd1e1eeec card picker will now emit a signal and drop focus when finished 2023-07-05 23:34:15 +02:00
betalars 3551f99273 room lighting overhaul 2023-07-05 23:34:15 +02:00
betalars 428997fcc5 porting starlight shader to godot4 2023-07-05 23:34:15 +02:00
betalars 6412c0bac7 resetting testing scene 2023-07-05 23:34:15 +02:00
betalars a5c9b84d9b finalizing lava lamp 2023-07-05 23:34:15 +02:00
betalars 3dbc4515b8 start re-importing starlight shader 2023-07-05 23:34:15 +02:00
betalars da58fe5617 updating room lighting, wip 2023-07-05 23:34:14 +02:00
betalars f10efb4496 assembling lava lamp in test scene 2023-07-05 23:34:14 +02:00
betalars 48075a2a86 privosionary lava mesh 2023-07-05 23:34:14 +02:00
betalars e62750dc37 adding starlight projector target material 2023-07-05 23:34:13 +02:00
betalars 0410680bcc creating LavaLamp mesh 2023-07-05 23:34:12 +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 54fe811f26 Merge remote-tracking branch 'origin/new-card-board' 2023-07-03 21:47:38 +02:00
Adrian Schmid ebd097cbfb populate_board() to spawn cards/postits 2023-07-03 20:27:09 +02:00
Adrian Schmid f03630b9cb keyboard controls for the card board 2023-07-02 15:10:33 +02:00
Adrian Schmid 7d81d27d2c prevent putting multiple post its on one card 2023-07-02 11:50:19 +02:00
Adrian Schmid 4aa1930646 reset rot./scale after removing post it from card 2023-07-02 11:01:04 +02:00
Adrian Schmid 1f707cacd5 improved area movement 2023-07-02 10:42:58 +02:00
Adrian Schmid aa30600100 remove dragableType and replace it with meta-type 2023-07-02 10:19:15 +02:00
Adrian Schmid 9d59e54bcc moved dictionary populating to its own function 2023-07-02 10:11:54 +02:00
Adrian Schmid a3fc38a127 added func to sort dict entries on y pos 2023-07-01 16:59:13 +02:00
Adrian Schmid 13dfadce6e add logic to attach post-its to cards 2023-07-01 16:03:22 +02:00
Adrian Schmid 7d5e8ae1bb added same handling for cards + anchor for postIts 2023-07-01 15:20:50 +02:00
Adrian Schmid 22bdae5be0 moved drag handling to board to avoid issues 2023-07-01 15:19:54 +02:00
Adrian Schmid 48aff75068 card-board dictionary + move post-its to dropboard 2023-07-01 13:43:27 +02:00
Adrian Schmid fcbaa208fa set anchor for post-it on card 2023-07-01 13:41:19 +02:00
betalars 97fe8a0bf4 updating card scenes 2023-07-01 01:45:28 +02:00
betalars d227b3e026 supressing editor rotation in card script 2023-07-01 01:41:13 +02:00
betalars ff6bd4fb31 removing provisionary code 2023-07-01 01:19:40 +02:00
betalars 9ba00d1b8e searching siblings to find a node that will take focus 2023-07-01 01:14:25 +02:00
betalars 93c1fbc768 improving parsing and passing of mouse events 2023-07-01 00:18:40 +02:00
Adrian Schmid 58174e5d02 fixed missing collider on cards 2023-07-01 00:18:40 +02:00
Adrian Schmid 85b881cc44 added dragging cards and post its with mouse input 2023-07-01 00:16:38 +02:00
betalars 45f5ff9cd8 adding mouse support for card picker, WIP 2023-07-01 00:15:26 +02:00
betalars b2205ac272 moving INI set, so it is set before ready 2023-07-01 00:15:26 +02:00
betalars d7e18beccb Claning up scene strucutre for cards and postIts 2023-07-01 00:15:26 +02:00
betalars f4f6e1363c changing random rotation offset to depend on card text 2023-07-01 00:15:26 +02:00
betalars 321fb9787d remove wiggle code not being used iin postIt 2023-07-01 00:15:26 +02:00
betalars ae76ebd474 rearranging board of devs following card update 2023-07-01 00:15:26 +02:00
betalars 74cb7b78b9 parody: adding highlight feature to postIt 2023-07-01 00:15:26 +02:00
betalars 6feed0d9e8 removing debug code 2023-07-01 00:15:26 +02:00
betalars 200e6ea4ec breaking: parody conversion of PostIt 2023-07-01 00:15:26 +02:00
betalars 4716ec3939 adding highlight attribute and random rotation 2023-07-01 00:15:26 +02:00
betalars 1a8a8ec2e4 breaking: changing card to become Area2D 2023-07-01 00:15:24 +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 1c535b45a8 simplify board layout, wip 2023-07-01 00:14:25 +02:00
betalars 335b513a9b setting minimum size for card to reduce transform weirdnes 2023-07-01 00:14:25 +02:00
betalars c818c3b24b initialising physics-based approach to laying cards on a board 2023-07-01 00:07:21 +02:00
betalars c1135558df importing bork texture and scaling independend shader 2023-07-01 00:07:21 +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 1f3f089e83 improving parsing and passing of mouse events 2023-06-30 01:29:19 +02:00
Adrian Schmid e96c0127d2 fixed missing collider on cards 2023-06-30 01:29:13 +02:00
Adrian Schmid 35193bf704 added dragging cards and post its with mouse input 2023-06-30 01:29:05 +02:00
betalars eb55818380 parody: adding highlight feature to postIt 2023-06-28 15:27:05 +02:00
betalars 44c22af71a removing debug code 2023-06-28 15:24:14 +02:00
betalars 2333dcca76 breaking: parody conversion of PostIt 2023-06-28 12:18:00 +02:00
betalars d1b989fca1 adding highlight attribute and random rotation 2023-06-28 11:44:55 +02:00
betalars 16b709311f breaking: changing card to become Area2D 2023-06-28 11:41:31 +02:00
betalars 2b970f4857 Merge commit '7687c976c0838482a47a64a51a047929c6d3e67e' into card-board 2023-06-28 01:08:01 +02:00
betalars 86084fe2f9 Revert "destructurising board of devs for easy child acess, this will get reverted"
This reverts commit 6bfead3573.
2023-06-28 01:03:40 +02:00
betalars 891036bfec simplify board layout, wip 2023-06-27 19:48:55 +02:00
betalars 9d77c0a505 setting minimum size for card to reduce transform weirdnes 2023-06-27 13:51:55 +02:00
betalars 506c8e4e6e initialising physics-based approach to laying cards on a board 2023-06-27 13:51:23 +02:00
betalars 374152c2aa importing bork texture and scaling independend shader 2023-06-27 13:49:44 +02:00
betalars 33af98e807 destructurising board of devs for easy child acess, this will get reverted 2023-06-27 13:48:53 +02:00
betalars 45449da830 godot weirdnes 2023-06-26 13:04:10 +02:00
betalars 684a6d00bb more godot weirdnes 2023-06-25 23:52:10 +02:00
betalars 10c769ecd6 godot weirdnes 2023-06-25 23:50:51 +02:00
betalars e95b311a5a updating data paths in startup scene 2023-06-25 23:50:21 +02:00
betalars c85bd6cf77 update room handle state management 2023-06-25 23:49:36 +02:00
betalars 2a1894f49e provisionary importing mask into player controller and youth room, WIP 2023-06-25 23:49:02 +02:00
betalars 786199ec9a adding conroller button for ui accept action 2023-06-25 23:46:20 +02:00
betalars 56fa75964e updating components to follow new state management 2023-06-25 23:45:52 +02:00
betalars 960ed412d9 refactoring focus handling in global state 2023-06-25 22:40:31 +02:00
betalars fde73cf7a2 creating mask asset 2023-06-25 22:28:45 +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 1e43736006 update void card so it can be used generally 2023-05-28 15:41:25 +02:00
betalars 828158a9f0 card picker can load cards from board of devs (WIP) and will discard post-its that are siblings of the chosen card when selecting the random post 2023-05-28 15:25:26 +02:00
betalars 58af3030a9 generalise card so card contents can be replaced without the need for re-parenting 2023-05-28 15:21:19 +02:00
betalars e26a270202 add debug card set to board of devs 2023-05-28 15:17:23 +02:00
betalars 520ded62f5 remove debug prints 2023-05-28 12:55:17 +02:00
betalars 70c5dc17f7 cards ingest their compatible postits based on groups 2023-05-28 12:38:46 +02:00
betalars ef20c10956 start changing player script to use group paradigm 2023-05-28 01:43:52 +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 e48c497552 fixed logic typo, selection state was compared, not assigned 2023-05-25 19:23:25 +02:00
betalars 85e988ff12 add pick logic wip, unified naming convention 2023-05-25 10:39:39 +02:00
betalars b09bf705c9 clear text field 2023-05-24 15:24:29 +02:00
betalars ee19f05fa2 Improve Readability of Pick Animations 2023-05-24 15:24:11 +02:00
betalars 50dfa9ae13 move animation test logic to dev-util 2023-05-24 13:47:53 +02:00
betalars fd927aba47 further UI animations for card picker 2023-05-24 13:47:13 +02:00
betalars cee77035bc finished animations for card picker 2023-05-20 00:39:48 +02:00
betalars 46802acef7 transferring card animations from card 1 to card 2 2023-05-19 22:56:53 +02:00
betalars 5ab7be7b74 card animations back to stable 2023-05-19 21:47:25 +02:00
betalars 1d3d875a4c polishing void card particles 2023-05-19 21:46:26 +02:00
betalars 688e30e7b1 setting up card picker and animations WIP 2023-05-19 17:55:00 +02:00
betalars 771a99fe6d finalising void card visuals 2023-05-19 15:26:27 +02:00
betalars a7deac5c51 changes to state management, probably in need of refactoring 2023-05-18 09:40:52 +02:00
betalars c33de4075a change project to run in window 2023-05-18 09:30:17 +02:00
betalars 61d5ff478d adding distorted void card 2023-05-18 09:29:39 +02:00
betalars 1b95187ba0 ingesting current draft of cards 2023-05-18 09:28:33 +02:00
betalars 1f1a28cd80 theming cards and randomising card backgrounds 2023-05-18 09:27:59 +02:00
betalars 055bbe435f updating card image assets 2023-05-18 09:25:52 +02:00
betalars 203f9d5044 started adding theming to card 2023-05-17 00:45:01 +02:00
betalars 372f80b74b updating main theme to support cards 2023-05-17 00:44:39 +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
betalars 3ea7c43380 Wild font magic 2023-04-22 15:09:28 +02:00
betalars d8f7f7c3b8 Importing new voice Lines 2023-04-22 15:08:35 +02:00
tilcreator da1bf34847 Add card board (wip) 2023-04-19 18:53:24 +02:00
betalars d477a1d2e8 removed binary data from startup scene 2023-04-15 16:09:36 +02:00
betalars 168c031bc8 Changes to main scenes to accomondate focus 2023-04-15 16:07:01 +02:00
betalars 0da596cc15 Introduced costum focus handling to global state 2023-04-15 16:01:22 +02:00