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
|
f314c1c1ca
|
Improving card reveal handling
|
2023-08-30 11:11:55 +02:00 |
|
betalars
|
6824a75e29
|
wip: refactoring casrd board
|
2023-08-30 11:07:22 +02:00 |
|
betalars
|
f962cdfe7a
|
wip: adding prompt to card picker
|
2023-08-30 11:05:07 +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
|
9e4e3a21f3
|
resetting music slider in startup
|
2023-08-06 00:02:17 +02:00 |
|
betalars
|
8d22485bdf
|
reverting void card handling to cut down unneded performance overhead
|
2023-08-02 12:43:16 +02:00 |
|
betalars
|
68cc589bff
|
celaning up error sources
|
2023-08-01 11:01:52 +02:00 |
|
betalars
|
a96e5630c8
|
updating card handling
|
2023-08-01 10:59:24 +02:00 |
|
betalars
|
a93e134c26
|
adding skipping logic
|
2023-08-01 10:52:08 +02:00 |
|
betalars
|
4bcc1b7da5
|
preventing focus drops
|
2023-07-19 22:44:29 +02:00 |
|
betalars
|
111b39c5c3
|
card picker is always picking void card
|
2023-07-19 22:44:07 +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
|
6807613fb9
|
finalise menus
|
2023-07-19 22:41:29 +02:00 |
|
betalars
|
cddc0424b6
|
fix: cards are reset when no longer void
|
2023-07-19 22:38:16 +02:00 |
|
betalars
|
0b60ce6eba
|
Merge commit '522080d52e14899d1d18e41489f45e86f9a6bf4e' into alpha
|
2023-07-19 13:55:26 +02:00 |
|
betalars
|
b44ccd84ef
|
reclaiming focus when scene is repeated
|
2023-07-19 13:54:36 +02:00 |
|
betalars
|
6b5c758e7f
|
workaround for card board not being able to repopulate
|
2023-07-19 13:52:01 +02:00 |
|
betalars
|
1c6e752237
|
implement skipping functionality
|
2023-07-19 13:51:26 +02:00 |
|
betalars
|
3423505322
|
making sure card picker can be reset
|
2023-07-19 13:50:19 +02:00 |
|
betalars
|
4d51a21876
|
changing chekc using metadata to use class info
|
2023-07-18 23:25:56 +02:00 |
|
Adrian Schmid
|
522080d52e
|
Added settings for final page (+ some notes on the global state)
|
2023-07-18 22:02:35 +02:00 |
|
Adrian Schmid
|
5f8a7d5fdb
|
added code for audio settings
|
2023-07-18 21:37:04 +02:00 |
|
Adrian Schmid
|
81dc810056
|
1st page accessibility settings (almost working except for fonts and ui scale)
|
2023-07-18 21:00:21 +02:00 |
|
Adrian Schmid
|
8be2560943
|
Merge remote-tracking branch 'origin/main' into adi_dev
|
2023-07-18 19:01:41 +02:00 |
|
betalars
|
2ae99f087b
|
resolving event passing issues
|
2023-07-18 18:27:30 +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
|
f507b9b890
|
fixing up issues with internal state handling and animation referencing
|
2023-07-18 14:48:28 +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 |
|
Adrian Schmid
|
acf7e29c20
|
Merge remote-tracking branch 'origin/main' into adi_dev
|
2023-07-17 19:00:30 +02:00 |
|
Adrian Schmid
|
28f0a04995
|
accessibility menu: added function for screenreader toggle
|
2023-07-17 19:00:17 +02:00 |
|
betalars
|
09fa3f65bc
|
imprioving stage complience for player
|
2023-07-17 14:16:12 +02:00 |
|
betalars
|
3a295c3887
|
card updates
|
2023-07-17 14:15:40 +02:00 |
|
betalars
|
6c13faac96
|
importing luna
|
2023-07-17 14:09:24 +02:00 |
|
betalars
|
47e4fe4a92
|
Merge commit '56ab26d1d6253d2385c47fa914e692124512bf65'
|
2023-07-16 01:13:13 +02:00 |
|
betalars
|
6e7eb9bcc5
|
configuring startin sequence, wip
|
2023-07-16 00:59:33 +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 |
|
betalars
|
7404c172bd
|
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
|
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 |
|
betalars
|
2a903381d7
|
limiting view layers for player camera
|
2023-07-15 11:10:29 +02:00 |
|
betalars
|
baf07a3269
|
integrating card_picker script with room scene
|
2023-07-15 01:08:42 +02:00 |
|
betalars
|
56f36b0148
|
cleaning up collectables scene
|
2023-07-15 01:07:29 +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
|
c08173dd06
|
cleaining up player animation and ladder behavior
|
2023-07-13 20:59:10 +02:00 |
|
betalars
|
97fbfce1ee
|
implementing signaling and staging, wip
|
2023-07-13 16:16:42 +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
|
ef474d1dad
|
disabling mouse filter when not focused
|
2023-07-11 11:00:47 +02:00 |
|
betalars
|
d81168fdbf
|
cleaning up warnings
|
2023-07-11 10:57:19 +02:00 |
|
betalars
|
df4673ce40
|
Updating Room colission, lighting overhaul, tweaking starting perspective
|
2023-07-10 16:20:37 +02:00 |
|
betalars
|
7d03adf717
|
removing rotations from physics board ...
|
2023-07-08 22:07:24 +02:00 |
|
betalars
|
c31778b314
|
start using input instead of unhandled input for player, reducing jitter strength
|
2023-07-08 22:05:18 +02:00 |
|
betalars
|
8c029f0684
|
updating card picker scene for new cards
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
91e8739322
|
card picker now hides itself while not having focus
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
32f02117bb
|
card picker will now emit a signal and drop focus when finished
|
2023-07-05 23:34:15 +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 |
|
Adrian Schmid
|
4be0471018
|
prevent putting multiple post its on one card
|
2023-07-02 11:50:19 +02:00 |
|
Adrian Schmid
|
0c8e3557ae
|
reset rot./scale after removing post it from card
|
2023-07-02 11:01:04 +02:00 |
|
Adrian Schmid
|
72825ecae6
|
improved area movement
|
2023-07-02 10:42:58 +02:00 |
|
Adrian Schmid
|
45fb225e54
|
remove dragableType and replace it with meta-type
|
2023-07-02 10:19:15 +02:00 |
|
Adrian Schmid
|
c2188316ab
|
moved dictionary populating to its own function
|
2023-07-02 10:11:54 +02:00 |
|
Adrian Schmid
|
5c88414c48
|
added func to sort dict entries on y pos
|
2023-07-01 16:59:13 +02:00 |
|
Adrian Schmid
|
4a0eddf3e9
|
add logic to attach post-its to cards
|
2023-07-01 16:03:22 +02:00 |
|
Adrian Schmid
|
ca65c69fdc
|
added same handling for cards + anchor for postIts
|
2023-07-01 15:20:50 +02:00 |
|
Adrian Schmid
|
ea67614da2
|
moved drag handling to board to avoid issues
|
2023-07-01 15:19:54 +02:00 |
|
Adrian Schmid
|
00ca4abc1f
|
card-board dictionary + move post-its to dropboard
|
2023-07-01 13:43:27 +02:00 |
|
Adrian Schmid
|
27d3497fde
|
set anchor for post-it on card
|
2023-07-01 13:41:19 +02:00 |
|
betalars
|
41f638fe75
|
updating card scenes
|
2023-07-01 01:45:28 +02:00 |
|
betalars
|
6629abaf9a
|
supressing editor rotation in card script
|
2023-07-01 01:41:13 +02:00 |
|
betalars
|
82501b1283
|
removing provisionary code
|
2023-07-01 01:19:40 +02:00 |
|
betalars
|
8307380bf0
|
improving parsing and passing of mouse events
|
2023-07-01 00:18:40 +02:00 |
|
Adrian Schmid
|
bbec8c4f25
|
fixed missing collider on cards
|
2023-07-01 00:18:40 +02:00 |
|
Adrian Schmid
|
47d4981d19
|
added dragging cards and post its with mouse input
|
2023-07-01 00:16:38 +02:00 |
|
betalars
|
37eea81463
|
adding mouse support for card picker, WIP
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
b20e519b7b
|
moving INI set, so it is set before ready
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
1af6aea8cb
|
Claning up scene strucutre for cards and postIts
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
8859f2e23f
|
changing random rotation offset to depend on card text
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
155ee333b1
|
remove wiggle code not being used iin postIt
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
2adc544a55
|
parody: adding highlight feature to postIt
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
64b3a765c5
|
removing debug code
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
c229e49b49
|
breaking: parody conversion of PostIt
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
e72e7d01cb
|
adding highlight attribute and random rotation
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
ec83fd0253
|
breaking: changing card to become Area2D
|
2023-07-01 00:15:24 +02:00 |
|
betalars
|
8e638a6317
|
simplify board layout, wip
|
2023-07-01 00:14:25 +02:00 |
|
betalars
|
da247360bf
|
setting minimum size for card to reduce transform weirdnes
|
2023-07-01 00:14:25 +02:00 |
|
betalars
|
5642df52dc
|
initialising physics-based approach to laying cards on a board
|
2023-07-01 00:07:21 +02:00 |
|
betalars
|
2fb69e6df1
|
importing bork texture and scaling independend shader
|
2023-07-01 00:07:21 +02:00 |
|
betalars
|
ef93aafd9e
|
improving parsing and passing of mouse events
|
2023-06-30 01:29:19 +02:00 |
|
Adrian Schmid
|
1dae8286cf
|
fixed missing collider on cards
|
2023-06-30 01:29:13 +02:00 |
|
Adrian Schmid
|
8322f6e334
|
added dragging cards and post its with mouse input
|
2023-06-30 01:29:05 +02:00 |
|
betalars
|
83da4b0f1f
|
parody: adding highlight feature to postIt
|
2023-06-28 15:27:05 +02:00 |
|
betalars
|
513c6c1e77
|
removing debug code
|
2023-06-28 15:24:14 +02:00 |
|
betalars
|
aa3bbcbc87
|
breaking: parody conversion of PostIt
|
2023-06-28 12:18:00 +02:00 |
|
betalars
|
cff100a4fe
|
adding highlight attribute and random rotation
|
2023-06-28 11:44:55 +02:00 |
|
betalars
|
9b617f2a3c
|
breaking: changing card to become Area2D
|
2023-06-28 11:41:31 +02:00 |
|
betalars
|
b3bc41600e
|
Merge commit '7687c976c0838482a47a64a51a047929c6d3e67e' into card-board
|
2023-06-28 01:08:01 +02:00 |
|
betalars
|
ed98a03552
|
simplify board layout, wip
|
2023-06-27 19:48:55 +02:00 |
|
betalars
|
74c5a09015
|
setting minimum size for card to reduce transform weirdnes
|
2023-06-27 13:51:55 +02:00 |
|
betalars
|
59d29339e6
|
initialising physics-based approach to laying cards on a board
|
2023-06-27 13:51:23 +02:00 |
|
betalars
|
b5559de171
|
importing bork texture and scaling independend shader
|
2023-06-27 13:49:44 +02:00 |
|
betalars
|
02f6447b2c
|
godot weirdnes
|
2023-06-26 13:04:10 +02:00 |
|
betalars
|
b87037c309
|
more godot weirdnes
|
2023-06-25 23:52:10 +02:00 |
|
betalars
|
44a8757ced
|
godot weirdnes
|
2023-06-25 23:50:51 +02:00 |
|
betalars
|
ce6f81398a
|
updating data paths in startup scene
|
2023-06-25 23:50:21 +02:00 |
|
betalars
|
0fa2cae3a4
|
provisionary importing mask into player controller and youth room, WIP
|
2023-06-25 23:49:02 +02:00 |
|
betalars
|
56f32a607b
|
updating components to follow new state management
|
2023-06-25 23:45:52 +02:00 |
|
betalars
|
3b8752cf96
|
creating mask asset
|
2023-06-25 22:28:45 +02:00 |
|
betalars
|
0a9fa3ef6d
|
Merge commit '6180c51f7c642b6f858c8f15912a00cada007968' into state_mangement
|
2023-05-28 22:39:23 +02:00 |
|
betalars
|
62d2659da3
|
"merge" void card into card
|
2023-05-28 16:18:26 +02:00 |
|
betalars
|
ace887b1d8
|
update void card so it can be used generally
|
2023-05-28 15:41:25 +02:00 |