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 |
|
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
|
be29b3aefb
|
new variables for global state
|
2023-07-14 18:12:17 +02:00 |
|
Adrian Schmid
|
3969644ced
|
meta tags in scenes + removed audio stream
|
2023-07-14 18:11:55 +02:00 |
|
betalars
|
152272ee80
|
it is just too hot
|
2023-07-14 15:37:38 +02:00 |
|
betalars
|
7ce5b6120b
|
creating a default bug report template
|
2023-07-14 15:29:53 +02:00 |
|
betalars
|
fb2c731e8c
|
cleaining up player animation and ladder behavior
|
2023-07-13 20:59:10 +02:00 |
|
betalars
|
035dc7f05b
|
implementing signaling and staging, wip
|
2023-07-13 16:16:42 +02:00 |
|
betalars
|
2301cd8d3b
|
typo
|
2023-07-13 16:14:53 +02:00 |
|
betalars
|
1dc75e4b22
|
stage management updates
|
2023-07-13 16:14:40 +02:00 |
|
betalars
|
ca0fae5f09
|
shader tweaking
|
2023-07-13 16:11:44 +02:00 |
|
betalars
|
c94ed3dfa3
|
Revert "fixme: Updating void card logic"
This reverts commit ce2f6af8f8.
|
2023-07-12 22:07:01 +02:00 |
|
betalars
|
285dc4228d
|
adding jui jitsu scene to room
|
2023-07-12 18:48:51 +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
|
bd53394d6e
|
adding foundations to Soundterack
|
2023-07-12 18:46:19 +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
|
de0e1500a8
|
updating board of devs
|
2023-07-11 23:12:00 +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
|
d78e4caede
|
disabling mouse filter when not focused
|
2023-07-11 11:00:47 +02:00 |
|
betalars
|
2c6f9c93f0
|
naming updates, hiding unused ui eleemnts in animation
|
2023-07-11 10:58:51 +02:00 |
|
betalars
|
cbbc9639df
|
cleaning up warnings
|
2023-07-11 10:57:19 +02:00 |
|
betalars
|
27b58b16d1
|
removing the audio stream that blew up the scene
|
2023-07-11 01:02:38 +02:00 |
|
betalars
|
66d176ccfd
|
restructuring youth scene
|
2023-07-11 00:58:17 +02:00 |
|
betalars
|
018e3ec126
|
changing light range of desk to brigthen room
|
2023-07-10 19:19:01 +02:00 |
|
betalars
|
5a63cb504a
|
disabling blender import to get rid of warning
|
2023-07-10 19:18:07 +02:00 |
|
betalars
|
79b8b09df4
|
Updating Room colission, lighting overhaul, tweaking starting perspective
|
2023-07-10 16:20:37 +02:00 |
|
betalars
|
8838cb3e5e
|
tweaking starlight shader
|
2023-07-10 16:19:40 +02:00 |
|
betalars
|
0059839848
|
declaring scene enums (WIP)
|
2023-07-09 22:27:07 +02:00 |
|
betalars
|
32c8128071
|
fixing light probe settings (interior is not appropriate for our use case)
|
2023-07-09 22:26:05 +02:00 |
|
betalars
|
132ec8950b
|
removing rotations from physics board ...
|
2023-07-08 22:07:24 +02:00 |
|
betalars
|
224653732c
|
room lighting updates
|
2023-07-08 22:06:34 +02:00 |
|
betalars
|
7c6e7fd6c4
|
fixing error handling when focus list is empty
|
2023-07-08 22:06:06 +02:00 |
|
betalars
|
aba0a85235
|
start using input instead of unhandled input for player, reducing jitter strength
|
2023-07-08 22:05:18 +02:00 |
|
betalars
|
2b5275f5de
|
updating lava lamp name
|
2023-07-08 22:04:07 +02:00 |
|
betalars
|
f845940838
|
adding fps counter to main scene
|
2023-07-08 22:03:39 +02:00 |
|
betalars
|
584b7d3e2b
|
changing lava lamp scene to correct one ...
|
2023-07-05 23:54:05 +02:00 |
|
betalars
|
11b18f420c
|
updating card picker scene for new cards
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
12eec4c5ef
|
card picker now hides itself while not having focus
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
ccd1e1eeec
|
card picker will now emit a signal and drop focus when finished
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
3551f99273
|
room lighting overhaul
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
428997fcc5
|
porting starlight shader to godot4
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
6412c0bac7
|
resetting testing scene
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
a5c9b84d9b
|
finalizing lava lamp
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
3dbc4515b8
|
start re-importing starlight shader
|
2023-07-05 23:34:15 +02:00 |
|
betalars
|
da58fe5617
|
updating room lighting, wip
|
2023-07-05 23:34:14 +02:00 |
|
betalars
|
f10efb4496
|
assembling lava lamp in test scene
|
2023-07-05 23:34:14 +02:00 |
|
betalars
|
48075a2a86
|
privosionary lava mesh
|
2023-07-05 23:34:14 +02:00 |
|
betalars
|
e62750dc37
|
adding starlight projector target material
|
2023-07-05 23:34:13 +02:00 |
|
betalars
|
0410680bcc
|
creating LavaLamp mesh
|
2023-07-05 23:34:12 +02:00 |
|
betalars
|
d12ca45785
|
removing debug options
|
2023-07-05 23:34:12 +02:00 |
|
betalars
|
4ad3680d94
|
creating lavalamp wobble shader
|
2023-07-05 23:34:12 +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 |
|
Adrian Schmid
|
aa30600100
|
remove dragableType and replace it with meta-type
|
2023-07-02 10:19:15 +02:00 |
|
Adrian Schmid
|
9d59e54bcc
|
moved dictionary populating to its own function
|
2023-07-02 10:11:54 +02:00 |
|
Adrian Schmid
|
a3fc38a127
|
added func to sort dict entries on y pos
|
2023-07-01 16:59:13 +02:00 |
|
Adrian Schmid
|
13dfadce6e
|
add logic to attach post-its to cards
|
2023-07-01 16:03:22 +02:00 |
|
Adrian Schmid
|
7d5e8ae1bb
|
added same handling for cards + anchor for postIts
|
2023-07-01 15:20:50 +02:00 |
|
Adrian Schmid
|
22bdae5be0
|
moved drag handling to board to avoid issues
|
2023-07-01 15:19:54 +02:00 |
|
Adrian Schmid
|
48aff75068
|
card-board dictionary + move post-its to dropboard
|
2023-07-01 13:43:27 +02:00 |
|
Adrian Schmid
|
fcbaa208fa
|
set anchor for post-it on card
|
2023-07-01 13:41:19 +02:00 |
|
betalars
|
97fe8a0bf4
|
updating card scenes
|
2023-07-01 01:45:28 +02:00 |
|
betalars
|
d227b3e026
|
supressing editor rotation in card script
|
2023-07-01 01:41:13 +02:00 |
|
betalars
|
ff6bd4fb31
|
removing provisionary code
|
2023-07-01 01:19:40 +02:00 |
|
betalars
|
9ba00d1b8e
|
searching siblings to find a node that will take focus
|
2023-07-01 01:14:25 +02:00 |
|
betalars
|
93c1fbc768
|
improving parsing and passing of mouse events
|
2023-07-01 00:18:40 +02:00 |
|
Adrian Schmid
|
58174e5d02
|
fixed missing collider on cards
|
2023-07-01 00:18:40 +02:00 |
|
Adrian Schmid
|
85b881cc44
|
added dragging cards and post its with mouse input
|
2023-07-01 00:16:38 +02:00 |
|
betalars
|
45f5ff9cd8
|
adding mouse support for card picker, WIP
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
b2205ac272
|
moving INI set, so it is set before ready
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
d7e18beccb
|
Claning up scene strucutre for cards and postIts
|
2023-07-01 00:15:26 +02:00 |
|
betalars
|
f4f6e1363c
|
changing random rotation offset to depend on card text
|
2023-07-01 00:15:26 +02:00 |