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

9
Assets/Scripts/ChangeScene.cs
View File

@ -7,9 +7,8 @@ using UnityEngine.UI;
public enum AvailableScenes {
MainMenu,
CompoMenu,
PreviewMenu,
Fusion,
CompositionMenu,
QuizzMode,
}
public class ChangeScene : MonoBehaviour
@ -20,8 +19,8 @@ public class ChangeScene : MonoBehaviour
readonly Dictionary<AvailableScenes, String> _scenesNames = new Dictionary<AvailableScenes, String>()
{
{ AvailableScenes.MainMenu, "MainMenu" },
{ AvailableScenes.CompoMenu, "CompositionMenu" },
{ AvailableScenes.Fusion, "Fusion" },
{ AvailableScenes.CompositionMenu, "CompositionMode" },
{ AvailableScenes.QuizzMode, "QuizzMode" },
};
// Start is called before the first frame update
void Start()

2
Assets/Scripts/ChangeScene.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cb35a44ae5280ee46bc28b22325565bc
guid: 06100a51557f407489c581eb496f125e
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/Scripts/Config.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b341ca4f45021eb40a17a214926ba542
guid: ad8e0cc1188e15747af8e42ff7d3d8a8
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Scripts/Config/GlobalConfig.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 783766876d1f4f840b706ab1526fca6e
guid: 052db604c679d014ca89bcc5fb196894
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/Scripts/MainMenuLoader.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1eba6f5e45170f34fb9ec95c896622ad
guid: 73df1f34c98543044a579d9b860b1e49
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/Scripts/Quizz.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4040dd72c2608754a9869916970a6596
guid: c8ecfc45ad0cb3c4cbca39b28dfd5cec
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Scripts/Quizz/QuizzManager.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4f489ca67a8a06c48b5440e6a6c7039b
guid: 64b8ea1ee8224a74198aaf77b933df14
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/Scripts/Scripts.asmdef.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d958635d35b092041abdd85770d95d40
guid: 8175eb73d3984e040b45fa769b549ba5
AssemblyDefinitionImporter:
externalObjects: {}
userData: