Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Merge develop #74

Merged
merged 73 commits into from
Jul 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
9417b67
initial files and setting for topology integration
d-roak Jun 26, 2024
c7c5986
Merge branch 'main' into feat/topology-integration
d-roak Jun 26, 2024
693e714
rm svelte kit extends
d-roak Jun 26, 2024
e2093d0
fix merge conflict
d-roak Jun 26, 2024
a038435
regenerate lock file
d-roak Jun 26, 2024
6125a28
add svelte kit extended config
d-roak Jun 27, 2024
32ddee5
add dvorak
d-roak Jun 27, 2024
d856d47
comment console log
d-roak Jun 27, 2024
bf1a9ed
add structure
d-roak Jun 27, 2024
ca67f47
restructure topology; add mock presence handler; add topologyInit in …
d-roak Jun 27, 2024
08f8e6a
feat: basic Player implementation
0xMugen Jun 27, 2024
3f8067c
merge main
d-roak Jun 27, 2024
e1407d6
fix: change playersData with vec3 for positon and direction
0xMugen Jun 27, 2024
8c9faed
fix: redesign Player Data and Manager, switching to euler from vec fo…
0xMugen Jun 27, 2024
c069415
feat: fake p2p data
0xMugen Jun 27, 2024
0e979d3
increase timeout to 5s
d-roak Jun 27, 2024
46351ed
feat: Player sim
0xMugen Jun 27, 2024
7e8e8b6
change presence handler starting order
d-roak Jun 27, 2024
e82c571
fix ts-topology import
d-roak Jun 28, 2024
ea7d728
wait for peers and canvas
d-roak Jun 28, 2024
3d7e8a8
merge develop
d-roak Jun 28, 2024
a678d42
regenerate lock file
d-roak Jun 28, 2024
390c9e8
rm shangai riverside
d-roak Jun 28, 2024
bc1bb48
rm: comment all code that makes paintmode work
0xMugen Jul 1, 2024
dfaab33
feat: spraywheel display logic set up
0xMugen Jul 1, 2024
e468a8f
feat: set selection wheel for sprays
0xMugen Jul 1, 2024
4526512
fix merge conflict
d-roak Jul 2, 2024
28bb4d7
fix lock file
d-roak Jul 2, 2024
cdabaa3
preliminary refactoring for sprays
d-roak Jul 2, 2024
808a84d
add parser for adding the spray
d-roak Jul 2, 2024
7150bde
fix: states and ts errors
0xMugen Jul 2, 2024
3ab17ce
comment the dumy p2p set up
0xMugen Jul 2, 2024
e7bdfba
Resolved merge conflicts in Scene.svelte and players.ts
0xMugen Jul 2, 2024
a37cc46
Merge pull request #68 from topology-foundation/Mugen/Multiplayer
0xMugen Jul 2, 2024
250981b
fix: prettier
0xMugen Jul 2, 2024
9064e47
add: a few place holder images for sprays
0xMugen Jul 2, 2024
bc6909a
feat: spray selection
0xMugen Jul 2, 2024
938dcc7
Merge branch 'develop' into feat/topology-integration
d-roak Jul 3, 2024
c4dedd0
refactor player mgmt; add handler for player updates on the presence …
d-roak Jul 3, 2024
09f88af
mugen addon
0xMugen Jul 3, 2024
83c44a2
feat: emit state updates for calling the pub sub grp
0xMugen Jul 3, 2024
4d02da2
formating
0xMugen Jul 3, 2024
c3aa08d
Merge pull request #69 from topology-foundation/topology-integration/…
d-roak Jul 4, 2024
c6ad98e
change deps; integrate players data with handlers
d-roak Jul 4, 2024
af1dfba
add node-datachannel
d-roak Jul 4, 2024
5369993
bump changes
d-roak Jul 4, 2024
b2061ad
bump node version
d-roak Jul 4, 2024
6be772f
add prepare script
d-roak Jul 4, 2024
519948b
update lock file
d-roak Jul 4, 2024
7919b61
update topology deps
d-roak Jul 4, 2024
e62c864
add datachannel as dev dep
d-roak Jul 4, 2024
04e4a21
add target and module
d-roak Jul 4, 2024
e61c673
rm node-datachannel
d-roak Jul 4, 2024
1845c3a
refactor
d-roak Jul 4, 2024
8c6bcd8
feat: display the active spray
0xMugen Jul 5, 2024
c1a5d73
Merge pull request #52 from topology-foundation/feat/topology-integra…
0xMugen Jul 5, 2024
3207817
feat: add cursor back + spray console log
0xMugen Jul 5, 2024
bb2de5d
add: Id to spray data + remove null as supported selected spray
0xMugen Jul 5, 2024
6da6979
change: uv to offset for storing sprays
0xMugen Jul 5, 2024
854d46e
change: uv to offset for storing sprays
0xMugen Jul 5, 2024
5f23246
feat: spray
0xMugen Jul 5, 2024
2ef057f
fix: add ctx null checks to rm errors
0xMugen Jul 5, 2024
fadd0cf
feat: ajust offset so that sprays are centered compared to the cursor
0xMugen Jul 5, 2024
2849c95
format + reset some settings
0xMugen Jul 5, 2024
d9d445c
Fix merge conflicts
0xMugen Jul 5, 2024
25c7754
feat: prettier
0xMugen Jul 5, 2024
a253fae
add new sprays
d-roak Jul 6, 2024
2636d48
Merge pull request #72 from topology-foundation/Sprays
0xMugen Jul 6, 2024
48526f8
players w/ different colors
d-roak Jul 8, 2024
0f7a90d
working initial updating canvas
d-roak Jul 8, 2024
ba1dad3
merging checkpoint
d-roak Jul 8, 2024
ef944b6
Merge branch 'develop' into feat/canvas-integration
d-roak Jul 8, 2024
74dcc21
Merge pull request #73 from topology-foundation/feat/canvas-integration
d-roak Jul 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
regenerate lock file
d-roak committed Jun 26, 2024
commit a03843501c18d37b26b9bfcfd8e67df91f23256d
2,518 changes: 1,381 additions & 1,137 deletions package-lock.json

Large diffs are not rendered by default.