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

Compare commits

base: Epitech:1bf7031f32aab2514c2c996858d57f7bffec3ad6
Branches Tags
Epitech:main
Epitech:feature/quizz
Epitech:develop
Epitech:feature/molecule
Epitech:feature/AtomesFactory
Epitech:feat/molecule/bons
Epitech:feature/multi_targets
Epitech:feat/Molecule-json
Epitech:feature/quizz_launcher
Epitech:feature/animated-atoms
..
compare: Epitech:aca2898e8ccba3b7715c8998d3d94c99b2770892
Branches Tags
Epitech:main
Epitech:feature/quizz
Epitech:develop
Epitech:feature/molecule
Epitech:feature/AtomesFactory
Epitech:feat/molecule/bons
Epitech:feature/multi_targets
Epitech:feat/Molecule-json
Epitech:feature/quizz_launcher
Epitech:feature/animated-atoms

21 Commits
1bf7031f32 ... aca2898e8c

Author SHA1 Message Date
Nicolas
aca2898e8c Merge remote-tracking branch 'origin/develop' into feat/molecule/bons 
# Conflicts:
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydro_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogen_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogene_marker_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxy_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygen_scaled.jpg.meta
#	Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygene_marker_scaled.jpg.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
#	Assets/__Scenes/MainMenu.unity
 2024-01-18 13:46:44 +01:00
Clement
807aa8c3c6 Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop 
Reviewed-on: #10
Reviewed-by: Clement <clement@jo85.com>
 2024-01-18 12:02:57 +01:00
Mathis
3777d06a0e Rename Classname 2024-01-18 12:00:00 +01:00
Mathis
16bd5bfb6c Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory 2024-01-18 11:46:03 +01:00
Mathis
da9d57b0bb vue foria config 2024-01-18 11:44:22 +01:00
Mathis
5346e596c8 [feature/AtomesFactory] - remove testing file 2024-01-18 11:28:02 +01:00
Mathis
f613217658 [feature/AtomesFactory] - Add json for atomes 2024-01-18 10:38:59 +01:00
Mathis
bc2b9e02fd add Atomes Factory 2024-01-12 15:37:09 +01:00
Nicolas
34f74aa443 Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop 
Reviewed-on: #7
Reviewed-by: Clement <clement@jo85.com>
 2024-01-12 11:50:43 +01:00
Nicolas
f181fd9935 fix du mauvais nom de scene dans le script ChangeScene.cs 2024-01-12 11:50:10 +01:00
Nicolas
1c76868eee Merge remote-tracking branch 'origin/develop' into feature/multi_targets 
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	QCAR/somedata16
 2024-01-12 11:39:02 +01:00
Nicolas
f1ec062047 ajout du font fallback 2024-01-12 11:37:29 +01:00
Nicolas
9c23975b20 rajouts des fonts text mesh pro 2024-01-12 11:36:49 +01:00
Nicolas
aff9df22cf Merge remote-tracking branch 'origin/develop' into feature/multi_targets 
# Conflicts:
#	Assets/Resources/VuforiaConfiguration.asset
#	Assets/__Scenes/CompositionMode.unity
#	Packages/com.ptc.vuforia.engine-10.18.4.tgz
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	ProjectSettings/TagManager.asset
 2024-01-12 11:03:32 +01:00
Nicolas
a7912733e5 Ajout dans le canvas d'éléments UI (nom, description....) 2024-01-12 10:54:51 +01:00
Nicolas
0313fe28a1 Suppression du build de la CI 2024-01-12 09:57:07 +01:00
Nicolas
5237a32bb4 ajout de la keystore de debug (user) + changement de la target version d'android
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 1m2s
Details
Actions 😎 / Release to the Google Play Store (push) Has been skipped
Details
Actions 😎 / Build my project ✨ (pull_request) Failing after 53s
Details
Actions 😎 / Release to the Google Play Store (pull_request) Has been skipped
Details
2024-01-11 16:18:35 +01:00
Nicolas
afa265dd31 Affichage des molécules unitairement et en mode fusion
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 1m21s
Details
Actions 😎 / Release to the Google Play Store (push) Has been skipped
Details
2024-01-11 11:26:53 +01:00
Nicolas
84136dcc5c MAJ du fichier d'action build.yaml
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 5m40s
Details
2023-12-22 15:05:47 +01:00
Nicolas
ce3c956544 MAJ du fichier d'action build.yaml
Some checks failed
Actions 😎 / Build my project ✨ (push) Has been cancelled
Details
2023-12-22 15:02:10 +01:00
Nicolas
8f105732f7 Ajout de la multitarget pour générer un préfab
Some checks failed
Actions 😎 / Build my project ✨ (push) Failing after 3m57s
Details
2023-12-22 14:36:52 +01:00
1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
QCAR/somedata16
View File

@ -1 +1 @@
AAABmYLL8/oCWYDVnt66QIDwPq6z4DN6r3/58aZWC0zcxYa43TCnvCp9IGuXZLgAObCqIm1fhMsWLttc6QAE6obPbuzCjEssQlT41wW38sIVuVhmsw6vfjVsXAQG/GQOgamARLtOkhTKi309FNa+3akhJu9wuEv5jF3vfRbPBoeMCWZuk4Pr8aP7mPH8+10geWHoSWbxgsaEEgrE0yO2xoQwTy2XOmCzZytqk+moWXU7VBu+0//q+koDSnWbjOkEGUfRwMmBJIK9J5TDJrSf/QZYBcEx1daR47cicuXzCb81VtaSvU5VIb9anoX6fukOHe/nCAfsltXFn+4G24NKlejZ568= AAABmY7g9UmlfucNZM2mK1+zBTca7O7gdAXUc9FcH4yUbYfsFOfH72rVb0qPESQq/9HBlqfD04SyJF6jtD6oQDsZxFAYgmMCBkOzNr/C/s4mdV37Qw5Nm9GqecPYpccvAWOqH/VAtFBp5ksgnAnVhuHUqh0NmvpixXq82Meo/bg7usPAWSDsQt/6kR89nttLOknq/Rt+SN8E91Txj6nsYZH8gsxrgC9MYPO0koHuIvfeLk0wcqrMzxZawaNLp6CNWgUYDXWIWW1AtB9dY5p56nnk/Yd4MyRevYDtcWdXCdiam48zdO470AuA8DkAFHOttVURidwRkVKq4z40E6J+5V3NqDg=