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

develop #12

Merged
Nicolas merged 57 commits from develop into main 2024-02-02 15:43:29 +00:00
Conversation 0 Commits 57 Files Changed 320 +32991 -4189

57 Commits

Author SHA1 Message Date
Nicolas
7084fcaa30 Merge pull request 'Prise en compte du module factory pour créer et afficher des gameobjects dynamiquement' (#11) from feature/molecule into develop 
Reviewed-on: #11
Reviewed-by: Clement <clement@jo85.com>
 2024-02-02 16:43:00 +01:00
Nicolas
a642cc0a38 ajout de l'atom factory 2024-02-02 15:29:49 +01:00
Nicolas
91e3d2e28a Merge pull request 'feature/AtomesFactory' (#13) from feature/AtomesFactory into develop 
Reviewed-on: #13
Reviewed-by: Nicolas <nicolas.sansd@gmail.com>
 2024-02-02 15:03:43 +01:00
Nicolas
9c5f5b15fb Merge remote-tracking branch 'origin/develop' into feature/molecule 
# Conflicts:
#	Assets/script/AtomeFactory.cs
 2024-02-02 14:09:36 +01:00
Nicolas
27ce4e14a8 Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory 2024-02-02 14:02:05 +01:00
Mathis
9b7b156d7b add 3D atome 2024-02-02 14:33:35 +01:00
Mathis
f7a2cc4c88 Add factory for animated Atome 2024-01-26 12:03:56 +01:00
Nicolas
f4be67ca29 Création du prefab et script de l'atom + ajout du lock mode 2024-01-19 10:07:10 +01:00
Nicolas
58782722d3 rajout de la gestion d'animation + des factory 2024-01-18 16:28:39 +01:00
Nicolas
cb0396e23c Merge pull request 'feat: liaison entre les molécules et couleur' (#9) from feat/molecule/bons into develop 
Reviewed-on: #9
Reviewed-by: Mathis <mathis.ragot@epitech.eu>
 2024-01-18 14:47:23 +01:00
Nicolas
9de97ad486 Merge remote-tracking branch 'origin/develop' into feature/molecule 
# Conflicts:
#	Assets/script/MoleculeFactory.cs
 2024-01-18 13:53:20 +01:00
Nicolas
aca2898e8c Merge remote-tracking branch 'origin/develop' into feat/molecule/bons 
# Conflicts:
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydro_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogen_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogene_marker_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxy_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygen_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygene_marker_scaled.jpg.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
#	Assets/__Scenes/MainMenu.unity
 2024-01-18 13:46:44 +01:00
clement
1bf7031f32 on est good 2024-01-18 14:24:40 +01:00
clement
5ca3d16a29 Squashed commit of the following: 
commit 807aa8c3c6e62c5d033064e3190ae432fb66db03
Merge: 34f74aa 3777d06
Author: Clement <clement@jo85.com>
Date:   Thu Jan 18 12:02:57 2024 +0100

    Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop

    Reviewed-on: #10
    Reviewed-by: Clement <clement@jo85.com>

commit 3777d06a0ee942994fdfe90d71fc5056c37346d9
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 12:00:00 2024 +0100

    Rename Classname

commit 16bd5bfb6cd51e253e22417ab8196a58e1726849
Merge: da9d57b 34f74aa
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 11:46:03 2024 +0100

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

commit da9d57b0bba34dbe24f5e7f744ce60f430832ff4
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 11:44:22 2024 +0100

    vue foria config

commit 5346e596c8a0db7684b64920c328abee459926d9
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 11:28:02 2024 +0100

    [feature/AtomesFactory] - remove testing file

commit f613217658cf2f1f48ceeeaa3183e515de857213
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 10:38:59 2024 +0100

    [feature/AtomesFactory] - Add json for atomes

commit bc2b9e02fdb692d56937bd37cc3d821ffb717424
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Fri Jan 12 15:37:09 2024 +0100

    add Atomes Factory

commit 34f74aa44366c6d5f9e0d647a7837704edbd5fad
Merge: 8b6d07f f181fd9
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:50:43 2024 +0100

    Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop

    Reviewed-on: #7
    Reviewed-by: Clement <clement@jo85.com>

commit f181fd993504c811a4546e56f83eb05ed62a625d
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:50:10 2024 +0100

    fix du mauvais nom de scene dans le script ChangeScene.cs

commit 1c76868eee12406d6c39fa64da8462e35019a39e
Merge: f1ec062 8b6d07f
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:39:02 2024 +0100

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

commit f1ec062047ba68d48493b25273ba5893f42a890f
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:37:29 2024 +0100

    ajout du font fallback

commit 9c23975b204ceb09bd3ccc57b847cf0a8158fb95
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:36:49 2024 +0100

    rajouts des fonts text mesh pro

commit aff9df22cfbed9e8b317cafe4269fce891a5bbe5
Merge: a791273 73394e5
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:03:32 2024 +0100

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

commit a7912733e5fed60b9514c778fd9f40661dc66b64
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 10:54:51 2024 +0100

    Ajout dans le canvas d'éléments UI (nom, description....)

commit 0313fe28a1b718152015a401fda32069e94303c0
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 09:57:07 2024 +0100

    Suppression du build de la CI

commit 5237a32bb4759c43104e9397cb43b328a99b7c62
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Thu Jan 11 16:18:35 2024 +0100

    ajout de la keystore de debug (user) + changement de la target version d'android

commit afa265dd3141ef3fd96bff685ca655594453a876
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Thu Jan 11 11:26:53 2024 +0100

    Affichage des molécules unitairement et en mode fusion

commit 84136dcc5c3b00603ba8531901418125a832a255
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Dec 22 15:05:47 2023 +0100

    MAJ du fichier d'action build.yaml

commit ce3c95654431f25e22810481f3b10b24f158decd
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Dec 22 15:02:10 2023 +0100

    MAJ du fichier d'action build.yaml

commit 8f105732f7aaa41689894ab388675ae0b79f66f6
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Dec 22 14:36:52 2023 +0100

    Ajout de la multitarget pour générer un préfab
 2024-01-18 14:00:09 +01:00
Nicolas
8ca1aa7ad8 Ajout de composants et de leurs markers 2024-01-18 13:45:04 +01:00
clement
824a8fdbc6 feat: WIP color 2024-01-18 12:03:38 +01:00
Clement
807aa8c3c6 Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop 
Reviewed-on: #10
Reviewed-by: Clement <clement@jo85.com>
 2024-01-18 12:02:57 +01:00
Mathis
3777d06a0e Rename Classname 2024-01-18 12:00:00 +01:00
Mathis
16bd5bfb6c Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory 2024-01-18 11:46:03 +01:00
Mathis
da9d57b0bb vue foria config 2024-01-18 11:44:22 +01:00
Mathis
5346e596c8 [feature/AtomesFactory] - remove testing file 2024-01-18 11:28:02 +01:00
clement
c302d4c277 color okay 2024-01-18 11:25:51 +01:00
Mathis
f613217658 [feature/AtomesFactory] - Add json for atomes 2024-01-18 10:38:59 +01:00
clement
13c59458bb sync 2024-01-12 16:28:35 +01:00
Nicolas
e5a1e71788 Prise en compte du module factory pour créer et afficher des gameobjects dynamiquement 2024-01-12 15:41:11 +01:00
Mathis
bc2b9e02fd add Atomes Factory 2024-01-12 15:37:09 +01:00
Nicolas
34f74aa443 Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop 
Reviewed-on: #7
Reviewed-by: Clement <clement@jo85.com>
 2024-01-12 11:50:43 +01:00
Nicolas
f181fd9935 fix du mauvais nom de scene dans le script ChangeScene.cs 2024-01-12 11:50:10 +01:00
Nicolas
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
Clement
8b6d07fb3d Merge pull request 'feat:Molecule-json' (#8) from feat/Molecule-json into develop 
Reviewed-on: #8
Reviewed-by: Nicolas <nicolas.sansd@gmail.com>
 2024-01-12 11:38:05 +01:00
Nicolas
f1ec062047 ajout du font fallback 2024-01-12 11:37:29 +01:00
Nicolas
9c23975b20 rajouts des fonts text mesh pro 2024-01-12 11:36:49 +01:00
Nicolas
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
Nicolas
a7912733e5 Ajout dans le canvas d'éléments UI (nom, description....) 2024-01-12 10:54:51 +01:00
clement
de603d405f Merge remote-tracking branch 'origin/develop' into feat/Molecule-json 2024-01-12 10:48:01 +01:00
clement
118a669371 cleanup code 2024-01-12 10:20:31 +01:00
Nicolas
0313fe28a1 Suppression du build de la CI 2024-01-12 09:57:07 +01:00
clement
74a69cf8f7 add todo 2024-01-11 17:16:12 +01:00
clement
e12fed0489 normalent on est quasi bon 2024-01-11 17:11:59 +01:00
clement
33e34e9fde convert to dict 2024-01-11 16:53:06 +01:00
clement
7c3aa27c71 sync 2024-01-11 16:38:19 +01:00
Nicolas
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
Details
Actions 😎 / Release to the Google Play Store (push) Has been skipped
Details
Actions 😎 / Build my project ✨ (pull_request) Failing after 53s
Details
Actions 😎 / Release to the Google Play Store (pull_request) Has been skipped
Details
2024-01-11 16:18:35 +01:00
Gildas
73394e562d Merge pull request 'Quizz: Adding functionnal quizz feature' (#6) from feature/quizz_launcher into develop 
Reviewed-on: #6
 2024-01-11 15:23:47 +01:00
Nicolas
afa265dd31 Affichage des molécules unitairement et en mode fusion
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 1m21s
Details
Actions 😎 / Release to the Google Play Store (push) Has been skipped
Details
2024-01-11 11:26:53 +01:00
Guska
7d921904d6 Quizz: Removing meta files 2024-01-10 17:16:12 +01:00
Guska
cf05f3814f Quizz: Adding first version of quizz 2024-01-10 17:14:23 +01:00
Guska
47a6f34f09 Quizz: Finish Launcher 2024-01-08 22:03:29 +01:00
Guska
d1da82d39c Quizz: Adding loading system 2024-01-08 17:33:23 +01:00
clement
4e63a46dc6 add some mol and test 2024-01-06 18:41:15 +01:00
clement
f1b3c7628c add somme example 2024-01-06 16:29:29 +01:00
clement
0c4b59e577 sync tout 2024-01-06 15:51:30 +01:00
clement
a6cf8340bf add molecule reader script 2024-01-06 15:51:13 +01:00
Nicolas
84136dcc5c MAJ du fichier d'action build.yaml
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 5m40s
Details
2023-12-22 15:05:47 +01:00
Nicolas
ce3c956544 MAJ du fichier d'action build.yaml
Some checks failed
Actions 😎 / Build my project ✨ (push) Has been cancelled
Details
2023-12-22 15:02:10 +01:00
Nicolas
8f105732f7 Ajout de la multitarget pour générer un préfab
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 3m57s
Details
2023-12-22 14:36:52 +01:00
Gildas
597a45de9f Merge pull request 'M: Changing organization of project' (#4) from feature/unity-project-org into develop 
Reviewed-on: #4
 2023-11-16 19:36:57 +01:00
Guska
7ac0ed4581 M: Changing organization of project 2023-11-09 17:15:33 +01:00