Commit Graph

606 Commits

Author SHA1 Message Date
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
Adrian Schmid 208267827a moved drag handling to board to avoid issues 2023-07-01 15:19:54 +02:00
Adrian Schmid c2f35b4fa7 card-board dictionary + move post-its to dropboard 2023-07-01 13:43:27 +02:00
Adrian Schmid 2d784f5648 set anchor for post-it on card 2023-07-01 13:41:19 +02:00
betalars 468c75e5b5 updating card scenes 2023-07-01 01:45:28 +02:00
betalars e7ae348c13 supressing editor rotation in card script 2023-07-01 01:41:13 +02:00
betalars 8eaff6e331 removing provisionary code 2023-07-01 01:19:40 +02:00
betalars f345ecafd1 searching siblings to find a node that will take focus 2023-07-01 01:14:25 +02:00
betalars f4860712a4 improving parsing and passing of mouse events 2023-07-01 00:18:40 +02:00
Adrian Schmid 37a97b4ab5 fixed missing collider on cards 2023-07-01 00:18:40 +02:00
Adrian Schmid 4e74ad228f added dragging cards and post its with mouse input 2023-07-01 00:16:38 +02:00
betalars 7a5ee73dd9 adding mouse support for card picker, WIP 2023-07-01 00:15:26 +02:00
betalars 377a541ef3 moving INI set, so it is set before ready 2023-07-01 00:15:26 +02:00
betalars d786f30115 Claning up scene strucutre for cards and postIts 2023-07-01 00:15:26 +02:00
betalars 202d2b6822 changing random rotation offset to depend on card text 2023-07-01 00:15:26 +02:00
betalars 46285a1b65 remove wiggle code not being used iin postIt 2023-07-01 00:15:26 +02:00
betalars a48005de0b rearranging board of devs following card update 2023-07-01 00:15:26 +02:00
betalars ec7cca8343 parody: adding highlight feature to postIt 2023-07-01 00:15:26 +02:00
betalars 242468324d removing debug code 2023-07-01 00:15:26 +02:00
betalars a1086a1a26 breaking: parody conversion of PostIt 2023-07-01 00:15:26 +02:00
betalars 9f93a0f87f adding highlight attribute and random rotation 2023-07-01 00:15:26 +02:00
betalars d09651eaba breaking: changing card to become Area2D 2023-07-01 00:15:24 +02:00
betalars b2947b2075 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 d06f8ab3a0 simplify board layout, wip 2023-07-01 00:14:25 +02:00
betalars 3d029fa151 setting minimum size for card to reduce transform weirdnes 2023-07-01 00:14:25 +02:00
betalars 02891bb7b1 initialising physics-based approach to laying cards on a board 2023-07-01 00:07:21 +02:00
betalars 6032564aaa importing bork texture and scaling independend shader 2023-07-01 00:07:21 +02:00
betalars 6db5023133 destructurising board of devs for easy child acess, this will get reverted 2023-07-01 00:07:21 +02:00
betalars 9773f59aef improving parsing and passing of mouse events 2023-06-30 01:29:19 +02:00
Adrian Schmid bb0f64cbf7 fixed missing collider on cards 2023-06-30 01:29:13 +02:00
Adrian Schmid 947772a1e5 added dragging cards and post its with mouse input 2023-06-30 01:29:05 +02:00
betalars 87fb88d2e3 parody: adding highlight feature to postIt 2023-06-28 15:27:05 +02:00
betalars a4c1b30b9d removing debug code 2023-06-28 15:24:14 +02:00
betalars ab86ec2afd breaking: parody conversion of PostIt 2023-06-28 12:18:00 +02:00
betalars 35e1e4928f adding highlight attribute and random rotation 2023-06-28 11:44:55 +02:00
betalars 56a689cba9 breaking: changing card to become Area2D 2023-06-28 11:41:31 +02:00
betalars d3a9aaae89 Merge commit '7687c976c0838482a47a64a51a047929c6d3e67e' into card-board 2023-06-28 01:08:01 +02:00
betalars 580c84535e 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 114e8b106a simplify board layout, wip 2023-06-27 19:48:55 +02:00
betalars 86fb1aa2c8 setting minimum size for card to reduce transform weirdnes 2023-06-27 13:51:55 +02:00
betalars 42d0c057bb initialising physics-based approach to laying cards on a board 2023-06-27 13:51:23 +02:00
betalars 58b2f75ecc importing bork texture and scaling independend shader 2023-06-27 13:49:44 +02:00
betalars 55225bfa32 destructurising board of devs for easy child acess, this will get reverted 2023-06-27 13:48:53 +02:00
betalars 3f4f6abd93 godot weirdnes 2023-06-26 13:04:10 +02:00
betalars 6ad3fbcb3a more godot weirdnes 2023-06-25 23:52:10 +02:00
betalars 8a8a3730dd godot weirdnes 2023-06-25 23:50:51 +02:00
betalars 99f77a99bc updating data paths in startup scene 2023-06-25 23:50:21 +02:00
betalars 92c7f1b15a update room handle state management 2023-06-25 23:49:36 +02:00
betalars 06b045f6a1 provisionary importing mask into player controller and youth room, WIP 2023-06-25 23:49:02 +02:00
betalars 7b791d77be adding conroller button for ui accept action 2023-06-25 23:46:20 +02:00
betalars b3fea7b51d updating components to follow new state management 2023-06-25 23:45:52 +02:00
betalars 6102ae3711 refactoring focus handling in global state 2023-06-25 22:40:31 +02:00
betalars a7aa5e91e0 creating mask asset 2023-06-25 22:28:45 +02:00
betalars 6f607aa3fd Merge commit '6180c51f7c642b6f858c8f15912a00cada007968' into state_mangement 2023-05-28 22:39:23 +02:00
betalars 4c642ffde8 "merge" void card into card 2023-05-28 16:18:26 +02:00
betalars f448fcd1fc update void card so it can be used generally 2023-05-28 15:41:25 +02:00
betalars 43eeaafe8c 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 38e1e908f9 generalise card so card contents can be replaced without the need for re-parenting 2023-05-28 15:21:19 +02:00
betalars a132237d18 add debug card set to board of devs 2023-05-28 15:17:23 +02:00
betalars 85f01c66a3 remove debug prints 2023-05-28 12:55:17 +02:00
betalars e2c5bb4d7e cards ingest their compatible postits based on groups 2023-05-28 12:38:46 +02:00
betalars eca8e56f4c start changing player script to use group paradigm 2023-05-28 01:43:52 +02:00
betalars 47c7aad33f tweaking some post-it wording, assinging postits to groups based on compatibility 2023-05-28 01:42:46 +02:00
betalars 8562161ce6 fixed logic typo, selection state was compared, not assigned 2023-05-25 19:23:25 +02:00
betalars 73a04561d0 add pick logic wip, unified naming convention 2023-05-25 10:39:39 +02:00
betalars 87a214f212 clear text field 2023-05-24 15:24:29 +02:00
betalars 781f385640 Improve Readability of Pick Animations 2023-05-24 15:24:11 +02:00
betalars 8ed848e4eb move animation test logic to dev-util 2023-05-24 13:47:53 +02:00
betalars 9c05ddd0d9 further UI animations for card picker 2023-05-24 13:47:13 +02:00
betalars 2a4d3bebae finished animations for card picker 2023-05-20 00:39:48 +02:00
betalars 52e23cde51 transferring card animations from card 1 to card 2 2023-05-19 22:56:53 +02:00
betalars 1776635c88 card animations back to stable 2023-05-19 21:47:25 +02:00
betalars 28fae218a0 polishing void card particles 2023-05-19 21:46:26 +02:00
betalars 80f4578d16 setting up card picker and animations WIP 2023-05-19 17:55:00 +02:00
betalars a5c0927fa7 finalising void card visuals 2023-05-19 15:26:27 +02:00
betalars 01e8e36985 changes to state management, probably in need of refactoring 2023-05-18 09:40:52 +02:00
betalars b894683625 change project to run in window 2023-05-18 09:30:17 +02:00
betalars 64000d7725 adding distorted void card 2023-05-18 09:29:39 +02:00
betalars 962c5295b5 ingesting current draft of cards 2023-05-18 09:28:33 +02:00
betalars d6c8263664 theming cards and randomising card backgrounds 2023-05-18 09:27:59 +02:00
betalars 4aad54b7eb updating card image assets 2023-05-18 09:25:52 +02:00
betalars ab42d5bd16 started adding theming to card 2023-05-17 00:45:01 +02:00
betalars 77b2844c8d updating main theme to support cards 2023-05-17 00:44:39 +02:00
betalars 46ca9df1e3 Changed Focus Handling to que-based pattern, WIP 2023-04-22 15:11:10 +02:00
betalars c283d3de56 added z-buffer based transparency to billboard particle shader 2023-04-22 15:10:28 +02:00
betalars d1a38edac3 Wild font magic 2023-04-22 15:09:28 +02:00
betalars 99b1c8b6ca Importing new voice Lines 2023-04-22 15:08:35 +02:00
tilcreator 07b4461152 Add card board (wip) 2023-04-19 18:53:24 +02:00
betalars 1af895a2b3 removed binary data from startup scene 2023-04-15 16:09:36 +02:00
betalars 952641ad69 Changes to main scenes to accomondate focus 2023-04-15 16:07:01 +02:00
betalars 3719776e0f Introduced costum focus handling to global state 2023-04-15 16:01:22 +02:00
betalars 4896803f37 Moved UI Elements, Intorduced new Cursors 2023-04-15 15:57:14 +02:00
tilcreator e1c2c45389 Add nix build and development files 2023-03-27 19:45:15 +02:00
betalars ecd5889bf6 fixed glich, where you'd get stuck below when you've missed your chance at going up with the ladder 2023-03-27 19:44:01 +02:00
betalars 82391c6f9d mapped basic controller support 2023-03-27 19:43:20 +02:00
betalars 3ac28ad7c8 created particle system to indicate missing objects 2023-03-27 19:18:48 +02:00
betalars 7575108a47 Camera jutter depends on if player is active 2023-03-27 00:30:27 +02:00
betalars 8d58782a66 added states to room handle, may get depricated 2023-03-27 00:29:25 +02:00
betalars 4148f4b2dd introduced FPS cap 2023-03-21 23:06:45 +01:00
betalars aff05f4741 probably tab space diff 2023-03-21 20:16:43 +01:00
betalars d2abe73429 fixed slider issue in A11y settings, moved script to it's own file 2023-03-21 20:16:30 +01:00
betalars dab945b783 Merge branch 'main' of gitlab.com:betalars/frame-of-mind 2023-03-15 18:23:56 +01:00
betalars e273225818 Revert "accident"
This reverts commit 48c23c78cf.
2023-03-15 14:30:40 +01:00
betalars bc814869aa accident 2023-03-15 14:28:41 +01:00
betalars 6135f77856 start implementing scenery-ui 2023-03-15 14:27:04 +01:00
betalars 4266813f7e adding gamepad controls and improving focus handling 2023-03-14 22:09:15 +01:00
betalars d0ce541439 fix ocer-compensation of framerate 2023-03-14 22:08:17 +01:00
betalars 7f287f8b0d starting work on Main Menu, theming improvements 2023-03-13 13:15:43 +01:00
betalars b856f241cf Importing Audio to youth Room, WIP 2023-03-13 13:15:23 +01:00
betalars a7e77e182a updating logo 2023-03-13 13:13:06 +01:00
betalars 47c64d8fd9 Developing theming for a11y settings, initialising blobal state singleton 2023-03-09 22:54:22 +01:00
betalars d80d81283b tweaking Material Paths, importing audio, misc room improvements 2023-03-06 15:07:49 +01:00
betalars 11a93ea6cc importing player controller 2023-03-06 15:06:36 +01:00
betalars 6644d8bcc1 started building theme for Startup-Sreen 2023-03-06 15:06:05 +01:00
betalars aa4d12713a reimporting youth_room 2023-03-04 18:21:00 +01:00
betalars b6dd29a8e7 Youth Room Import and Lighting (broken) 2023-03-04 18:14:27 +01:00
betalars debd83ca2f clickable prototype for startup scene 2023-03-03 22:34:42 +01:00
betalars df81438376 initialised Godot Project 2023-03-03 22:34:05 +01:00