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

Merge commit '807aa8c3c6e62c5d033064e3190ae432fb66db03' into feat/molecule/bons

Browse Source
This commit is contained in:
clement
2024-01-18 12:19:30 +01:00
parent 824a8fdbc6 807aa8c3c6
commit a8476f4906
241 changed files with 22113 additions and 1325 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

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

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 6070172c745f35649bc6e7ec2e810f20
=======
guid: c9caa719613dc274081a67ffec6035b9
>>>>>>> 807aa8c3c6e62c5d033064e3190ae432fb66db03
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

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

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: df7544a197c7bba4d804e0d8155d2421
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 06acd7959a0ebad4e96ca3661c3ba5f7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: