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

Merge main into Meta quest3 dev #34

Open
wants to merge 65 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
d56a299
Implemented a working version for the Quest 3
juliushaag Jun 27, 2024
c53bee0
added passtrough support
JuliusJacobitz Jul 4, 2024
006fc57
add interaction rig and sample grabbable
JuliusJacobitz Jul 4, 2024
5a364c5
moving scene works, robot is bugged
JuliusJacobitz Jul 11, 2024
4136339
switch to universal _makeGrabbable method
JuliusJacobitz Jul 11, 2024
8cf4eb0
fixed robot to scene movement
juliushaag Jul 12, 2024
e9a4031
author : JJ - Static Scene Object grabbable' rm grabbable scenecontro…
juliushaag Jul 12, 2024
e90a5c4
tried out mesh combiner, adjusted sphere collider
JuliusJacobitz Jul 12, 2024
a8dd8fa
add scene lock and position persistance across sessions
JuliusJacobitz Jul 12, 2024
41ae379
rm .vsconfig
JuliusJacobitz Jul 18, 2024
700650f
rm test.py
JuliusJacobitz Jul 18, 2024
a537bf0
rm unused prefabs
JuliusJacobitz Jul 18, 2024
442f581
rm unused scripts
JuliusJacobitz Jul 18, 2024
e8fb421
merge meta-quest3-dev -> jj_move_scene
JuliusJacobitz Jul 18, 2024
e7a8868
fixed merge conflicts
JuliusJacobitz Jul 18, 2024
9c8b7fb
move stuff into MetaQuest3 folder
JuliusJacobitz Jul 18, 2024
1e0d630
moved SimScene folder into Assets
JuliusJacobitz Jul 18, 2024
166c9af
Merge pull request #3 from intuitive-robots/jj_move_scene
xinkai-jiang Jul 19, 2024
3f43170
Merge branch 'main' into feat/meta-quest3-merge
xinkai-jiang Jul 28, 2024
38cd787
Merge branch 'main' into feat/meta-quest3-merge
xinkai-jiang Jul 28, 2024
316896f
merge main
xinkai-jiang Jul 28, 2024
2c45985
meta quest3 streamer
xinkai-jiang Jul 29, 2024
51422ce
Merge branch 'main' into meta-quest3-dev
xinkai-jiang Jul 30, 2024
6f1b102
Merge branch 'main' into feat/meta-quest3-merge
xinkai-jiang Jul 30, 2024
70f00f3
meta quest3 controller
xinkai-jiang Jul 30, 2024
e6ed001
Merge branch 'main' into feat/meta-quest3-merge
xinkai-jiang Jul 30, 2024
1e6e07f
test meta quest 3 controller
xinkai-jiang Jul 30, 2024
8606b38
merge streamer
xinkai-jiang Jul 30, 2024
f8aebfa
merge from main
xinkai-jiang Aug 5, 2024
0168499
fix the bugs of subcription
xinkai-jiang Aug 6, 2024
a0e5e1a
merge from the main branch
xinkai-jiang Aug 6, 2024
eaa6715
meta-quest3-fix-inputdata-bugs
xinkai-jiang Aug 6, 2024
de07212
Merge pull request #10 from intuitive-robots/fix/meta-quest3-inputdata
xinkai-jiang Aug 6, 2024
2aa5dd8
try interaction
xinkai-jiang Aug 6, 2024
60a1e71
Merge pull request #11 from intuitive-robots/main
xinkai-jiang Aug 7, 2024
d648b38
Merge branch 'main' into meta-quest3-dev
xinkai-jiang Aug 8, 2024
fa9f0bc
merge from main
xinkai-jiang Aug 8, 2024
b550cb5
merge from main
xinkai-jiang Aug 8, 2024
1bfa7e3
merge from meta quest3
xinkai-jiang Aug 8, 2024
f7652ee
temp save
xinkai-jiang Aug 8, 2024
00ad841
scene ray moveable
Aug 8, 2024
5cfff31
Merge branch 'main' into feat/meta-quest3/origin
xinkai-jiang Aug 9, 2024
e32441a
addjust the ray interaction sphere to 0.5
xinkai-jiang Aug 9, 2024
884fae8
Merge pull request #15 from intuitive-robots/feat/meta-quest3/origin
xinkai-jiang Aug 9, 2024
91322ad
Merge pull request #16 from intuitive-robots/main
xinkai-jiang Aug 9, 2024
0e8aa9d
Merge
xinkai-jiang Aug 27, 2024
c42cf27
Merge branch 'main' into meta-quest3-dev
xinkai-jiang Aug 29, 2024
c4d9a0c
Merge pull request #22 from intuitive-robots/main
xinkai-jiang Sep 4, 2024
d0fb119
Merge pull request #25 from intuitive-robots/main
xinkai-jiang Sep 10, 2024
80a58a4
meta quest3 vibration
xinkai-jiang Sep 10, 2024
5a17cc0
merge from main
xinkai-jiang Sep 10, 2024
b7029eb
Merge pull request #29 from intuitive-robots/main
xinkai-jiang Sep 10, 2024
aaf763d
change the lighting to reduce the shade
xinkai-jiang Sep 14, 2024
0058994
Merge pull request #30 from intuitive-robots/main
xinkai-jiang Nov 4, 2024
7bf5855
merge from main
xinkai-jiang Nov 11, 2024
02b5704
merge from main
xinkai-jiang Nov 15, 2024
0f24863
Merge branch 'main' of github.com:intuitive-robots/IRXR-Unity into me…
xinkai-jiang Nov 27, 2024
8e1988a
Merge branch 'main' of github.com:intuitive-robots/IRXR-Unity into me…
xinkai-jiang Nov 27, 2024
18ef6a0
test and ready for merge to mq3
xinkai-jiang Nov 27, 2024
0e294c0
multiple nodes and simpubweb support
xinkai-jiang Dec 19, 2024
1dfed33
fix two mcs alignment bugs
xinkai-jiang Dec 19, 2024
7e16cd6
fix the log bugs and input data
xinkai-jiang Dec 20, 2024
8fcfca4
alignment only rely on mc
xinkai-jiang Dec 20, 2024
24cab88
Merge branch 'main' into meta-quest3-dev
xinkai-jiang Dec 29, 2024
4aa3763
merge from main branch
xinkai-jiang Dec 29, 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio Config
.vsconfig

