Epitech/T-VIR-901_EpiLeARn
4
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/multi_targets

Browse Source 
# Conflicts:
#	Assets/Resources/VuforiaConfiguration.asset
#	Assets/__Scenes/CompositionMode.unity
#	Packages/com.ptc.vuforia.engine-10.18.4.tgz
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	ProjectSettings/TagManager.asset
This commit is contained in:
Nicolas
2024-01-12 11:03:32 +01:00
parent a7912733e5 73394e562d
commit aff9df22cf
227 changed files with 7539 additions and 6020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Packages/com.ptc.vuforia.engine-10.17.4.tgz (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
Packages/manifest.json
View File

@ -8,6 +8,7 @@
"com.unity.mobile.android-logcat": "1.3.2",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.5",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.9.1",
"com.unity.xr.management": "4.4.0",
"com.unity.modules.ai": "1.0.0",
@ -42,4 +43,4 @@
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}
}