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

Squashed commit of the following:

Browse Source 
commit 807aa8c3c6
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 3777d06a0e
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 12:00:00 2024 +0100

    Rename Classname

commit 16bd5bfb6c
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 da9d57b0bb
Author: Mathis <mathis.ragot@epitech.eu>
Date:   Thu Jan 18 11:44:22 2024 +0100

    vue foria config

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

    [feature/AtomesFactory] - remove testing file

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

    [feature/AtomesFactory] - Add json for atomes

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

    add Atomes Factory

commit 34f74aa443
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 f181fd9935
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 1c76868eee
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 f1ec062047
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 11:37:29 2024 +0100

    ajout du font fallback

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

    rajouts des fonts text mesh pro

commit aff9df22cf
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 a7912733e5
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 0313fe28a1
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Jan 12 09:57:07 2024 +0100

    Suppression du build de la CI

commit 5237a32bb4
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 afa265dd31
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 84136dcc5c
Author: Nicolas <nicolas.sansd@gmail.com>
Date:   Fri Dec 22 15:05:47 2023 +0100

    MAJ du fichier d'action build.yaml

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

    MAJ du fichier d'action build.yaml

commit 8f105732f7
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
This commit is contained in:
clement
2024-01-18 14:00:09 +01:00
parent 824a8fdbc6
commit 5ca3d16a29
241 changed files with 22178 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1948
Assets/__Scenes/CompositionMode.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/__Scenes/CompositionMode.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6070172c745f35649bc6e7ec2e810f20
guid: c9caa719613dc274081a67ffec6035b9
DefaultImporter:
externalObjects: {}
userData:

10
Assets/__Scenes/MainMenu.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_IndirectSpecularColor: {r: 0.3708985, g: 0.37837005, b: 0.3572253, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -636,11 +636,11 @@ MonoBehaviour:
m_GameObject: {fileID: 732397228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 147ebc431f599ab46af8491c60ebcbc2, type: 3}
m_Script: {fileID: 11500000, guid: 06100a51557f407489c581eb496f125e, type: 3}
m_Name:
m_EditorClassIdentifier:
button: {fileID: 1222945811}
sceneToChange: 1
sceneToChange: 2
--- !u!114 &732397234
MonoBehaviour:
m_ObjectHideFlags: 0
@ -650,11 +650,11 @@ MonoBehaviour:
m_GameObject: {fileID: 732397228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 147ebc431f599ab46af8491c60ebcbc2, type: 3}
m_Script: {fileID: 11500000, guid: 06100a51557f407489c581eb496f125e, type: 3}
m_Name:
m_EditorClassIdentifier:
button: {fileID: 909516280}
sceneToChange: 3
sceneToChange: 1
--- !u!1 &909516278
GameObject:
m_ObjectHideFlags: 0

2
Assets/__Scenes/MainMenu.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: df7544a197c7bba4d804e0d8155d2421
guid: 21847698021eba44f950c2f660cf05d4
DefaultImporter:
externalObjects: {}
userData:

2
Assets/__Scenes/QuizzMode.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 06acd7959a0ebad4e96ca3661c3ba5f7
guid: cc3244f04212efd42b790b18c736d78a
DefaultImporter:
externalObjects: {}
userData: