feature/multi_targets #7

Merged
Nicolas merged 12 commits from feature/multi_targets into develop 2024-01-12 10:50:44 +00:00

12 Commits

Author SHA1 Message Date
f181fd9935 fix du mauvais nom de scene dans le script ChangeScene.cs 2024-01-12 11:50:10 +01:00
1c76868eee Merge remote-tracking branch 'origin/develop' into feature/multi_targets
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	QCAR/somedata16
2024-01-12 11:39:02 +01:00
f1ec062047 ajout du font fallback 2024-01-12 11:37:29 +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
a7912733e5 Ajout dans le canvas d'éléments UI (nom, description....) 2024-01-12 10:54:51 +01:00
0313fe28a1 Suppression du build de la CI 2024-01-12 09:57:07 +01:00
5237a32bb4 ajout de la keystore de debug (user) + changement de la target version d'android
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 1m2s
Actions 😎 / Release to the Google Play Store (push) Has been skipped
Actions 😎 / Build my project ✨ (pull_request) Failing after 53s
Actions 😎 / Release to the Google Play Store (pull_request) Has been skipped
2024-01-11 16:18:35 +01:00
afa265dd31 Affichage des molécules unitairement et en mode fusion
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 1m21s
Actions 😎 / Release to the Google Play Store (push) Has been skipped
2024-01-11 11:26:53 +01:00
84136dcc5c MAJ du fichier d'action build.yaml
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 5m40s
2023-12-22 15:05:47 +01:00
ce3c956544 MAJ du fichier d'action build.yaml
Some checks failed
Actions 😎 / Build my project ✨ (push) Has been cancelled
2023-12-22 15:02:10 +01:00
8f105732f7 Ajout de la multitarget pour générer un préfab
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 3m57s
2023-12-22 14:36:52 +01:00