Commit Graph

334 Commits

Author SHA1 Message Date
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 4470dd63e4 misc polish 2023-08-30 11:12:47 +02:00
betalars 5195c4ef15 Improving card reveal handling 2023-08-30 11:11:55 +02:00
betalars 0264c303ae wip: refactoring casrd board 2023-08-30 11:07:22 +02:00
betalars 6289a56c2f wip: adding prompt to card picker 2023-08-30 11:05:07 +02:00
betalars d04feab22b adding realistic window resource 2023-08-30 11:03:56 +02:00
betalars 9d59d9c029 updating void card in dev board 2023-08-30 11:03:01 +02:00
betalars 61e9880f97 reverting version downgrade 2023-08-30 11:01:55 +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
Adrian Schmid 8a7eb8ea3e moved version back up to 4.1 (sorry Lars) 2023-08-22 19:16:20 +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 daba2c64e6 creating outside environemnt 2023-08-06 00:03:26 +02:00
betalars 03e6ba5e61 resetting music slider in startup 2023-08-06 00:02:17 +02:00
betalars 4235748412 reverting void card handling to cut down unneded performance overhead 2023-08-02 12:43:16 +02:00
betalars 9897fa2b33 celaning up error sources 2023-08-01 11:01:52 +02:00
betalars b7968fc989 export version bump 2023-08-01 10:59:46 +02:00
betalars d9977d3108 updating card handling 2023-08-01 10:59:24 +02:00
betalars cdfabe42af fixing missing groups 2023-08-01 10:56:48 +02:00
betalars 83f73ce5da adding skipping logic 2023-08-01 10:52:08 +02:00
betalars 4f1f1e5ffc updating disclaimer and thank you note 2023-08-01 10:50:24 +02:00
betalars a252ab0dfd fixing up handling of locked focus in global state 2023-08-01 10:49:42 +02:00
betalars c9b75f2db4 adding splash screen 2023-08-01 10:48:52 +02:00
betalars 82927c3398 the least specacular version bumpo of all times 2023-07-19 22:45:57 +02:00
betalars 86fe7e59a6 preventing focus drops 2023-07-19 22:44:29 +02:00
betalars 2c9837d6b6 card picker is always picking void card 2023-07-19 22:44:07 +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 a8a3e9f054 adding provisionary init function, wip 2023-07-19 22:43:00 +02:00
betalars 02ec893a2c finalise cards 2023-07-19 22:42:05 +02:00
betalars 7a43e8e902 finalise menus 2023-07-19 22:41:29 +02:00
betalars 88c26caa5b fix: cards are reset when no longer void 2023-07-19 22:38:16 +02:00
betalars 9a1eafb2bc Merge commit '522080d52e14899d1d18e41489f45e86f9a6bf4e' into alpha 2023-07-19 13:55:26 +02:00
betalars b05cbe6b29 final youth room changes 2023-07-19 13:55:04 +02:00
betalars 5ede0fbe86 reclaiming focus when scene is repeated 2023-07-19 13:54:36 +02:00
betalars 2e50009aee resolving some remaining group assignments 2023-07-19 13:53:24 +02:00
betalars 0cbf306ba8 workaround for card board not being able to repopulate 2023-07-19 13:52:01 +02:00
betalars 5b7fb7d1f5 implement skipping functionality 2023-07-19 13:51:26 +02:00
betalars aef423ad55 making sure card picker can be reset 2023-07-19 13:50:19 +02:00
betalars bc7a81eece adding bilboard toggle 2023-07-19 13:49:48 +02:00
betalars 03c0381242 finalising disclaimers and thank you 2023-07-19 13:49:09 +02:00
betalars d12883a5ca changing chekc using metadata to use class info 2023-07-18 23:25:56 +02:00
betalars 4a99dd7376 re-doing lost goup assignments 2023-07-18 23:25:27 +02:00
Adrian Schmid 9365ea9fb1 Added settings for final page (+ some notes on the global state) 2023-07-18 22:02:35 +02:00
Adrian Schmid d76242d7d0 added code for audio settings 2023-07-18 21:37:04 +02:00
Adrian Schmid 559d60eeef 1st page accessibility settings (almost working except for fonts and ui scale) 2023-07-18 21:00:21 +02:00
Adrian Schmid 51026dcbdb some notes for me + debug function for printing settings 2023-07-18 20:59:00 +02:00
Adrian Schmid 51134d504a Merge remote-tracking branch 'origin/main' into adi_dev 2023-07-18 19:01:41 +02:00
betalars 587fa702d9 resolving event passing issues 2023-07-18 18:27:30 +02:00
betalars 3e9a22bfbe global state will quit game when the last focus is dropped 2023-07-18 15:55:54 +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 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