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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2303

Assets/__Scenes/CompositionMode.unity Normal file

File diff suppressed because it is too large Load Diff

1252

Assets/__Scenes/MainMenu.unity Normal file

File diff suppressed because it is too large Load Diff

3802

Assets/__Scenes/QuizzMode.unity Normal file

File diff suppressed because it is too large Load Diff