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

Update Ubiq #5

Open
wants to merge 202 commits into
base: test_update
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
36c1c57
Tweaks to how node dependencies are used to allow rollup to Browser
sebjf Feb 6, 2023
5753a3d
Fixed issue where address resolution was not considering names of Gam…
sebjf Feb 15, 2023
7c4b10e
Merge branch 'v0.4.1'
sebjf Feb 15, 2023
6dce128
Updated version number
sebjf Feb 15, 2023
646f753
Updated version to 0.4.2
sebjf Feb 15, 2023
c242299
Fix missing avatars in bot sample
Feb 24, 2023
994e79f
Update version number
Feb 24, 2023
fd43b88
Merge branch 'dev-v0.4.3'
Feb 24, 2023
b4fcc66
Merge branch 'master' of github.com:UCL-VR/ubiq
sebjf Feb 24, 2023
5819c0e
Further tweaks to connections implementation to ease compatibility wi…
sebjf Feb 24, 2023
78e5e6d
Update README.md
sebjf Mar 1, 2023
49b8949
Added PeerConnectionManager js class
sebjf Mar 3, 2023
d825a94
Exposed PeerSignallingState to Editor
sebjf Mar 3, 2023
dd9571e
Updated how namespaced networkids are computed, so the browser and pc…
sebjf Mar 3, 2023
bde17bb
Merge branch 'master' of github.com:UCL-VR/ubiq into dev-browserupdates
sebjf Mar 6, 2023
94fbcea
Added AvatarManager Js Component and began refactoring the client bro…
sebjf Mar 6, 2023
db8b2b1
Deprecated old web samples
sebjf Mar 31, 2023
faaa174
Added new asset to store a Room Guid and refactored Samples to use th…
sebjf Mar 31, 2023
0c7a7dd
Added polite/impolite flag to PeerConnection inspector
sebjf Mar 31, 2023
05b4a6e
Added support for unregistering components and for receiving all mess…
sebjf Mar 31, 2023
5d85447
Override of toString for networkid
sebjf Mar 31, 2023
786761f
Updated samples to use new configs generated by SampleHelper
sebjf Mar 31, 2023
d5e5f57
Added new RTCPeerConnection sample
sebjf Mar 31, 2023
5316065
Ignored the local certs as these will never be the same on multiple c…
sebjf Mar 31, 2023
254f157
Added Browser samples, with build of bundle.js
sebjf Mar 31, 2023
886149a
Committed configs so user can see what they are, though they should b…
sebjf Mar 31, 2023
7ffc0c3
Deprecated Web Sample for now
sebjf Mar 31, 2023
3d2af18
Updated questionnaire sample to use social network scene
sebjf Apr 4, 2023
fbb9468
Updated rollup config to match platforms directory
sebjf Apr 4, 2023
19f26a6
Updated PeerConnectionManager to support removing PeerConnection Comp…
sebjf Apr 4, 2023
49f3197
Fix issue where avatar prefab could not be changed in-editor
Apr 13, 2023
4c3843f
Fix avatar not updating when prefab swapped
Apr 13, 2023
ea7af2a
Update README.md
bnco-dev Apr 13, 2023
84ad9d3
Bump UPM package version number
Apr 13, 2023
fa06648
Update IsFullCheckout test to work without file system
Apr 18, 2023
176b628
Merge pull request #30 from UCL-VR/dev-browserupdates
bnco-dev Apr 18, 2023
15ad6db
Add Unity's WebRTC package to replace SipSorcery on select platforms
May 12, 2023
ef0b455
Adjust import settings for WebRTC packages to cover all platforms
May 14, 2023
f299a0a
Remove scripting backend warning for VOIP as no longer using dotnet f…
May 14, 2023
dd82e66
Update SIPSorcery to 6.0.12
May 14, 2023
483f434
Workaround for Unity's JsonUtility mishandling of null values
May 19, 2023
702e1ae
Re-use audio track in Unity WebRTC compat plugin
May 23, 2023
cdf9345
Workaround for JsonUtility's mishandling of null values on web side
May 23, 2023
2ae2630
Update dotnet implementation for perfect/synchronous signaling
May 23, 2023
3072d85
Correct comment in voip warning
May 23, 2023
f6dcb49
Fix bug where VoipAvatar could ref itself after destruction causing n…
May 23, 2023
08e4494
Remove dotnet WebRTC implementation
May 23, 2023
f23ce62
Revert "Remove dotnet WebRTC implementation"
May 24, 2023
50ae44c
Workaround for issues in dotnet Webrtc package
May 30, 2023
237157a
Remove candidate prefix string hack
May 31, 2023
e1b4c23
Update WebRTC signalling on Node and Browser side
May 31, 2023
1a37390
Merge branch 'master' of github.com:UCL-VR/ubiq
sebjf Jun 5, 2023
f1ea03e
Update README.md
bnco-dev Jun 6, 2023
fe6b604
Update min Unity version to 2021.3 LTS
Jun 28, 2023
9dbe6de
Added public method to UbiqAvatarHintsHelper to allow for a reset of …
FJThiel Jul 4, 2023
5a5de25
Add stats for playback and record for Win, Mac, Linux, Android and do…
bnco-dev Jul 11, 2023
5780ef6
Update speech indicator and add general purpose volume estimator
bnco-dev Jul 24, 2023
4f513ce
Merge pull request #34 from FJThiel/HintReset
bnco-dev Jul 24, 2023
5a08065
Adding an automatic reconnection process to RoomClient for recovery a…
FJThiel Jul 25, 2023
8308eb9
Merge branch 'dev-audiostats'
bnco-dev Jul 25, 2023
975cc42
Bump package verson
bnco-dev Jul 25, 2023
aaf2a50
Update upm.yaml
bnco-dev Jul 25, 2023
c8028ea
feat: upgraded node server to use typescript
TheBv Sep 19, 2023
96d0677
Merge branch 'master' of github.com:TheBv/ubiq into serverUpgrade1
sebjf Sep 25, 2023
79b31b2
Continued with port of server to typescript: server now runs directly…
sebjf Oct 27, 2023
a096654
Snapturn option (#36)
FJThiel Nov 1, 2023
0aa24f0
Cursor scaling (#35)
FJThiel Nov 1, 2023
eb97829
Continued typescript upgrade - extended unit tests, fixed browser sam…
sebjf Nov 17, 2023
7f43555
Updated configs
sebjf Nov 17, 2023
0845e9f
Added ICE module test and updated tests to use config files
sebjf Nov 17, 2023
c502591
Fixed export names of Status
sebjf Nov 17, 2023
fb22eda
Added ESLint with some default rules, and updated all files to fulfil…
sebjf Nov 17, 2023
d945e5a
Fixed WebRTC signalling types
sebjf Nov 22, 2023
451c093
Continued to polish Js part of the project; finished making updates f…
sebjf Nov 22, 2023
0dcd952
Fixed tsconfig for jest config (see https://github.com/jestjs/jest/is…
sebjf Nov 22, 2023
8d92406
Futher linter fixes
sebjf Nov 22, 2023
bf7f964
Removed accidentally committed config
sebjf Nov 22, 2023
9372088
Rolled back change to PeerConnectionImpl negotation state machine
sebjf Nov 29, 2023
041f12f
Make it exactly as before for PR
sebjf Nov 29, 2023
8499041
Pulled minor improvements required by browsersamples
sebjf Nov 29, 2023
26d01e4
Made Unity PeerConnection accessible
sebjf Nov 29, 2023
273321e
Fix issue causing avatars not to despawn when prefab changed at runtime
Nov 30, 2023
d310028
Fixed Rooms unit test, and added additional ice server unit test
sebjf Dec 5, 2023
a31bfee
Merge pull request #39 from UCL-VR/serverUpgrade1
sebjf Dec 5, 2023
43e1a4d
Moved Bots Avatar Hints to Samples directory and tweaked functionalit…
sebjf Dec 7, 2023
ac58d8a
FollowGraspable now has IsGrasped member
sebjf Dec 7, 2023
a7dfc36
Initialised event and disabled graphic raycaster on menu by default
sebjf Dec 7, 2023
e8e2cb1
Added additional error checking during Register
sebjf Dec 7, 2023
cd64e74
VS Whitespace Auto Adjust
sebjf Dec 7, 2023
33833a8
Updated SaveAndMirror to store preferences for the local project inst…
sebjf Dec 7, 2023
9fc9e99
Removed remnants of observers logic from server
sebjf Jan 10, 2024
7ce5673
Updated documentation to match server revisions
sebjf Jan 10, 2024
306ddd7
Tweak so status page doesn't crash with default config and no keys
sebjf Jan 10, 2024
8517be2
Minor fixes/changes to logging (#46)
nsalminen Jan 16, 2024
40e0988
Add XRI compatibility
Jan 18, 2024
7eb83dc
Fix minor packaging issue causing editor log spam
Jan 18, 2024
fe24627
Updated Readme with new getting started steps that point to the XRI s…
sebjf Jan 22, 2024
a3db656
Added engines section to Node package to prohibit a subset of Node v1…
sebjf Jan 25, 2024
f769c71
Fix assembly definitions to allow android build
Jan 23, 2024
f262fdc
Merge remote-tracking branch 'origin/master'
Jan 26, 2024
2ca2da6
Add workaround for compatibility issue between Unity's WebRTC and Ocu…
Jan 26, 2024
c286c65
Bump package number and remove WebRTC dependencies
Jan 26, 2024
0316ad9
Added roomclient to window, and gated join check in case user has not…
sebjf Feb 20, 2024
6c4f420
Added Dockerfile for quick server deployment
sebjf Feb 20, 2024
b785828
Merge pull request #51 from UCL-VR/docker
sebjf Feb 20, 2024
cb16a81
Make materials compatible with URP and Builtin, allow hint providers …
Mar 18, 2024
ffabe49
Merge branch 'master' of github.com:UCL-VR/ubiq
Mar 18, 2024
ed96dbc
Move ubiq unity files into dedicated folder and update upm script
bnco-dev Mar 18, 2024
ae6b599
Add sample-requirements capability to PackageManagerHelper and use fo…
bnco-dev Mar 26, 2024
072abea
Remove old manual sample import prompt
bnco-dev Mar 27, 2024
7a56afb
Remove unused version defines
bnco-dev Mar 27, 2024
3488f9e
Refactor XRI classes in core
bnco-dev Mar 27, 2024
14d4f60
Add instructions for WebXR, add XR Hands and sample to required list …
bnco-dev Apr 4, 2024
222d211
Add Hands Interaction Demo sample dependency, correct logging in Pack…
bnco-dev Apr 8, 2024
84d2397
Fix remaining non-URP compatible materials, disable WebXR autoloaders
bnco-dev Apr 8, 2024
52ff681
Bump version number
bnco-dev Apr 9, 2024
3f59469
Remove Samples folder meta file with package build action
bnco-dev Apr 9, 2024
d4de590
Correct preprocessor guards around WebXR config file manipulation
bnco-dev Apr 9, 2024
5b6455b
Ignore staged changes when removing meta file
bnco-dev Apr 9, 2024
c7c05eb
Add more preprocessor guards for WebXR import
bnco-dev Apr 9, 2024
517de1d
Fix for case where WebXR settings is null
bnco-dev Apr 9, 2024
5887e14
Save modified WebXR settings asset
bnco-dev Apr 9, 2024
22ce03c
Update quick start instructions in readme
bnco-dev Apr 29, 2024
3716d73
Ignore jetbrains config files
bnco-dev Apr 29, 2024
5e8b85a
Add ReadyPlayerMe sample
bnco-dev May 1, 2024
d55de47
Update ReadyPlayerMe sample readme
bnco-dev May 2, 2024
4c9a9ff
Point ReadyPlayerMe sample gif link to this repo
bnco-dev May 2, 2024
e47a057
Bump Unity package version
bnco-dev May 2, 2024
9aaf902
Fix incorrect avatar hint setup for XRI
bnco-dev May 9, 2024
445d7e5
Fix displayname not being set correctly
bnco-dev May 9, 2024
aa0adc3
Fix shader uniform name in firework box affordance
bnco-dev May 9, 2024
01227a3
Bump Unity package version
bnco-dev May 10, 2024
16bf063
Set shadergraph to a version supported by 2021.3 (partial fix #53)
bnco-dev Jun 7, 2024
4759c3a
Workaround for missing platform names Unity bug (full fix #53)
bnco-dev Jun 7, 2024
dc5cc57
Bump package version and update minimum supported editor version
bnco-dev Jun 11, 2024
9e19c50
Merge bumped package version
bnco-dev Jun 11, 2024
70107ce
Fix for server failing with unusual header lengths
sebjf Jun 26, 2024
f7e3b73
Hotfix to server - updated the min message size criteria
sebjf Jun 30, 2024
c6d86f8
Manual merge of ubiq-web demo, removing old hints, adding new input s…
bnco-dev Jul 2, 2024
fca5c14
Merge ubiq-web samples
bnco-dev Jul 2, 2024
db4c153
Split AvatarInputProviders into separate files
bnco-dev Jul 3, 2024
99eeeef
Update to 2022.3.32f1 and reformat examples to simplify adding new sc…
bnco-dev Jul 3, 2024
2b8a95b
Update 3dpen tutorial for v1.0.0-pre.7
bnco-dev Jul 5, 2024
5dee0b1
Finalise avatar input system naming, update examples
bnco-dev Jul 19, 2024
4d7cfd7
Remove dependencies on XRI player prefabs and with an extra Ubiq Avat…
bnco-dev Jul 23, 2024
4f9a4fe
Bump package version
bnco-dev Jul 23, 2024
f00665e
Fix conditional imports in HandSkeleton avatar input
bnco-dev Jul 23, 2024
3295494
Fix XRHands dependence on XRCoreUtils
bnco-dev Jul 23, 2024
fe69899
Find WebXR refs in scene, make XR Simulator EditorOnly
bnco-dev Jul 25, 2024
3f38b07
Update ubiq/ready-player-me prefab, correct ref-finding behaviour on …
bnco-dev Jul 25, 2024
f3195d0
Merge remote-tracking branch 'refs/remotes/origin/master'
bnco-dev Jul 25, 2024
b4904b0
Update README.md
bnco-dev Jul 26, 2024
a69c599
Added zero-length packet test to server
sebjf Jul 26, 2024
fd8cc16
Merge branch 'master' of github.com:UCL-VR/ubiq
sebjf Jul 26, 2024
d42803b
Added events to web xr bridge
sebjf Jul 26, 2024
a087fcd
Added desktop XRIT control scheme and inserted into demo scene, disab…
sebjf Jul 26, 2024
ccba7da
updated desktop controller hints to use meshes instead of pngs, and r…
sebjf Aug 7, 2024
01a1877
reverting some project wide changes that are not necessary
sebjf Aug 8, 2024
cb73f11
final tweaks to UI
sebjf Aug 8, 2024
ff70709
hotfix for server infinite loop bug
sebjf Aug 9, 2024
be85c78
Merge pull request #55 from UCL-VR/dev-desktopxrit
bnco-dev Aug 9, 2024
6b54ffe
Configure auto-reconnect to behave similarly to leaving and rejoining…
bnco-dev Aug 14, 2024
f6d0997
Correct bump package version
bnco-dev Aug 19, 2024
9b1c2e4
Fix issue causing rejoin to fail when reconnecting after multiple att…
bnco-dev Aug 19, 2024
6e91c24
Merge remote-tracking branch 'refs/remotes/origin/master'
bnco-dev Aug 19, 2024
b1019b8
Fix firework interaction and add lifetime
bnco-dev Aug 20, 2024
8435355
Make connection warning persistent during reconnect attempts
bnco-dev Aug 20, 2024
1649220
Rename to avoid hiding warning
bnco-dev Aug 20, 2024
fa8d11f
Integrate motion matching and example avatar
bnco-dev Sep 17, 2024
bf7f807
Fix out of bounds error when getting pose in motion matching
bnco-dev Sep 19, 2024
cf4dfd8
Convert motion matching output to be framerate independent and remove…
bnco-dev Sep 19, 2024
0e1ed8a
Compute velocity and acceleration for predictions, calculate with del…
bnco-dev Sep 23, 2024
b8d5109
Update project and MMVR prefab settings
bnco-dev Sep 23, 2024
5130f8c
Use span to avoid memory allocation in upper body solve
bnco-dev Sep 23, 2024
25b8925
Minor legibility modifications
bnco-dev Sep 25, 2024
f2269e8
Fix missing material on wrist prefab
bnco-dev Sep 30, 2024
ef2cc3b
Add Rocketbox and ReadyPlayerMe avatars
bnco-dev Oct 7, 2024
cd7581a
Bump package number
bnco-dev Oct 7, 2024
6adcf69
Clarify readme for WebXR compatibility prefab
bnco-dev Oct 11, 2024
b1c016b
Fix bots regression
bnco-dev Oct 11, 2024
a7ed677
Fix missing dependencies #57
bnco-dev Nov 11, 2024
ca0dd8c
Allow for XRI versions prior to 3.0.0
bnco-dev Nov 14, 2024
86afa92
Re-enable Unity webrtc package on Android
bnco-dev Nov 14, 2024
724063e
Update package management to unload old webrtc packages and install new
bnco-dev Nov 14, 2024
14b8f71
Update local unity and xri version
bnco-dev Nov 14, 2024
e1c684a
Bump package version
bnco-dev Nov 14, 2024
242df9a
Move desktop controller out of samples and put behind condtional comp…
bnco-dev Nov 14, 2024
67fa0d0
Fixed lower body calibration for RPM MMVR
sebjf Nov 15, 2024
081ddb6
Fix #49
bnco-dev Nov 18, 2024
5594b0f
Update to latest webrtc version (auto-pulled by UPM)
bnco-dev Nov 18, 2024
39ae313
Update to XRI 3 and XRHands 1.5
bnco-dev Nov 21, 2024
87c3a36
Merge remote-tracking branch 'refs/remotes/origin/master'
bnco-dev Nov 21, 2024
f913431
Fix ambiguous method call on Unity6
bnco-dev Nov 22, 2024
7bf01db
Update WebXR core to 0.22.1
bnco-dev Nov 25, 2024
2f65f79
Prevent unused variable warning
bnco-dev Nov 26, 2024
1049c4d
Support hand tracking input in demo scene
bnco-dev Dec 3, 2024
5357f55
MMVR off by default
bnco-dev Dec 3, 2024
d2d1ca2
Make fireworks more fun
bnco-dev Dec 3, 2024
5fdb972
Convert to URP
bnco-dev Dec 5, 2024
5f6a2b9
Fix reconnect behaviour on web
bnco-dev Dec 5, 2024
1c82d09
Update README.md
bnco-dev Dec 9, 2024
7e3d346
Update README.md
bnco-dev Dec 9, 2024
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.
50 changes: 50 additions & 0 deletions .github/workflows/build-upm-from-project-folder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
on:
workflow_call:
inputs:
project-folder:
required: true
type: string
upm-branch:
required: true
type: string
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout release
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- name: Remove everything except for our project
run: |
git rm -rf .
git checkout HEAD -- ${{ inputs.project-folder }}/*
git mv ${{ inputs.project-folder }}/* .
rm -rf ${{ inputs.project-folder }}
- name: Fetch branch
run: git fetch origin ${{ inputs.upm-branch }}:${{ inputs.upm-branch }} || true
- name: Create upm branch if it does not yet exist
run: git branch ${{ inputs.upm-branch }} || true
- name: Move to upm branch without changing working copy
run: |
git checkout --detach
git reset --soft ${{ inputs.upm-branch }}
git checkout ${{ inputs.upm-branch }}
- name: Rename samples to prevent Unity auto-import
run: git mv Samples Samples~
- name: Remove samples .meta file to stop empty folder import
run: git rm -f Samples.meta
- name: Print folder contents (for debug)
run: ls -R | grep ":$" | sed -e 's/:$//' -e 's/[^-][^\/]*\// /g' -e 's/^/ /'
- name: Config user name
run: git config --global user.name "github-actions[bot]"
- name: Config user email
run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Add
run: git add *
- name: Commit
run: git commit -m "Add upm package for ${GITHUB_REF#refs/*/}"
- name: Tag
run: git tag -a upm-${GITHUB_REF#refs/*/} -m ""
- name: Push
run: git push --follow-tags --set-upstream origin ${{ inputs.upm-branch }}
File renamed without changes.
10 changes: 10 additions & 0 deletions .github/workflows/upm-unity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Update upm branch on release
on:
push:
tags: [ 'unity-v*.*.*' ]
jobs:
build-upm:
uses: ./.github/workflows/build-upm-from-project-folder.yml
with:
project-folder: Unity/Assets/Ubiq
upm-branch: upm
52 changes: 0 additions & 52 deletions .github/workflows/upm.yaml

This file was deleted.

File renamed without changes.
File renamed without changes.
Loading