Skip to content

Commit 0170d33

Browse files
authored
Merge pull request #57 from SuperPenguin/dev
Change text to TextMesh Pro
2 parents 7c9f69b + 7e02fb1 commit 0170d33

File tree

62 files changed

+933
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+933
-208
lines changed

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: https://www.paypal.me/MartinPaneUK # Replace with a single custom sponsorship URL

.gitignore

Lines changed: 62 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,62 @@
1-
# Ignore everything. We'll whitelist what we want to pull in.
2-
/*
3-
/*/
4-
5-
# Git meta files
6-
!.gitignore
7-
!.gitattributes
8-
!README.md
9-
10-
# Whitelisted directories/files
11-
!/ProjectSettings/
12-
!/Assets/
13-
/Assets/*
14-
!/Assets/Tayx/
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Ll]ogs/
11+
/[Mm]emoryCaptures/
12+
13+
# Never ignore Asset meta data
14+
!/[Aa]ssets/**/*.meta
15+
16+
# Uncomment this line if you wish to ignore the asset store tools plugin
17+
# /[Aa]ssets/AssetStoreTools*
18+
19+
# TextMesh Pro files
20+
[Aa]ssets/TextMesh*Pro/
21+
22+
# Autogenerated Jetbrains Rider plugin
23+
[Aa]ssets/Plugins/Editor/JetBrains*
24+
25+
# Visual Studio cache directory
26+
.vs/
27+
28+
# Gradle cache directory
29+
.gradle/
30+
31+
# Autogenerated VS/MD/Consulo solution and project files
32+
ExportedObj/
33+
.consulo/
34+
*.csproj
35+
*.unityproj
36+
*.sln
37+
*.suo
38+
*.tmp
39+
*.user
40+
*.userprefs
41+
*.pidb
42+
*.booproj
43+
*.svd
44+
*.pdb
45+
*.mdb
46+
*.opendb
47+
*.VC.db
48+
49+
# Unity3D generated meta files
50+
*.pidb.meta
51+
*.pdb.meta
52+
*.mdb.meta
53+
54+
# Unity3D generated file on crash reports
55+
sysinfo.txt
56+
57+
# Builds
58+
*.apk
59+
*.unitypackage
60+
61+
# Crashlytics generated file
62+
crashlytics-build.properties

Assets/Tayx.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Tayx/Graphy - Ultimate Stats Monitor/Changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
-----------------------------
2+
v1.5.2
3+
4+
- Removed asmdefs to avoid missing reference issues in new Unity alpha versions.
5+
- Improvements avgFps calculation, changed list to array (thanks @Kaladrius2trip).
6+
17
-----------------------------
28
v1.5.1
39

Assets/Tayx/Graphy - Ultimate Stats Monitor/Font/Office Code Pro.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
2+
SIL Open Font License v1.1
3+
---------------------------------------
4+
5+
This Font Software is licensed under the SIL Open Font License, Version 1.1
6+
This license is also available with a FAQ at: http://scripts.sil.org/OFL
7+
8+
Reserved font name: "Office Code Pro"
9+
10+
Copyright © 2015 Nathan Rutzky ( www.nath.co )
11+
Copyright © 2015 Adobe Systems ( www.adobe.com )
12+
13+
All Rights Reserved.
14+
15+
16+
PREAMBLE
17+
---------------------------------------
18+
19+
The goals of the Open Font License (OFL) are to stimulate worldwide
20+
development of collaborative font projects, to support the font creation
21+
efforts of academic and linguistic communities, and to provide a free and
22+
open framework in which fonts may be shared and improved in partnership
23+
with others.
24+
25+
The OFL allows the licensed fonts to be used, studied, modified and
26+
redistributed freely as long as they are not sold by themselves. The
27+
fonts, including any derivative works, can be bundled, embedded,
28+
redistributed and/or sold with any software provided that any reserved
29+
names are not used by derivative works. The fonts and derivatives,
30+
however, cannot be released under any other type of license. The
31+
requirement for fonts to remain under this license does not apply
32+
to any document created using the fonts or their derivatives.
33+
34+
35+
DEFINITIONS
36+
---------------------------------------
37+
38+
`"Font Software"` refers to the set of files released by the Copyright
39+
Holder(s) under this license and clearly marked as such. This may
40+
include source files, build scripts and documentation.
41+
42+
`"Reserved Font Name"` refers to any names specified as such after the
43+
copyright statement(s).
44+
45+
`"Original Version"` refers to the collection of Font Software components as
46+
distributed by the Copyright Holder(s).
47+
48+
`"Modified Version"` refers to any derivative made by adding to, deleting,
49+
or substituting -- in part or in whole -- any of the components of the
50+
Original Version, by changing formats or by porting the Font Software to a
51+
new environment.
52+
53+
`"Author"` refers to any designer, engineer, programmer, technical
54+
writer or other person who contributed to the Font Software.
55+
56+
57+
PERMISSION & CONDITIONS
58+
---------------------------------------
59+
60+
Permission is hereby granted, free of charge, to any person obtaining
61+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
62+
redistribute, and sell modified and unmodified copies of the Font
63+
Software, subject to the following conditions:
64+
65+
1. Neither the Font Software nor any of its individual components,
66+
in Original or Modified Versions, may be sold by itself.
67+
68+
2. Original or Modified Versions of the Font Software may be bundled,
69+
redistributed and/or sold with any software, provided that each copy
70+
contains the above copyright notice and this license. These can be
71+
included either as stand-alone text files, human-readable headers or
72+
in the appropriate machine-readable metadata fields within text or
73+
binary files as long as those fields can be easily viewed by the user.
74+
75+
3. No Modified Version of the Font Software may use the Reserved Font
76+
Name(s) unless explicit written permission is granted by the corresponding
77+
Copyright Holder. This restriction only applies to the primary font name as
78+
presented to the users.
79+
80+
4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
81+
Software shall not be used to promote, endorse or advertise any
82+
Modified Version, except to acknowledge the contribution(s) of the
83+
Copyright Holder(s) and the Author(s) or with their explicit written
84+
permission.
85+
86+
5. The Font Software, modified or unmodified, in part or in whole,
87+
must be distributed entirely under this license, and must not be
88+
distributed under any other license. The requirement for fonts to
89+
remain under this license does not apply to any document created
90+
using the Font Software.
91+
92+
93+
TERMINATION
94+
---------------------------------------
95+
96+
This license becomes null and void if any of the above conditions are
97+
not met.
98+
99+
100+
DISCLAIMER
101+
---------------------------------------
102+
103+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
104+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
105+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
106+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
107+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
108+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
109+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
110+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
111+
OTHER DEALINGS IN THE FONT SOFTWARE.

Assets/Tayx/Graphy - Ultimate Stats Monitor/Scripts/Editor/Tayx.Graphy.Editor.asmdef.meta renamed to Assets/Tayx/Graphy - Ultimate Stats Monitor/Font/Office Code Pro/LICENSE.txt.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Tayx/Graphy - Ultimate Stats Monitor/Font/Office Code Pro/OfficeCodePro-Bold.ttf.meta

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)