Commit Graph

208 Commits

Author SHA1 Message Date
betalars 4111b4efae fix sticky notes getting stuck underneath cards after they had been attached once. 2025-04-30 16:34:00 +02:00
betalars 32866b2a85 Merge commit '3de41e6fc8d5ad62ea8a72a2dc9de307df3da3a1' into development 2025-04-28 15:52:04 +02:00
betalars 3de41e6fc8 celanup 2025-04-28 15:46:50 +02:00
betalars f028608c06 resolve oversight in card refactoring 2025-04-27 13:04:11 +02:00
betalars f3a8ef6e46 workaround #114: workaround issues occurring due to ordering of internal children of card 2025-04-27 12:41:30 +02:00
betalars 1a814b157a Merge commit 'cdcb3c618e8169a74a4e9f60e6fa0869b91ec05f' into development 2025-04-13 19:31:39 +02:00
betalars cdcb3c618e re-implement card-loading to avoid loading issue 2025-04-13 19:07:31 +02:00
betalars 8067575f2a WIP: converting card loading to hard-coded solution due to load errors 2025-04-07 17:26:06 +02:00
betalars 8998c93480 WIP implement temporary workaround 2025-04-04 23:17:31 +02:00
betalars 00d783a2ba debug-me comitting broken state for debug purposes 2025-04-04 19:27:57 +02:00
betalars ff8145a097 WIP: adding recovery to cardboard 2025-03-31 21:31:09 +02:00
betalars ad64a118cc prevent intro from being played while draeven text is finished and not skipped to avoid illegal animation state 2025-03-28 18:20:21 +01:00
betalars 076c7a3315 fix state management issues with settings 2025-03-25 22:35:01 +01:00
betalars 022053a078 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars 4baa16794c cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 7b8423bbad resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars 1c975fe554 fix #109 enhance card board reliability, workaround free not being available in builds 2025-03-23 14:31:00 +01:00
betalars bb8302113f version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars edd2c57f20 fix #105: removing incorrect null assignment and resolved warnings raised by empty typed array 2025-03-05 19:41:22 +01:00
betalars e8e368c362 further rework of card handling 2025-02-24 16:14:08 +01:00
betalars 09e306c974 removing many mouse movement bugs 2025-01-31 03:22:07 +01:00
betalars 530e86d7bd ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars 8b85a599c8 renaming main theme 2024-10-18 18:08:54 +02:00
betalars 9103ee4cc1 misc code cleanup 2024-10-06 11:31:47 +02:00
betalars 0692f76d0b add support to initialise and save board state to savegame 2024-10-03 01:12:24 +02:00
betalars eecfae5e81 Git LFS shenanigans 2024-09-19 13:12:43 +02:00
betalars 540cbd913b macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars d3187ee60e remove debug print statement 2024-09-16 17:08:22 +02:00
betalars 2e52c8d0c1 moving on 2024-09-15 11:30:31 +02:00
betalars 80d381b9ed minor card interface polishes 2024-02-17 23:31:35 +01:00
betalars 08ff85d768 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars 2cddc8284c fixed conditions where invalid state could be reached in card board 2024-02-11 22:36:19 +01:00
betalars d9ec5d5d06 fix: multiple StickyNotes can be attatched to a single scene 2024-02-10 13:35:47 +01:00
betalars 477bf3b1a4 adding automatic theme switching 2024-02-06 21:58:29 +01:00
betalars 6755b6ab3d further theme developments (WIP) 2024-02-03 22:00:44 +01:00
betalars ad984a77b9 WIP: theme polishing 2024-02-02 01:03:28 +01:00
April John 8e2bec20fc update to godot 4.2 2023-12-02 14:27:18 +01:00
April John d35e789d8e sanity check highlight 2023-11-30 18:28:04 +01:00
betalars c5f0774b3a finishing up card refactor 2023-11-01 23:19:47 +01:00
TilCreator cf37714035 reworking state management in card board WIP 2023-10-15 13:27:02 +02:00
betalars 0b8ed363ee wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars a2c5217fbf WIP: finish cleaning up function architecture 2023-09-24 12:23:26 +02:00
betalars f91bab668d wip card bord refactoring 2023-09-23 16:19:58 +02:00
betalars 5f1322fe93 WIP: refactoring card_board 2023-08-30 13:23:37 +02:00
betalars a1e186c2c6 merging adis board updates into development 2023-08-30 12:04:51 +02:00
betalars 6824a75e29 wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
Adrian Schmid 12c51f842b left/right clicking in assignment context returns postits to the panel 2023-08-22 20:06:55 +02:00
Adrian Schmid 72efb61d28 postits are now returned to the panel if the group doesn't match 2023-08-22 20:00:33 +02:00
betalars 80d11da2b7 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 247f5a99f7 adding card game graphics 2023-08-21 08:40:25 +02:00
Adrian Schmid 3640f29170 added right click to return post it panels 2023-08-12 13:02:00 +02:00
Adrian Schmid 5c487f55df 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 d99b9edfdf fixed positioning of post it on the card 2023-08-12 12:19:27 +02:00
Adrian Schmid 64e479b1a5 pressing ui left now works as expected 2023-08-12 11:28:23 +02:00
betalars 8d22485bdf reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars a96e5630c8 updating card handling 2023-08-01 10:59:24 +02:00
betalars e3e98a05f2 fix: card board now stores an array, instead of an array of arrays 2023-07-19 22:43:44 +02:00
betalars cddc0424b6 fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 6b5c758e7f workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars 4d51a21876 changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
betalars 14e310c8eb 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 12226e04f3 improving card and post it avoidance handling 2023-07-18 15:54:34 +02:00
betalars a99433c73c adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +02:00
betalars 9b632bdf8e cards and posts will pass mouse events even when they are not draggable 2023-07-18 14:58:06 +02:00
betalars ccccf040d9 adding instructions to physics-board 2023-07-18 00:15:04 +02:00
betalars 705274b23d add group sharing to postit 2023-07-18 00:13:33 +02:00
betalars 3a295c3887 card updates 2023-07-17 14:15:40 +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
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
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 6da3c847ba meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars 04c76c614d Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +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 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 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 d81168fdbf cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars 7d03adf717 removing rotations from physics board ... 2023-07-08 22:07:24 +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