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 |