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

BIN
Packages/com.ptc.vuforia.engine-10.18.4.tgz (Stored with Git LFS) Normal file
View File

Binary file not shown.

10
Packages/manifest.json
View File

@ -1,12 +1,16 @@
{
"dependencies": {
"com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.17.4.tgz",
"com.unity.collab-proxy": "2.2.0",
"dependencies": {
"com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.18.4.tgz",
"com.unity.collab-proxy": "2.1.0",
"com.unity.feature.ar": "1.0.1",
"com.unity.feature.development": "1.0.1",
"com.unity.learn.iet-framework": "3.1.3",
"com.unity.mobile.android-logcat": "1.3.2",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.5",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.9.1",
"com.unity.xr.management": "4.4.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

162
Packages/packages-lock.json
View File

@ -1,7 +1,7 @@
{
"dependencies": {
"com.ptc.vuforia.engine": {
"version": "file:com.ptc.vuforia.engine-10.17.4.tgz",
"version": "file:com.ptc.vuforia.engine-10.18.4.tgz",
"depth": 0,
"source": "local-tarball",
"dependencies": {
@ -9,7 +9,7 @@
}
},
"com.unity.collab-proxy": {
"version": "2.2.0",
"version": "2.1.0",
"depth": 0,
"source": "registry",
"dependencies": {},
@ -29,6 +29,18 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.feature.ar": {
"version": "1.0.1",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.xr.arfoundation": "5.1.0",
"com.unity.xr.arkit": "5.1.0",
"com.unity.xr.arcore": "5.1.0",
"com.unity.xr.magicleap": "7.0.0",
"com.unity.xr.openxr": "1.8.2"
}
},
"com.unity.feature.development": {
"version": "1.0.1",
"depth": 0,
@ -68,6 +80,39 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.7.0",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.learn.iet-framework": {
"version": "3.1.3",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.editorcoroutines": "1.0.0",
"com.unity.settings-manager": "1.0.3"
},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.6",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mobile.android-logcat": {
"version": "1.3.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.performance.profile-analyzer": {
"version": "1.2.2",
"depth": 1,
@ -77,7 +122,7 @@
},
"com.unity.settings-manager": {
"version": "2.0.1",
"depth": 2,
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
@ -143,6 +188,117 @@
},
"url": "https://packages.unity.com"
},
"com.unity.xr.arcore": {
"version": "5.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.xr.arfoundation": "5.1.0",
"com.unity.xr.core-utils": "2.1.0",
"com.unity.xr.management": "4.0.1",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.arfoundation": {
"version": "5.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.editorcoroutines": "1.0.0",
"com.unity.inputsystem": "1.3.0",
"com.unity.xr.core-utils": "2.2.1",
"com.unity.xr.management": "4.0.1",
"com.unity.ugui": "1.0.0",
"com.unity.mathematics": "1.2.5",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.arkit": {
"version": "5.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.editorcoroutines": "1.0.0",
"com.unity.xr.arfoundation": "5.1.0",
"com.unity.xr.core-utils": "2.1.0",
"com.unity.xr.management": "4.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.core-utils": {
"version": "2.2.3",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.interactionsubsystems": {
"version": "2.0.0",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.modules.subsystems": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.10",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.magicleap": {
"version": "7.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.arfoundation": "5.0.0-pre.12",
"com.unity.xr.interactionsubsystems": "2.0.0",
"com.unity.xr.management": "4.2.0",
"com.unity.modules.androidjni": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.management": {
"version": "4.4.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.subsystems": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.7"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.openxr": {
"version": "1.8.2",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.xr.management": "4.0.1",
"com.unity.xr.legacyinputhelpers": "2.1.2",
"com.unity.inputsystem": "1.4.4",
"com.unity.xr.core-utils": "2.1.1"
},
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,