clement
5ca3d16a29
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
27 lines
1.4 KiB
Plaintext
27 lines
1.4 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1045 &1
|
|
EditorBuildSettings:
|
|
m_ObjectHideFlags: 0
|
|
serializedVersion: 2
|
|
m_Scenes:
|
|
- enabled: 1
|
|
path: Assets/__Scenes/MainMenu.unity
|
|
guid: 21847698021eba44f950c2f660cf05d4
|
|
- enabled: 1
|
|
path: Assets/__Scenes/QuizzMode.unity
|
|
guid: cc3244f04212efd42b790b18c736d78a
|
|
- enabled: 1
|
|
path: Assets/__Scenes/CompositionMode.unity
|
|
guid: c9caa719613dc274081a67ffec6035b9
|
|
m_configObjects:
|
|
Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: 744b813df90924c169af73489b8325de, type: 2}
|
|
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: bcb8ef97c341eb345835ba52cc0ee9d8, type: 2}
|
|
UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: ed4cf215382d87544b5877f284dcabda, type: 2}
|
|
com.unity.xr.arcore.PlayerSettings: {fileID: 11400000, guid: c2f7b8d7c0bff4d10874cbcf3f24af78, type: 2}
|
|
com.unity.xr.arfoundation.simulation_settings: {fileID: 11400000, guid: a73d54d47cd632049bd22903052e8cf2, type: 2}
|
|
com.unity.xr.arkit.PlayerSettings: {fileID: 11400000, guid: b27ec7d82a91a48e69fd689ad6808e5e, type: 2}
|
|
com.unity.xr.magicleap.magic_leap_settings: {fileID: 11400000, guid: 4b1cd8c4505cedc4cb5c20e1750afccc, type: 2}
|
|
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 9a8e088da6754a545a749375fcc929d9, type: 2}
|
|
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: fb9799a5cd77c924a84a333aa1af6703, type: 2}
|