clement
5ca3d16a29
commit 807aa8c3c6e62c5d033064e3190ae432fb66db03
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 3777d06a0ee942994fdfe90d71fc5056c37346d9
Author: Mathis <mathis.ragot@epitech.eu>
Date: Thu Jan 18 12:00:00 2024 +0100
Rename Classname
commit 16bd5bfb6cd51e253e22417ab8196a58e1726849
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 da9d57b0bba34dbe24f5e7f744ce60f430832ff4
Author: Mathis <mathis.ragot@epitech.eu>
Date: Thu Jan 18 11:44:22 2024 +0100
vue foria config
commit 5346e596c8a0db7684b64920c328abee459926d9
Author: Mathis <mathis.ragot@epitech.eu>
Date: Thu Jan 18 11:28:02 2024 +0100
[feature/AtomesFactory] - remove testing file
commit f613217658cf2f1f48ceeeaa3183e515de857213
Author: Mathis <mathis.ragot@epitech.eu>
Date: Thu Jan 18 10:38:59 2024 +0100
[feature/AtomesFactory] - Add json for atomes
commit bc2b9e02fdb692d56937bd37cc3d821ffb717424
Author: Mathis <mathis.ragot@epitech.eu>
Date: Fri Jan 12 15:37:09 2024 +0100
add Atomes Factory
commit 34f74aa44366c6d5f9e0d647a7837704edbd5fad
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 f181fd993504c811a4546e56f83eb05ed62a625d
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 1c76868eee12406d6c39fa64da8462e35019a39e
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 f1ec062047ba68d48493b25273ba5893f42a890f
Author: Nicolas <nicolas.sansd@gmail.com>
Date: Fri Jan 12 11:37:29 2024 +0100
ajout du font fallback
commit 9c23975b204ceb09bd3ccc57b847cf0a8158fb95
Author: Nicolas <nicolas.sansd@gmail.com>
Date: Fri Jan 12 11:36:49 2024 +0100
rajouts des fonts text mesh pro
commit aff9df22cfbed9e8b317cafe4269fce891a5bbe5
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 a7912733e5fed60b9514c778fd9f40661dc66b64
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 0313fe28a1b718152015a401fda32069e94303c0
Author: Nicolas <nicolas.sansd@gmail.com>
Date: Fri Jan 12 09:57:07 2024 +0100
Suppression du build de la CI
commit 5237a32bb4759c43104e9397cb43b328a99b7c62
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 afa265dd3141ef3fd96bff685ca655594453a876
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 84136dcc5c3b00603ba8531901418125a832a255
Author: Nicolas <nicolas.sansd@gmail.com>
Date: Fri Dec 22 15:05:47 2023 +0100
MAJ du fichier d'action build.yaml
commit ce3c95654431f25e22810481f3b10b24f158decd
Author: Nicolas <nicolas.sansd@gmail.com>
Date: Fri Dec 22 15:02:10 2023 +0100
MAJ du fichier d'action build.yaml
commit 8f105732f7aaa41689894ab388675ae0b79f66f6
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
46 lines
4.4 KiB
Plaintext
46 lines
4.4 KiB
Plaintext
Digitized data copyright (c) 2010 Google Corporation
|
|
with Reserved Font Arimo, Tinos and Cousine.
|
|
Copyright (c) 2012 Red Hat, Inc.
|
|
with Reserved Font Name Liberation.
|
|
|
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
|
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
|
|
|
|
-----------------------------------------------------------
|
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
|
-----------------------------------------------------------
|
|
|
|
PREAMBLE
|
|
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
|
|
|
|
The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
|
|
|
|
DEFINITIONS
|
|
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
|
|
|
|
"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
|
|
|
|
"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
|
|
|
|
"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
|
|
|
|
"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
|
|
|
|
PERMISSION & CONDITIONS
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
|
|
|
|
1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
|
|
|
|
2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
|
|
|
|
3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
|
|
|
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
|
|
|
|
5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
|
|
|
|
TERMINATION
|
|
This license becomes null and void if any of the above conditions are not met.
|
|
|
|
DISCLAIMER
|
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. |