Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lts update 7012025 #102

Merged
merged 101 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
162a233
Update Unity version guidance
towneh Dec 18, 2024
4cb5b04
changed a few server things
dooly123 Dec 23, 2024
3bd763c
VFX added
dooly123 Dec 24, 2024
c11d148
nameplate no longer has its collider reacting to other colliders
dooly123 Dec 24, 2024
22f4641
Default Unity gitignore for Basis
neon-glowstick Dec 28, 2024
2e711bf
Gitignore for basis server
neon-glowstick Dec 28, 2024
158c3e3
Dont use gitignore at root
neon-glowstick Dec 28, 2024
14c4d21
Ignore generated files from Rider
neon-glowstick Dec 28, 2024
8eb6b16
Re-add Basis specific gitignores
neon-glowstick Dec 28, 2024
b0396f1
Re-add exclusions for server
neon-glowstick Dec 28, 2024
a4f5a38
Handle lowercase in gitignore for server build
neon-glowstick Dec 28, 2024
03b32f0
experimental changes
dooly123 Dec 28, 2024
5056e0d
undid asmdef
dooly123 Dec 28, 2024
3ec140e
refactor password auth to use an interface
TheButlah Dec 25, 2024
75ee314
refactor: create contrib dir
TheButlah Dec 26, 2024
a5a9691
Merge branch 'lts' into doolys-branch
dooly123 Dec 29, 2024
fed92e6
changed background color of UI for settings, logger and HamBurger
spot-neko Dec 29, 2024
94852fd
Merge pull request #66 from towneh/patch-1
dooly123 Dec 29, 2024
c6a42f9
fixed up the authentication code
dooly123 Dec 29, 2024
c4112d9
Merge pull request #83 from TheButlah/thebutlah/break-out-password-auth
dooly123 Dec 29, 2024
237ec60
Merge pull request #85 from TheButlah/thebutlah/contrib-dir
dooly123 Dec 29, 2024
ddf5f4f
Merge branch 'main' into doolys-branch
dooly123 Dec 29, 2024
77aaffa
Merge branch 'main' into doolys-branch
dooly123 Dec 29, 2024
b851d00
fixed a few merge issues
dooly123 Dec 29, 2024
cd16a2b
swapped to a bool instead of using the null
dooly123 Dec 29, 2024
f557413
Merge pull request #89 from neon-glowstick/neon/separate-gitignores
dooly123 Dec 29, 2024
14a6264
Merge branch 'main' into doolys-branch
dooly123 Dec 29, 2024
4c0a4ad
cleaned out a legacy directory, moved files around, corrected server …
dooly123 Dec 30, 2024
1809cd7
settings looks to be required in assets painful
dooly123 Dec 30, 2024
20bd573
more package cleanup
dooly123 Dec 30, 2024
ca99176
more package cleanup
dooly123 Dec 30, 2024
398c1ca
fix: gitignore
TheButlah Dec 30, 2024
d0ad197
delete vs dir
TheButlah Dec 30, 2024
1f71479
Drop files from gitignore
neon-glowstick Dec 30, 2024
a2569b8
Merge pull request #91 from TheButlah/thebutlah/fix-gitignore
dooly123 Dec 30, 2024
5518b90
Merge pull request #92 from neon-glowstick/drop-files
dooly123 Dec 30, 2024
95fa257
removed third party, all packages now. next stage will be seperate repos
dooly123 Dec 30, 2024
9cc5c13
fixed path for sdk avatar
dooly123 Dec 30, 2024
bc028c0
copied the il2cpp check from avatar to temp scene script
dooly123 Dec 30, 2024
c8b1fc7
changed NetworkedPlayer.Avatar to BasisAvatar
dooly123 Dec 30, 2024
d2d85a1
set the face visibility to true when we switch avatars, this stops th…
dooly123 Dec 30, 2024
060b468
bigger issues going on if these are null
dooly123 Dec 30, 2024
c4467a6
cleaned up directory in sdk
dooly123 Dec 30, 2024
ed78ca6
audiolink is moved to the remote github repo
dooly123 Dec 30, 2024
e7f5678
moved more common files out
dooly123 Dec 31, 2024
b8f33d0
moved a bunch more local packages to remote directorys
dooly123 Dec 31, 2024
ec6226b
odin serializer moved
dooly123 Dec 31, 2024
2da6bfc
ready to merge to master
dooly123 Dec 31, 2024
f9b4a42
Merge branch 'main' into doolys-branch
dooly123 Dec 31, 2024
319f5c1
Merge pull request #93 from BasisVR/doolys-branch
dooly123 Dec 31, 2024
737eef6
added logger
dooly123 Dec 31, 2024
e1f4e79
added null checks to data
dooly123 Dec 31, 2024
414b384
error messages added to avatarsdk
dooly123 Dec 31, 2024
3e9fedd
host mode added
dooly123 Jan 2, 2025
c187d64
fixed logger code giving empty string to logger
dooly123 Jan 2, 2025
5618b47
seperated locks
dooly123 Jan 2, 2025
205da4d
improved performance of audio thread
dooly123 Jan 2, 2025
3be9481
should be the last issue with server crashing for a while
dooly123 Jan 2, 2025
02bf50d
sever copied to directory
dooly123 Jan 2, 2025
fb01977
Merge pull request #94 from BasisVR/doolys-branch
dooly123 Jan 2, 2025
63092e0
fixed up input fields
dooly123 Jan 3, 2025
c2ba214
response ownership added back, apparently was removed
dooly123 Jan 3, 2025
058aa09
Merge pull request #95 from BasisVR/doolys-branch
dooly123 Jan 3, 2025
80e39b6
cleaned up serializable
dooly123 Jan 3, 2025
37935fd
changed some interval rates around
dooly123 Jan 3, 2025
0f84f80
changed call for lipsync and viseme driver
dooly123 Jan 3, 2025
c2b4788
Merge pull request #96 from BasisVR/doolys-branch
dooly123 Jan 3, 2025
884f2de
feat(auth): implement did:key resolution (#90)
TheButlah Jan 4, 2025
302d440
made it so players can be spawned straight away
dooly123 Jan 4, 2025
542ceb9
has updated
dooly123 Jan 4, 2025
51bce35
fixed up temp location
dooly123 Jan 4, 2025
2b2b6e9
Merge branch 'main' into doolys-branch
dooly123 Jan 4, 2025
e1b3946
updated world in use
dooly123 Jan 4, 2025
59b4f86
fixed addressables
dooly123 Jan 5, 2025
ca1df63
update package directory
dooly123 Jan 5, 2025
c57ef8e
ready to merge
dooly123 Jan 5, 2025
f56b2d9
Doolys branch (#97)
dooly123 Jan 5, 2025
86c3a2d
fixed controller visibility
dooly123 Jan 5, 2025
a256eb5
cleaned up a debug log and a addressable link for gizmos
dooly123 Jan 5, 2025
6c5404f
added toggle example
dooly123 Jan 5, 2025
e60c9a3
updated packages
dooly123 Jan 5, 2025
c001aae
corrected ip
dooly123 Jan 5, 2025
3e8a549
improved error logging
dooly123 Jan 5, 2025
7da8a29
moved back interval rates
dooly123 Jan 5, 2025
0cf19c3
fixes long standing issue with movement borking
dooly123 Jan 6, 2025
8acaf87
improved server code
dooly123 Jan 6, 2025
c3fe2a2
early work on client console for connecting to servers
dooly123 Jan 6, 2025
d6726cc
ton more work in the right direction reduced gc pressure
dooly123 Jan 6, 2025
d12a825
corrected a recycle missing
dooly123 Jan 6, 2025
19505d9
corrected a bunch of mistakes
dooly123 Jan 6, 2025
30adefd
more performance improvements
dooly123 Jan 7, 2025
09e405e
corrected array size
dooly123 Jan 7, 2025
10866aa
seperate server from message handles
dooly123 Jan 7, 2025
3b41470
testing and correcting memory leaks
dooly123 Jan 7, 2025
b48b60f
improved
dooly123 Jan 7, 2025
5f6850b
ready to merge into lts
dooly123 Jan 7, 2025
46793e2
Merge branch 'main' into doolys-branch
dooly123 Jan 7, 2025
9bbca7d
Doolys branch (#100)
dooly123 Jan 7, 2025
df67925
server upgrades complete
dooly123 Jan 7, 2025
633c17d
Merge branch 'main' into doolys-branch
dooly123 Jan 7, 2025
a9b164b
Merge pull request #101 from BasisVR/doolys-branch
dooly123 Jan 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ trim_trailing_whitespace = true
[*.{cs|csx}]
indent_style = tab
max_line_length = 88
# enforce naming rules
dotnet_diagnostic.IDE1006.severity = warning
35 changes: 35 additions & 0 deletions .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,38 @@ jobs:
${{ env.RELEASE_PREFIX }}-Client.zip
${{ env.RELEASE_PREFIX }}-Server.zip

dotnet-build:
name: Run `dotnet build`
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- name: "Checkout repository"
timeout-minutes: 2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "Setup dotnet"
timeout-minutes: 2
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
- name: dotnet build
run: dotnet build

dotnet-test:
name: Run `dotnet test`
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- name: "Checkout repository"
timeout-minutes: 2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "Setup dotnet"
timeout-minutes: 2
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
- name: dotnet test
run: dotnet test --logger:"console;verbosity=detailed"
115 changes: 15 additions & 100 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,111 +1,26 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/Basis/[Ll]ibrary/
/Basis/[Tt]emp/
/Basis/[Oo]bj/
/Basis/[Bb]uild/
/Basis/[Bb]uilds/
/Basis/[Ll]ogs/
/Basis/[Uu]ser[Ss]ettings/
# Export from building Basis Server
/[Bb]asis\ [Ss]erver\ [Ee]xport

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/Basis/[Mm]emoryCaptures/
# C# build artifacts
[Bb]in/
[Oo]bj/

# Recordings can get excessive in size
/Basis/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# Nix stuff
.direnv/
.envrc

# Autogenerated Jetbrains Rider plugin
/Basis/[Aa]ssets/Plugins/Editor/JetBrains*
# Jetbrains Rider
.idea/

# Visual Studio cache directory
/Basis.vs/
.vs/

# JetBrains Rider cache directory
/Basis.idea/

# Gradle cache directory
/Basis.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.unityproj
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app
.gradle/

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/Basis/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/Basis/[Aa]ssets/[Ss]treamingAssets/aa.meta
/Basis/[Aa]ssets/[Ss]treamingAssets/aa/*

# Basis exclusions
/Basis/[Aa]sset[Bb]undles/
/Basis/[Aa]ssets/_UserContent
/Basis/[Aa]ssets/_UserContent.meta
*.vsidx
Basis/.vs/Basis/v17/DocumentLayout.json
/Basis/.vs
/Basis/.vs
*.nuspec
*.cache

# Dotnet build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
**/[Bb]in/
**/[Oo]bj/
**/[Oo]ut/
msbuild.log
msbuild.err
msbuild.wrn

# Nuget
nupkg/

# Nix stuff
**/.direnv/
/.envrc
# Vim
*.swp
*.swo

# Macos
# MacOS
.DS_Store
51 changes: 51 additions & 0 deletions Basis Server/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
*.swp
*.*~
project.lock.json
.DS_Store
*.pyc
nupkg/

# Visual Studio Code
.vscode

# Rider
.idea

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
[Oo]ut/
msbuild.log
msbuild.err
msbuild.wrn

# Visual Studio 2015
.vs/

# Nix stuff
**/.direnv/
/.envrc

# Macos
.DS_Store

# Basis exclusions
*.vsidx
*.nuspec
*.cache


Binary file not shown.
Binary file not shown.
111 changes: 0 additions & 111 deletions Basis Server/.vs/Basis Network Server/v17/DocumentLayout.backup.json

This file was deleted.

Loading
Loading