Commit Graph

205 Commits

Author SHA1 Message Date
betalars 9acad854a2 celanup 2025-04-28 15:46:50 +02:00
betalars b36e275b49 resolve oversight in card refactoring 2025-04-27 13:04:11 +02:00
betalars 284cc0bb90 workaround #114: workaround issues occurring due to ordering of internal children of card 2025-04-27 12:41:30 +02:00
betalars 13bf10be60 Merge commit 'cdcb3c618e8169a74a4e9f60e6fa0869b91ec05f' into development 2025-04-13 19:31:39 +02:00
betalars 02a8f31b6c re-implement card-loading to avoid loading issue 2025-04-13 19:07:31 +02:00
betalars 66a3b02816 WIP: converting card loading to hard-coded solution due to load errors 2025-04-07 17:26:06 +02:00
betalars dee8895f08 WIP implement temporary workaround 2025-04-04 23:17:31 +02:00
betalars fc32ca5dc9 debug-me comitting broken state for debug purposes 2025-04-04 19:27:57 +02:00
betalars c87339cca1 WIP: adding recovery to cardboard 2025-03-31 21:31:09 +02:00
betalars cc55ac2f73 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 c651266d16 fix state management issues with settings 2025-03-25 22:35:01 +01:00
betalars 62227cd331 finish implementing saving and loading 2025-03-25 22:34:13 +01:00
betalars 69b97ba112 cleaning up warnings 2025-03-24 17:07:43 +01:00
betalars 37161e1613 resolve compile warnings and enhance naming 2025-03-23 15:43:04 +01:00
betalars e4f8e0d06f fix #109 enhance card board reliability, workaround free not being available in builds 2025-03-23 14:31:00 +01:00
betalars c33959ee05 version bump to 4.4, adding new collectable ui 2025-03-23 14:20:50 +01:00
betalars f650f8d706 fix #105: removing incorrect null assignment and resolved warnings raised by empty typed array 2025-03-05 19:41:22 +01:00
betalars 58e0a4ca8d further rework of card handling 2025-02-24 16:14:08 +01:00
betalars 0700c6a64d removing many mouse movement bugs 2025-01-31 03:22:07 +01:00
betalars daa3c946de ugly bulk commit of last minute conference changes 2025-01-16 17:32:58 +01:00
betalars 70a02f26dd renaming main theme 2024-10-18 18:08:54 +02:00
betalars abf04c7d90 misc code cleanup 2024-10-06 11:31:47 +02:00
betalars cda6da932f add support to initialise and save board state to savegame 2024-10-03 01:12:24 +02:00
betalars b3d44a0216 macos-compatibility: Adding new texture compression format 2024-09-19 12:27:06 +02:00
betalars 47a3a8932d remove debug print statement 2024-09-16 17:08:22 +02:00
betalars 4f4c36e781 moving on 2024-09-15 11:30:31 +02:00
betalars 6f93715b03 minor card interface polishes 2024-02-17 23:31:35 +01:00
betalars c76f4ecca3 implementing zoom, amaze hotfixes 2024-02-12 19:03:15 +01:00
betalars 4c1a027371 fixed conditions where invalid state could be reached in card board 2024-02-11 22:36:19 +01:00
betalars 6f49f81eb5 fix: multiple StickyNotes can be attatched to a single scene 2024-02-10 13:35:47 +01:00
betalars f24ce5357c adding automatic theme switching 2024-02-06 21:58:29 +01:00
betalars 3ee2fe9944 further theme developments (WIP) 2024-02-03 22:00:44 +01:00
betalars b490aa6144 WIP: theme polishing 2024-02-02 01:03:28 +01:00
April John 3df9abef9f update to godot 4.2 2023-12-02 14:27:18 +01:00
April John 9377041867 sanity check highlight 2023-11-30 18:28:04 +01:00
betalars 10f79096f1 finishing up card refactor 2023-11-01 23:19:47 +01:00
TilCreator b9169ebb94 reworking state management in card board WIP 2023-10-15 13:27:02 +02:00
betalars f820eb2f1e wip card board refactoring 2023-10-12 18:25:21 +02:00
betalars 27b5252df7 WIP: finish cleaning up function architecture 2023-09-24 12:23:26 +02:00
betalars bd1a7972b1 wip card bord refactoring 2023-09-23 16:19:58 +02:00
betalars 64ef2d5475 WIP: refactoring card_board 2023-08-30 13:23:37 +02:00
betalars df33071a0e merging adis board updates into development 2023-08-30 12:04:51 +02:00
betalars 0264c303ae wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
Adrian Schmid 30d0ab1469 left/right clicking in assignment context returns postits to the panel 2023-08-22 20:06:55 +02:00
Adrian Schmid 4e7677915b postits are now returned to the panel if the group doesn't match 2023-08-22 20:00:33 +02:00
betalars 109bcba916 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 84da923f91 adding card game graphics 2023-08-21 08:40:25 +02:00
Adrian Schmid 5d2f24c32a added right click to return post it panels 2023-08-12 13:02:00 +02:00
Adrian Schmid 39c1969677 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 57f9fc7c07 fixed positioning of post it on the card 2023-08-12 12:19:27 +02:00
Adrian Schmid 53e28108d7 pressing ui left now works as expected 2023-08-12 11:28:23 +02:00
betalars 4235748412 reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars d9977d3108 updating card handling 2023-08-01 10:59:24 +02:00
betalars 132d9cd118 fix: card board now stores an array, instead of an array of arrays 2023-07-19 22:43:44 +02:00
betalars 88c26caa5b fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 0cbf306ba8 workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars d12883a5ca changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
betalars 4141ef4e85 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 20181ca8fe improving card and post it avoidance handling 2023-07-18 15:54:34 +02:00
betalars 33481c28e4 adding checks so card board will only combine compatible cards 2023-07-18 15:53:15 +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 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 fd1350a41f card updates 2023-07-17 14:15:40 +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
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
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 3969644ced meta tags in scenes + removed audio stream 2023-07-14 18:11:55 +02:00
betalars c94ed3dfa3 Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
2023-07-12 22:07:01 +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 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 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 cbbc9639df cleaning up warnings 2023-07-11 10:57:19 +02:00
betalars 132ec8950b removing rotations from physics board ... 2023-07-08 22:07:24 +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