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

83
Assets/Resources/New Material 1.mat Normal file
View File

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material 1
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 1, b: 0.18335032, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

8
Assets/Resources/New Material 1.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2eaaa81492e776f469410f5cf36631d2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

83
Assets/Resources/New Material.mat Normal file
View File

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

8
Assets/Resources/New Material.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8e51262e266d76b48aa357c1f99b814e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Resources/Questions.json.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d1fd2713a233dbb4c98aca4c3f278538
guid: 7a1301745ea9a5e42abc28700f294291
TextScriptImporter:
externalObjects: {}
userData:

2
Assets/Resources/Quizz.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b59d15148503e18418132e90ee306bb0
guid: 73cdfa164b2e54945834132df0004127
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Resources/Quizz/Launcher.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a3dae940431da2141b76951bb2046c07
guid: 33ce1d326c350db4684bb4a2f96dfe31
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Resources/Quizz/Launcher/LoadingCircleAnimator.anim.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ffe6fd16c85f019408916491ce06cd10
guid: 8cfff928209192f4984bd6a3b7aa370d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0

2
Assets/Resources/Quizz/Launcher/LoadingCircleAnimatorController.controller.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9029222e680da8e46ba38338944d3843
guid: 62107ed3efe61da4d8eeaf10ccbfc963
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0

15
Assets/Resources/Quizz/Launcher/loadingCircle.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f1c805b3095f5a343809e86a395f889a
guid: 143f809b8a98a614bb6df8af81f5b1f4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -80,19 +80,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048

15
Assets/Resources/Quizz/Launcher/tactileLogo.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 603f35df78469f9418ff727ed578ce36
guid: c6804deefa1f78d4da1fd53facd0f09a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -80,19 +80,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048

12
Assets/Resources/VuforiaConfiguration.asset
View File

@ -13,18 +13,18 @@ MonoBehaviour:
m_Name: VuforiaConfiguration
m_EditorClassIdentifier:
vuforia:
vuforiaLicenseKey: AUw/hPP/////AAABmauQKKtNskHNlC1/09RHBItP2gkt4ImxCvRp54UzrkVIdcyv62+X4XzQsI3G2t1qMRwLGJagQjOm/CKBryt4Zd6BJ4DjlARI2y/dKNnG9gcyGIYWF20tqikbcNufJuvW7/HXXrhgZeaY8p4xfHliDnM8QwdzvtN93HbADeNT2H+LMbO5NUECtT178dGdGeAOixOEyz47bwShGsmlQQzdMlLC4qUD80WED96/jtum0J5g2i4z42sFlY3429IFWq0FeCaCFkmJhHKxEU/0Jx2qnwimxXFSZ5RpPPdfUQ6OGnea1oVtFLi0VX+YWKkdcNxr3zwUs2Ylvko0N25CEhMLp+uOhmjHnYUud5GSw4SMkPdD
ufoLicenseKey: QWI0b2pFWC8vLy8vQUFBQUtBbVh5anNpaVV1am9KdnkyaUtoMjhaRmZTSFNGMWZqQXBxTUZMbkk5K1VmcjJyRWhHQXVsVWpQVXZyRjduSnY2aW9rSEtBc20zTVN6SVpVSE1DcERyRlZnbzEwNFdIMnNnaVBVYXI1dDNwdE1lLzhqVjMyVlYrSVhwM1hSWEFTYlQrcG5jdzVIYjU3VC9UWXNoL2E1OUZrM0VBNkhGREUvVmJEcE1GWnVDQUY2NE8zVHhaWkU4UUtLclppY291UXQ4K0U5S0tBRC9pa0tjWmhOaTM1TXQ5MDVPbm9xM3R6djlaVlQ2ak54Lyt2V21tb29iS25LL2pQVnRFc3EySGsyRTY4T1drdlhFUE9odnp5eXpYTUJETG5jeVZLUHI0bjZXeGZwbllHcFRYS1VDTkNYdzdJVHozRDQ1SGxDc3d1WVpBRlZUNTl4dFEvTWp5THdJNCtiWEFLaDRNVVBOTDVseWZuMDJZTXdYYkg=
vuforiaLicenseKey: AQxbUaT/////AAABmcZ6t7Ncj05anQJttObkLa4eD1cWPevqBDTvmDHnXpPaLKNegpLOtKxtNUApdlbhLVVg6wvI+udkzd/VrRZrReg69CRecVhQRIrli/m6b5WQl/gkN4tdaDWbvVxvjuI9oOe5nLCVIY9Oe3WtZfcdCr8Xuiu7U3qkSL19omHJvRUXSEpUU4OXVX4cbPdfUXNX05Eq5MFT4tpUhEMPJwaV/JcA3k5CkXHT51SsPqXt22XNqt55goOhkRO5wy1DEoXz3jWQibRY89u3zTgNbElKcKymOzrddWPwuGtOKOmPD2ItEssjajax1Pw2iAb2r4gUaVFvIXPOMXUqbkAMkD0WVsUXkK5d9TfglqeygPe7xswk
ufoLicenseKey: QWVNMVBLbi8vLy8vQUFBQUtGMThiT25nUGtzWXVkanNtV2NndklLWjFQMEtMcG5QaTFYNTRLbUFGdEs1YmEwZHVCdG9jWHhxVGhyNHpuWXJDSHVBVHFVNzFsTFJFZWVQQ3ZkbHRDeHoyMlg1S2pqeG43ZnVJMVdpNmowdjE0cTRZWGNlemhrWFMwYk1XcU0zaTVReU1qUUE4WWRZbmFZSFRMY0krbHVTeThQRW5yc05QUjBxRkoyVmtyQlMzODdJM3ZHbElMbmxVNHFpSjhlcVpWTmJyMmQyOUNKRGV4bG43NWYvbXZ1Sy82aUFoUDR4OWE2eDdhQmR5c3dCN0dWdXYwTEZEdG56R3JtaWNmK2tYdHpFcVc0U28xT0lHbHdUSVNNL0VEdUN3Q1JZdHFVem8xVDBQVVJDdjRnaUM2NkdMbG85bTh3QmRpelBtWnIyZnhyeGZmeWoyczhJR1JHdVVFL25LbFBZWGpjOUhPUTk0alZyNmx4YTAwY3E=
delayedInitialization: 0
cameraFocusModeSetting: 2
cameraDeviceModeSetting: -1
maxSimultaneousImageTargets: 1
maxSimultaneousImageTargets: 4
virtualSceneScaleFactor: 1
modelTargetRecoWhileExtendedTracked: 1
shareRecordingsInITunes: 0
logLevel: 0
version: 10.17.4
eulaAcceptedVersions: '{"Values":["10.15","10.17","0.0","10.18"]}'
version: 10.18.4
eulaAcceptedVersions: '{"Values":["10.17","10.18","0.0","10.15"]}'
database:
disableModelExtraction: 0
shaders:
@ -47,4 +47,4 @@ MonoBehaviour:
webcam:
renderTextureLayer: 30
packageInformation:
ARFoundationVersion:
ARFoundationVersion: 5.1.0