Commit Graph

Select branches

Hide Pull Requests

develop

feat/Molecule-json

feat/molecule/bons

feature/AtomesFactory

feature/animated-atoms

feature/molecule

feature/multi_targets

feature/quizz

feature/quizz_launcher

main

#10

#11

#12

#13

#14

#15

#4

#5

#6

#7

#8

#9

Mono Color

• 5dc815e440 Merge branch 'main' of https://git.lab-ouest.org/Epitech/T-VIR-901_EpiLeARn main clement 2024-02-15 10:29:25 +01:00
• 1a2e96357a nique toi clement 2024-02-15 10:29:17 +01:00
• 427a77ab71 Quizz: Adding final quizz version feature/quizz Guska 2024-02-04 18:49:15 +01:00
• 8a4a3ef814 Merge branch 'feature/quizz' into develop develop Guska 2024-02-04 16:02:52 +01:00
• 8a3b3d6c98 QUIZZ: Resolving merge Guska 2024-02-04 16:02:08 +01:00
• bddd04413e Merge pull request 'update README.md' (#14) from develop into main Nicolas 2024-02-02 16:56:43 +01:00
• 71f04dc4d5 Merge pull request 'develop' (#12) from develop into main Nicolas 2024-02-02 16:43:28 +01:00
• 48d607dfdf Quizz: Re-arranging scenes Guska 2024-02-02 16:00:50 +01:00
• c779e6348b update README.md Nicolas 2024-02-02 15:54:57 +01:00
• 7084fcaa30 Merge pull request 'Prise en compte du module factory pour créer et afficher des gameobjects dynamiquement' (#11) from feature/molecule into develop Nicolas 2024-02-02 16:43:00 +01:00
• a642cc0a38 ajout de l'atom factory feature/molecule Nicolas 2024-02-02 15:29:49 +01:00
• 9c5f5b15fb Merge remote-tracking branch 'origin/develop' into feature/molecule Nicolas 2024-02-02 14:09:36 +01:00
• 91e3d2e28a Merge pull request 'feature/AtomesFactory' (#13) from feature/AtomesFactory into develop Nicolas 2024-02-02 15:03:43 +01:00
• 27ce4e14a8 Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory feature/AtomesFactory Nicolas 2024-02-02 14:02:05 +01:00
• 9b7b156d7b add 3D atome Mathis 2024-02-02 14:33:35 +01:00
• 3217569320 QUIZZ: Adding quizz Guska 2024-02-02 09:14:28 +01:00
• f7a2cc4c88 Add factory for animated Atome Mathis 2024-01-26 12:03:56 +01:00
• f4be67ca29 Création du prefab et script de l'atom + ajout du lock mode Nicolas 2024-01-19 10:07:10 +01:00
• 58782722d3 rajout de la gestion d'animation + des factory Nicolas 2024-01-18 16:28:39 +01:00
• 9de97ad486 Merge remote-tracking branch 'origin/develop' into feature/molecule Nicolas 2024-01-18 13:53:20 +01:00
• cb0396e23c Merge pull request 'feat: liaison entre les molécules et couleur' (#9) from feat/molecule/bons into develop Nicolas 2024-01-18 14:47:23 +01:00
• aca2898e8c Merge remote-tracking branch 'origin/develop' into feat/molecule/bons feat/molecule/bons Nicolas 2024-01-18 13:46:44 +01:00
• 1bf7031f32 on est good clement 2024-01-18 14:24:40 +01:00
• 5ca3d16a29 Squashed commit of the following: clement 2024-01-18 14:00:09 +01:00
• 8ca1aa7ad8 Ajout de composants et de leurs markers Nicolas 2024-01-18 13:45:04 +01:00
• 824a8fdbc6 feat: WIP color clement 2024-01-18 12:03:38 +01:00
• 807aa8c3c6 Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop Clement 2024-01-18 12:02:57 +01:00
• 3777d06a0e Rename Classname Mathis 2024-01-18 12:00:00 +01:00
• 16bd5bfb6c Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory Mathis 2024-01-18 11:46:03 +01:00
• da9d57b0bb vue foria config Mathis 2024-01-18 11:44:22 +01:00
• 5346e596c8 [feature/AtomesFactory] - remove testing file Mathis 2024-01-18 11:28:02 +01:00
• c302d4c277 color okay clement 2024-01-18 11:25:51 +01:00
• f613217658 [feature/AtomesFactory] - Add json for atomes Mathis 2024-01-18 10:38:59 +01:00
• 13c59458bb sync clement 2024-01-12 16:28:35 +01:00
• e5a1e71788 Prise en compte du module factory pour créer et afficher des gameobjects dynamiquement Nicolas 2024-01-12 15:41:11 +01:00
• bc2b9e02fd add Atomes Factory Mathis 2024-01-12 15:37:09 +01:00
• 34f74aa443 Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop Nicolas 2024-01-12 11:50:43 +01:00
• f181fd9935 fix du mauvais nom de scene dans le script ChangeScene.cs feature/multi_targets Nicolas 2024-01-12 11:50:10 +01:00
• 1c76868eee Merge remote-tracking branch 'origin/develop' into feature/multi_targets Nicolas 2024-01-12 11:39:02 +01:00
• 8b6d07fb3d Merge pull request 'feat:Molecule-json' (#8) from feat/Molecule-json into develop Clement 2024-01-12 11:38:05 +01:00
• f1ec062047 ajout du font fallback Nicolas 2024-01-12 11:37:29 +01:00
• 9c23975b20 rajouts des fonts text mesh pro Nicolas 2024-01-12 11:36:49 +01:00
• aff9df22cf Merge remote-tracking branch 'origin/develop' into feature/multi_targets Nicolas 2024-01-12 11:03:32 +01:00
• a7912733e5 Ajout dans le canvas d'éléments UI (nom, description....) Nicolas 2024-01-12 10:54:51 +01:00
• de603d405f Merge remote-tracking branch 'origin/develop' into feat/Molecule-json feat/Molecule-json clement 2024-01-12 10:48:01 +01:00
• 118a669371 cleanup code clement 2024-01-12 10:20:31 +01:00
• 0313fe28a1 Suppression du build de la CI Nicolas 2024-01-12 09:57:07 +01:00
• 74a69cf8f7 add todo clement 2024-01-11 17:16:12 +01:00
• e12fed0489 normalent on est quasi bon clement 2024-01-11 17:11:59 +01:00
• 33e34e9fde convert to dict clement 2024-01-11 16:53:06 +01:00
• 7c3aa27c71 sync clement 2024-01-11 16:38:19 +01:00
• 5237a32bb4 ajout de la keystore de debug (user) + changement de la target version d'android Nicolas 2024-01-11 16:18:35 +01:00
• 73394e562d Merge pull request 'Quizz: Adding functionnal quizz feature' (#6) from feature/quizz_launcher into develop Gildas 2024-01-11 15:23:47 +01:00
• afa265dd31 Affichage des molécules unitairement et en mode fusion Nicolas 2024-01-11 11:26:53 +01:00
• 7d921904d6 Quizz: Removing meta files feature/quizz_launcher Guska 2024-01-10 17:16:12 +01:00
• cf05f3814f Quizz: Adding first version of quizz Guska 2024-01-10 17:14:23 +01:00
• 47a6f34f09 Quizz: Finish Launcher Guska 2024-01-08 22:03:29 +01:00
• d1da82d39c Quizz: Adding loading system Guska 2024-01-08 17:33:23 +01:00
• 4e63a46dc6 add some mol and test clement 2024-01-06 18:41:15 +01:00
• f1b3c7628c add somme example clement 2024-01-06 16:29:29 +01:00
• 0c4b59e577 sync tout clement 2024-01-06 15:51:30 +01:00
• a6cf8340bf add molecule reader script clement 2024-01-06 15:51:13 +01:00
• 84136dcc5c MAJ du fichier d'action build.yaml Nicolas 2023-12-22 15:05:47 +01:00
• ce3c956544 MAJ du fichier d'action build.yaml Nicolas 2023-12-22 15:02:10 +01:00
• 8f105732f7 Ajout de la multitarget pour générer un préfab Nicolas 2023-12-22 14:36:52 +01:00
• 052d63450d ADD: Adding hydrogen atom with animation feature/animated-atoms Guska 2023-11-16 23:20:22 +01:00
• 597a45de9f Merge pull request 'M: Changing organization of project' (#4) from feature/unity-project-org into develop Gildas 2023-11-16 19:36:57 +01:00
• 7ac0ed4581 M: Changing organization of project Guska 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 Nicolas 2023-11-02 12:25:50 +01:00
• 72cde93ea0 initial commit Nicolas 2023-11-02 10:53:40 +01:00
• c0246cb3b5 initial commit Nicolas 2023-11-02 10:53:40 +01:00