|
|
16bd5bfb6c
|
Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory
|
2024-01-18 11:46:03 +01:00 |
|
|
|
5346e596c8
|
[feature/AtomesFactory] - remove testing file
|
2024-01-18 11:28:02 +01:00 |
|
|
|
f613217658
|
[feature/AtomesFactory] - Add json for atomes
|
2024-01-18 10:38:59 +01:00 |
|
|
|
bc2b9e02fd
|
add Atomes Factory
|
2024-01-12 15:37:09 +01:00 |
|
|
|
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 |
|
|
|
de603d405f
|
Merge remote-tracking branch 'origin/develop' into feat/Molecule-json
|
2024-01-12 10:48:01 +01:00 |
|
|
|
118a669371
|
cleanup code
|
2024-01-12 10:20:31 +01:00 |
|
|
|
74a69cf8f7
|
add todo
|
2024-01-11 17:16:12 +01:00 |
|
|
|
e12fed0489
|
normalent on est quasi bon
|
2024-01-11 17:11:59 +01:00 |
|
|
|
33e34e9fde
|
convert to dict
|
2024-01-11 16:53:06 +01:00 |
|
|
|
7c3aa27c71
|
sync
|
2024-01-11 16:38:19 +01:00 |
|
|
|
5237a32bb4
|
ajout de la keystore de debug (user) + changement de la target version d'android
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
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 |
|
|
|
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 |
|
|
|
4e63a46dc6
|
add some mol and test
|
2024-01-06 18:41:15 +01:00 |
|
|
|
f1b3c7628c
|
add somme example
|
2024-01-06 16:29:29 +01:00 |
|
|
|
0c4b59e577
|
sync tout
|
2024-01-06 15:51:30 +01:00 |
|
|
|
a6cf8340bf
|
add molecule reader script
|
2024-01-06 15:51:13 +01:00 |
|
|
|
8f105732f7
|
Ajout de la multitarget pour générer un préfab
Actions 😎 / Build my project ✨ (push) Failing after 3m57s
|
2023-12-22 14:36:52 +01:00 |
|
|
|
7ac0ed4581
|
M: Changing organization of project
|
2023-11-09 17:15:33 +01:00 |
|
|
|
2c93918e51
|
Création du menu principal et des fichiers de config des atomes et des molécules
|
2023-11-02 12:25:50 +01:00 |
|
|
|
c0246cb3b5
|
initial commit
|
2023-11-02 10:53:40 +01:00 |
|
