10 Commits

Author SHA1 Message Date
a8476f4906 Merge commit '807aa8c3c6e62c5d033064e3190ae432fb66db03' into feat/molecule/bons 2024-01-18 12:19:30 +01:00
13c59458bb sync 2024-01-12 16:28:35 +01:00
f181fd9935 fix du mauvais nom de scene dans le script ChangeScene.cs 2024-01-12 11:50:10 +01:00
9c23975b20 rajouts des fonts text mesh pro 2024-01-12 11:36:49 +01:00
aff9df22cf Merge remote-tracking branch 'origin/develop' into feature/multi_targets
# 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
2024-01-12 11:03:32 +01:00
7d921904d6 Quizz: Removing meta files 2024-01-10 17:16:12 +01:00
cf05f3814f Quizz: Adding first version of quizz 2024-01-10 17:14:23 +01:00
47a6f34f09 Quizz: Finish Launcher 2024-01-08 22:03:29 +01:00
d1da82d39c Quizz: Adding loading system 2024-01-08 17:33:23 +01:00
7ac0ed4581 M: Changing organization of project 2023-11-09 17:15:33 +01:00