# Visual Studio Code
.vscode/

Expand Down
14 changes: 7 additions & 7 deletions Assets/IRXRClient/Prefabs/IRXRClient.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 980812101842878387}
- component: {fileID: 5832729445623490539}
- component: {fileID: 9004782405653955561}
- component: {fileID: 6061640762099415726}
- component: {fileID: 2422481625191870672}
m_Layer: 0
m_Name: IRXRClient
m_TagString: Untagged
Expand All @@ -33,7 +33,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5832729445623490539
--- !u!114 &6061640762099415726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -42,11 +42,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1956348136357179381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6ea543980d7f8014582c156390e33b5a, type: 3}
m_Script: {fileID: 11500000, guid: 98589490932ca12fb84a61b64c399c6d, type: 3}
m_Name:
m_EditorClassIdentifier:
host: UnityEditor
--- !u!114 &9004782405653955561
--- !u!114 &2422481625191870672
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -55,6 +54,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1956348136357179381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62ec33cbc3e21ee3ca006b31a9a3da1b, type: 3}
m_Script: {fileID: 11500000, guid: a53e1e9ea2018bc11880eb260d936e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
telemetryEnabled: 1
11 changes: 1 addition & 10 deletions Assets/IRXRClient/Scripts/IRXRNetManager.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/IconSet.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/IconSet/IRL_Icon_blue.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/MetaQuest3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/MetaQuest3/Prefabs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/MetaQuest3/Prefabs/BBox.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading