Commit Graph

510 Commits

Author SHA1 Message Date
betalars 78f37023f8 windows in scene will now properly close after not having been focused, cursor showing up and disappearing when intended has been sorted out. 2024-02-14 02:21:08 +01:00
betalars c54b9026e1 fix typo 2024-02-14 02:18:49 +01:00
betalars c72ee61d19 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars ae12e60c4d improved state handling in card picker, implemented animation skipping 2024-02-12 00:24:13 +01:00
betalars b2498761c0 fixed conditions where invalid state could be reached in card board 2024-02-11 22:36:19 +01:00
betalars e725316c46 tweaking minimum sizes of popups to accomondate theme 2024-02-11 22:33:34 +01:00
betalars a50c82f298 fix: multiple StickyNotes can be attatched to a single scene 2024-02-10 13:35:47 +01:00
betalars b08a94a17c player now reduces motion when reduce motion is turned on 2024-02-06 21:58:46 +01:00
betalars 98caa66ab0 adding automatic theme switching 2024-02-06 21:58:29 +01:00
betalars 5e93303f4d further theme developments (WIP) 2024-02-03 22:00:44 +01:00
betalars 674999522e WIP adding system font theme 2024-02-02 12:05:49 +01:00
betalars 6ffad9d7a7 WIP: theme polishing 2024-02-02 01:03:28 +01:00
betalars dbb914ba22 reducing non text audio volumes 2024-02-01 22:40:39 +01:00
April John 322863e62c update to godot 4.2 2023-12-02 14:27:18 +01:00
April John 507a2cc9d2 sanity check highlight 2023-11-30 18:28:04 +01:00
April John 207e8da82c make button closeable 2023-11-29 18:04:14 +01:00
April John b4e80ecc7d fix: remove a draggable between back and start 2023-11-29 18:04:13 +01:00
betalars 0ae3fa4c93 fixing text not being properly displayed on cards 2023-11-02 12:56:15 +01:00
betalars 3765da91e0 finishing up card refactor 2023-11-01 23:19:47 +01:00
TilCreator 6ec59dfc03 reworking state management in card board WIP 2023-10-15 13:27:02 +02:00
betalars 7d6511a149 wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars 4c1bf12aaa WIP: finish cleaning up function architecture 2023-09-24 12:23:26 +02:00
betalars aba626d3a8 wip card bord refactoring 2023-09-23 16:19:58 +02:00
betalars bd2e569c4b WIP: refactoring card_board 2023-08-30 13:23:37 +02:00
betalars 971897d039 merging adis board updates into development 2023-08-30 12:04:51 +02:00
betalars c6955980b0 Improving card reveal handling 2023-08-30 11:11:55 +02:00
betalars 90578c51e2 wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
betalars 8d132553e2 wip: adding prompt to card picker 2023-08-30 11:05:07 +02:00
Adrian Schmid a756c3ee82 left/right clicking in assignment context returns postits to the panel 2023-08-22 20:06:55 +02:00
Adrian Schmid b82834213a postits are now returned to the panel if the group doesn't match 2023-08-22 20:00:33 +02:00
betalars dc86328859 Merge branch 'adi_dev' into 'development'
polishing cards

See merge request betalars/frame-of-mind!3
2023-08-21 06:47:59 +00:00
betalars 50ead5cb0b adding card game graphics 2023-08-21 08:40:25 +02:00
Adrian Schmid 7cb6b265ec added right click to return post it panels 2023-08-12 13:02:00 +02:00
Adrian Schmid 3d380d7ab1 fixed checks for if post it is attached or if card has post it attached 2023-08-12 12:20:05 +02:00
Adrian Schmid b204452a0c fixed positioning of post it on the card 2023-08-12 12:19:27 +02:00
Adrian Schmid 2f4acff8f5 pressing ui left now works as expected 2023-08-12 11:28:23 +02:00
betalars 381fe9526e resetting music slider in startup 2023-08-06 00:02:17 +02:00
betalars 413d27094d reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars 960bc3304d celaning up error sources 2023-08-01 11:01:52 +02:00
betalars 46689b1445 updating card handling 2023-08-01 10:59:24 +02:00
betalars 819bc13551 adding skipping logic 2023-08-01 10:52:08 +02:00
betalars e2260c52fd preventing focus drops 2023-07-19 22:44:29 +02:00
betalars d59144141c card picker is always picking void card 2023-07-19 22:44:07 +02:00
betalars aa1ed8e368 fix: card board now stores an array, instead of an array of arrays 2023-07-19 22:43:44 +02:00
betalars 4926b1685f finalise menus 2023-07-19 22:41:29 +02:00
betalars 72e1c10185 fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 1f09b872d1 Merge commit '522080d52e14899d1d18e41489f45e86f9a6bf4e' into alpha 2023-07-19 13:55:26 +02:00
betalars 5378dad463 reclaiming focus when scene is repeated 2023-07-19 13:54:36 +02:00
betalars 6b72552049 workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars 6b5d6a8981 implement skipping functionality 2023-07-19 13:51:26 +02:00
betalars e71436ec8d making sure card picker can be reset 2023-07-19 13:50:19 +02:00
betalars 96bf4a3d0c changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
Adrian Schmid 48ed646c51 Added settings for final page (+ some notes on the global state) 2023-07-18 22:02:35 +02:00
Adrian Schmid 91f8cb4c86 added code for audio settings 2023-07-18 21:37:04 +02:00
Adrian Schmid 7124580055 1st page accessibility settings (almost working except for fonts and ui scale) 2023-07-18 21:00:21 +02:00
Adrian Schmid 2f0b70e093 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-18 19:01:41 +02:00
betalars 50651b3438 resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars b6b85c8d51 workaround: when board of devs is initialised with processsing disabled, the void cards gets messed up. 2023-07-18 15:55:28 +02:00
betalars bf62262de1 improving card and post it avoidance handling 2023-07-18 15:54:34 +02:00
betalars 779fe08b38 adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +02:00
betalars 3ca0d98f81 cards and posts will pass mouse events even when they are not draggable 2023-07-18 14:58:06 +02:00
betalars d72404279f fixing up issues with internal state handling and animation referencing 2023-07-18 14:48:28 +02:00
betalars d4b5a40aae adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars 16c8c9ad7d add group sharing to postit 2023-07-18 00:13:33 +02:00
Adrian Schmid 2bc61fc105 Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-17 19:00:30 +02:00
Adrian Schmid 4c39faab82 accessibility menu: added function for screenreader toggle 2023-07-17 19:00:17 +02:00
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 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 c090c55c3b configuring startin sequence, wip 2023-07-16 00:59:33 +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 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 a04904e952 meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +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 5e8991f86e Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +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 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 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 41a9b0954f cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars 0268b1da2c Updating Room colission, lighting overhaul, tweaking starting perspective 2023-07-10 16:20:37 +02:00
betalars 6ce8da9e78 removing rotations from physics board ... 2023-07-08 22:07:24 +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 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 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 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 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 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 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 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 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 06b045f6a1 provisionary importing mask into player controller and youth room, WIP 2023-06-25 23:49:02 +02:00
betalars b3fea7b51d updating components to follow new state management 2023-06-25 23:45:52 +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 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 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 64000d7725 adding distorted void card 2023-05-18 09:29:39 +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
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 4896803f37 Moved UI Elements, Intorduced new Cursors 2023-04-15 15:57:14 +02:00
betalars 7575108a47 Camera jutter depends on if player is active 2023-03-27 00:30:27 +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 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 47c64d8fd9 Developing theming for a11y settings, initialising blobal state singleton 2023-03-09 22:54:22 +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