Squashed commit of the following:
commit807aa8c3c6
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> commit3777d06a0e
Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 12:00:00 2024 +0100 Rename Classname commit16bd5bfb6c
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 commitda9d57b0bb
Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:44:22 2024 +0100 vue foria config commit5346e596c8
Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:28:02 2024 +0100 [feature/AtomesFactory] - remove testing file commitf613217658
Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 10:38:59 2024 +0100 [feature/AtomesFactory] - Add json for atomes commitbc2b9e02fd
Author: Mathis <mathis.ragot@epitech.eu> Date: Fri Jan 12 15:37:09 2024 +0100 add Atomes Factory commit34f74aa443
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> commitf181fd9935
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 commit1c76868eee
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 commitf1ec062047
Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:37:29 2024 +0100 ajout du font fallback commit9c23975b20
Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:36:49 2024 +0100 rajouts des fonts text mesh pro commitaff9df22cf
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 commita7912733e5
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....) commit0313fe28a1
Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 09:57:07 2024 +0100 Suppression du build de la CI commit5237a32bb4
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 commitafa265dd31
Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 11:26:53 2024 +0100 Affichage des molécules unitairement et en mode fusion commit84136dcc5c
Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:05:47 2023 +0100 MAJ du fichier d'action build.yaml commitce3c956544
Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:02:10 2023 +0100 MAJ du fichier d'action build.yaml commit8f105732f7
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:
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a3dae940431da2141b76951bb2046c07
|
||||
guid: 33ce1d326c350db4684bb4a2f96dfe31
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ffe6fd16c85f019408916491ce06cd10
|
||||
guid: 8cfff928209192f4984bd6a3b7aa370d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
|
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9029222e680da8e46ba38338944d3843
|
||||
guid: 62107ed3efe61da4d8eeaf10ccbfc963
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user