Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

Commit cbc9e91

Browse files
ryanluaryanlua
committed
Merge branch 'internal'
2 parents b259416 + 14d1757 commit cbc9e91

33 files changed

+2548
-1128
lines changed

‎.gitignore‎

Lines changed: 443 additions & 0 deletions
Large diffs are not rendered by default.

‎.vscode/extensions.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"recommendations": [
3+
"evaera.vscode-rojo",
4+
"kampfkarren.selene-vscode",
5+
"johnnymorganz.stylua"
6+
]
7+
}

‎experimental.project.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "SignsPlugin",
3+
"tree": {
4+
"$className": "DataModel",
5+
"PluginDebugService": {
6+
"$className": "PluginDebugService",
7+
"Plugin": {
8+
"$className": "Plugin",
9+
"$path": "src"
10+
}
11+
}
12+
}
13+
}

‎src/Signs/PluginGui/AspectRatio.lua‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
local choices = {
2+
{ Id = "1", Value = 0.5, Text = "1:2" },
3+
{ Id = "2", Value = 0.563, Text = "9:16" },
4+
{ Id = "3", Value = 0.625, Text = "10:16" },
5+
{ Id = "4", Value = 0.75, Text = "3:4" },
6+
{ Id = "5", Value = 1, Text = "1:1" },
7+
{ Id = "6", Value = 1.333, Text = "4:3" },
8+
{ Id = "7", Value = 1.6, Text = "16:10" },
9+
{ Id = "8", Value = 1.7, Text = "16:9" },
10+
{ Id = "9", Value = 2, Text = "2:1" },
11+
}
12+
13+
return choices

‎src/Signs/PluginGui/Color.lua‎

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
11
local choices = {
2-
3-
-- Every font in existance, needs a better loop system for if new font is made. Much as a proof of concept for now.
4-
-- [[<font color="rgb(_COLOR3_)">_COLOR_</font>]]
5-
{Id = "1",
2+
-- [[<font color="rgb(r, g, b)">COLOR</font>]]
3+
{
4+
Id = "1",
65
Color = Color3.fromRGB(255, 255, 255),
7-
Text = [[<stroke color="rgb(46, 46, 46)" joins="round" thickness="1" transparency="0.25"><font color="rgb(242, 243, 243)">White</font></stroke>]]},
8-
{Id = "2",
9-
Color = Color3.fromRGB(128, 128, 128),
10-
Text = [[<font color="rgb(128, 128, 128)">Grey</font>]]},
11-
{Id = "3",
12-
Color = Color3.fromRGB(196, 40, 28),
13-
Text = [[<font color="rgb(196, 40, 28)">Red</font>]]},
14-
{Id = "4",
15-
Color = Color3.fromRGB(245, 205, 48),
16-
Text = [[<font color="rgb(245, 205, 48)">Yellow</font>]]},
17-
{Id = "5",
18-
Color = Color3.fromRGB(218, 133, 65),
19-
Text = [[<font color="rgb(218, 133, 65)">Orange</font>]]},
20-
{Id = "6",
21-
Color = Color3.fromRGB(75, 151, 75),
22-
Text = [[<font color="rgb(75, 151, 75)">Green</font>]]},
23-
{Id = "7",
24-
Color = Color3.fromRGB(13, 105, 172),
25-
Text = [[<font color="rgb(13, 105, 172)">Blue</font>]]},
26-
{Id = "8",
27-
Color = Color3.fromRGB(107, 50, 124),
28-
Text = [[<font color="rgb(107, 50, 124)">Violet</font>]]},
29-
{Id = "9",
30-
Color = Color3.fromRGB(170, 0, 170),
31-
Text = [[<font color="rgb(170, 0, 170)">Magenta</font>]]},
32-
{Id = "10",
6+
Text = [[<stroke color="rgb(46, 46, 46)" joins="round" thickness="1" transparency="0.25"><font color="rgb(242, 243, 243)">White</font></stroke>]],
7+
},
8+
{ Id = "2", Color = Color3.fromRGB(128, 128, 128), Text = [[<font color="rgb(128, 128, 128)">Grey</font>]] },
9+
{ Id = "3", Color = Color3.fromRGB(255, 0, 0), Text = [[<font color="rgb(255, 0, 0)">Red</font>]] },
10+
{ Id = "4", Color = Color3.fromRGB(255, 255, 0), Text = [[<font color="rgb(245, 205, 48)">Yellow</font>]] },
11+
{ Id = "5", Color = Color3.fromRGB(255, 170, 0), Text = [[<font color="rgb(255, 170, 0)">Orange</font>]] },
12+
{ Id = "6", Color = Color3.fromRGB(0, 255, 0), Text = [[<font color="rgb(0, 255, 0)">Green</font>]] },
13+
{ Id = "7", Color = Color3.fromRGB(0, 0, 255), Text = [[<font color="rgb(0, 0, 255)">Blue</font>]] },
14+
{ Id = "8", Color = Color3.fromRGB(170, 0, 255), Text = [[<font color="rgb(170, 0, 255)">Violet</font>]] },
15+
{ Id = "9", Color = Color3.fromRGB(255, 0, 255), Text = [[<font color="rgb(255, 0, 255)">Pink</font>]] },
16+
{
17+
Id = "10",
3318
Color = Color3.fromRGB(27, 42, 53),
34-
Text = [[<stroke color="rgb(255, 255, 255)" joins="round" thickness="1" transparency="0.75"><font color="rgb(27, 42, 53)">Black</font></stroke>]]},
35-
{Id = "11",
19+
Text = [[<stroke color="rgb(255, 255, 255)" joins="round" thickness="1" transparency="0.75"><font color="rgb(27, 42, 53)">Black</font></stroke>]],
20+
},
21+
{
22+
Id = "11",
3623
Color = Color3.fromRGB(17, 17, 17),
37-
Text = [[<stroke color="rgb(255, 255, 255)" joins="round" thickness="1" transparency="0.75"><font color="rgb(17, 17, 17)">Really black</font></stroke>]]}
38-
39-
} -- Array of fonts, please fix this. I really hate this.
24+
Text = [[<stroke color="rgb(255, 255, 255)" joins="round" thickness="1" transparency="0.75"><font color="rgb(17, 17, 17)">Really black</font></stroke>]],
25+
},
26+
}
4027

41-
return choices
28+
return choices

‎src/Signs/PluginGui/FontFace.lua‎

Lines changed: 147 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,185 @@
11
local FontFace = {
2-
3-
-- Every font in existance, needs a better loop system for if fromName font is made. Much as a proof of concept for now.
4-
-- [[<font family="rbxasset://fonts/families/_FAMILY_.json">_NAME_</font>]]
5-
6-
{Id = "AccanthisADFStd",
2+
-- [[<font family="rbxasset://fonts/families/FAMILY.json">NAME</font>]]
3+
{
4+
Id = "AccanthisADFStd",
75
Font = Font.fromName("AccanthisADFStd"),
8-
Text = [[<font family="rbxasset://fonts/families/AccanthisADFStd.json">Accanthis</font>]]},
9-
{Id = "AmaticSC",
6+
Text = [[<font family="rbxasset://fonts/families/AccanthisADFStd.json">Accanthis</font>]],
7+
},
8+
{
9+
Id = "AmaticSC",
1010
Font = Font.fromName("AmaticSC"),
11-
Text = [[<font family="rbxasset://fonts/families/AmaticSC.json">Amatic SC</font>]]},
12-
{Id = "Arial",
11+
Text = [[<font family="rbxasset://fonts/families/AmaticSC.json">Amatic SC</font>]],
12+
},
13+
{
14+
Id = "Arial",
1315
Font = Font.fromName("Arial"),
14-
Text = [[<font family="rbxasset://fonts/families/Arial.json">Arial</font>]]},
15-
{Id = "Balthazar",
16+
Text = [[<font family="rbxasset://fonts/families/Arial.json">Arial</font>]],
17+
},
18+
{
19+
Id = "Balthazar",
1620
Font = Font.fromName("Balthazar"),
17-
Text = [[<font family="rbxasset://fonts/families/Balthazar.json">Balthazar</font>]]},
18-
{Id = "Bangers",
21+
Text = [[<font family="rbxasset://fonts/families/Balthazar.json">Balthazar</font>]],
22+
},
23+
{
24+
Id = "Bangers",
1925
Font = Font.fromName("Bangers"),
20-
Text = [[<font family="rbxasset://fonts/families/Bangers.json">Bangers</font>]]},
21-
{Id = "ComicNeueAngular",
26+
Text = [[<font family="rbxasset://fonts/families/Bangers.json">Bangers</font>]],
27+
},
28+
{
29+
Id = "ComicNeueAngular",
2230
Font = Font.fromName("ComicNeueAngular"),
23-
Text = [[<font family="rbxasset://fonts/families/ComicNeueAngular.json">Comic Neue</font>]]},
24-
{Id = "Creepster",
31+
Text = [[<font family="rbxasset://fonts/families/ComicNeueAngular.json">Comic Neue</font>]],
32+
},
33+
{
34+
Id = "Creepster",
2535
Font = Font.fromName("Creepster"),
26-
Text = [[<font family="rbxasset://fonts/families/Creepster.json">Creepster</font>]]},
27-
{Id = "DenkOne",
36+
Text = [[<font family="rbxasset://fonts/families/Creepster.json">Creepster</font>]],
37+
},
38+
{
39+
Id = "DenkOne",
2840
Font = Font.fromName("DenkOne"),
29-
Text = [[<font family="rbxasset://fonts/families/DenkOne.json">DenkOne</font>]]},
30-
{Id = "Fondamento",
41+
Text = [[<font family="rbxasset://fonts/families/DenkOne.json">DenkOne</font>]],
42+
},
43+
{
44+
Id = "Fondamento",
3145
Font = Font.fromName("Fondamento"),
32-
Text = [[<font family="rbxasset://fonts/families/Fondamento.json">Fondamento</font>]]},
33-
{Id = "FredokaOne",
46+
Text = [[<font family="rbxasset://fonts/families/Fondamento.json">Fondamento</font>]],
47+
},
48+
{
49+
Id = "FredokaOne",
3450
Font = Font.fromName("FredokaOne"),
35-
Text = [[<font family="rbxasset://fonts/families/FredokaOne.json">FredokaOne</font>]]},
36-
{Id = "GothamSSm",
51+
Text = [[<font family="rbxasset://fonts/families/FredokaOne.json">FredokaOne</font>]],
52+
},
53+
{
54+
Id = "GothamSSm",
3755
Font = Font.fromName("GothamSSm"),
38-
Text = [[<font family="rbxasset://fonts/families/GothamSSm.json">Gotham SSm</font>]]},
39-
{Id = "GrenzeGotisch",
56+
Text = [[<font family="rbxasset://fonts/families/GothamSSm.json">Gotham SSm</font>]],
57+
},
58+
{
59+
Id = "GrenzeGotisch",
4060
Font = Font.fromName("GrenzeGotisch"),
41-
Text = [[<font family="rbxasset://fonts/families/GrenzeGotisch.json">Grenze Gotisch </font>]]},
42-
{Id = "Guru",
61+
Text = [[<font family="rbxasset://fonts/families/GrenzeGotisch.json">Grenze Gotisch </font>]],
62+
},
63+
{
64+
Id = "Guru",
4365
Font = Font.fromName("Guru"),
44-
Text = [[<font family="rbxasset://fonts/families/Guru.json">Guru</font>]]},
45-
{Id = "HighwayGothic",
66+
Text = [[<font family="rbxasset://fonts/families/Guru.json">Guru</font>]],
67+
},
68+
{
69+
Id = "HighwayGothic",
4670
Font = Font.fromName("HighwayGothic"),
47-
Text = [[<font family="rbxasset://fonts/families/HighwayGothic.json">Highway Gothic</font>]]},
48-
{Id = "Inconsolata",
71+
Text = [[<font family="rbxasset://fonts/families/HighwayGothic.json">Highway Gothic</font>]],
72+
},
73+
{
74+
Id = "Inconsolata",
4975
Font = Font.fromName("Inconsolata"),
50-
Text = [[<font family="rbxasset://fonts/families/Inconsolata.json">Inconsolata</font>]]},
51-
{Id = "IndieFlower",
76+
Text = [[<font family="rbxasset://fonts/families/Inconsolata.json">Inconsolata</font>]],
77+
},
78+
{
79+
Id = "IndieFlower",
5280
Font = Font.fromName("IndieFlower"),
53-
Text = [[<font family="rbxasset://fonts/families/IndieFlower.json">Indie Flower</font>]]},
54-
{Id = "JosefinSans",
81+
Text = [[<font family="rbxasset://fonts/families/IndieFlower.json">Indie Flower</font>]],
82+
},
83+
{
84+
Id = "JosefinSans",
5585
Font = Font.fromName("JosefinSans"),
56-
Text = [[<font family="rbxasset://fonts/families/JosefinSans.json">Josefin Sans</font>]]},
57-
{Id = "Jura",
86+
Text = [[<font family="rbxasset://fonts/families/JosefinSans.json">Josefin Sans</font>]],
87+
},
88+
{
89+
Id = "Jura",
5890
Font = Font.fromName("Jura"),
59-
Text = [[<font family="rbxasset://fonts/families/Jura.json">Jura</font>]]},
60-
{Id = "Kalam",
91+
Text = [[<font family="rbxasset://fonts/families/Jura.json">Jura</font>]],
92+
},
93+
{
94+
Id = "Kalam",
6195
Font = Font.fromName("Kalam"),
62-
Text = [[<font family="rbxasset://fonts/families/Kalam.json">Kalam</font>]]},
63-
{Id = "LuckiestGuy",
96+
Text = [[<font family="rbxasset://fonts/families/Kalam.json">Kalam</font>]],
97+
},
98+
{
99+
Id = "LuckiestGuy",
64100
Font = Font.fromName("LuckiestGuy"),
65-
Text = [[<font family="rbxasset://fonts/families/LuckiestGuy.json">Luckiest Guy</font>]]},
66-
{Id = "Merriweather",
101+
Text = [[<font family="rbxasset://fonts/families/LuckiestGuy.json">Luckiest Guy</font>]],
102+
},
103+
{
104+
Id = "Merriweather",
67105
Font = Font.fromName("Merriweather"),
68-
Text = [[<font family="rbxasset://fonts/families/Merriweather.json">Merriweather</font>]]},
69-
{Id = "Michroma",
106+
Text = [[<font family="rbxasset://fonts/families/Merriweather.json">Merriweather</font>]],
107+
},
108+
{
109+
Id = "Michroma",
70110
Font = Font.fromName("Michroma"),
71-
Text = [[<font family="rbxasset://fonts/families/Michroma.json">Michroma</font>]]},
72-
{Id = "Nunito",
111+
Text = [[<font family="rbxasset://fonts/families/Michroma.json">Michroma</font>]],
112+
},
113+
{
114+
Id = "Nunito",
73115
Font = Font.fromName("Nunito"),
74-
Text = [[<font family="rbxasset://fonts/families/Nunito.json">Nunito</font>]]},
75-
{Id = "Oswald",
116+
Text = [[<font family="rbxasset://fonts/families/Nunito.json">Nunito</font>]],
117+
},
118+
{
119+
Id = "Oswald",
76120
Font = Font.fromName("Oswald"),
77-
Text = [[<font family="rbxasset://fonts/families/Oswald.json">Oswald</font>]]},
78-
{Id = "PatrickHand",
121+
Text = [[<font family="rbxasset://fonts/families/Oswald.json">Oswald</font>]],
122+
},
123+
{
124+
Id = "PatrickHand",
79125
Font = Font.fromName("PatrickHand"),
80-
Text = [[<font family="rbxasset://fonts/families/PatrickHand.json">Patrick Hand</font>]]},
81-
{Id = "PermanentMarker",
126+
Text = [[<font family="rbxasset://fonts/families/PatrickHand.json">Patrick Hand</font>]],
127+
},
128+
{
129+
Id = "PermanentMarker",
82130
Font = Font.fromName("PermanentMarker"),
83-
Text = [[<font family="rbxasset://fonts/families/PermanentMarker.json">Preduring Marker</font>]]},
84-
{Id = "PressStart2P",
131+
Text = [[<font family="rbxasset://fonts/families/PermanentMarker.json">Preduring Marker</font>]],
132+
},
133+
{
134+
Id = "PressStart2P",
85135
Font = Font.fromName("PressStart2P"),
86-
Text = [[<font family="rbxasset://fonts/families/PressStart2P.json">PressStart2P</font>]]},
87-
{Id = "Roboto",
136+
Text = [[<font family="rbxasset://fonts/families/PressStart2P.json">PressStart2P</font>]],
137+
},
138+
{
139+
Id = "Roboto",
88140
Font = Font.fromName("Roboto"),
89-
Text = [[<font family="rbxasset://fonts/families/Roboto.json">Roboto</font>]]},
90-
{Id = "RobotoCondensed",
141+
Text = [[<font family="rbxasset://fonts/families/Roboto.json">Roboto</font>]],
142+
},
143+
{
144+
Id = "RobotoCondensed",
91145
Font = Font.fromName("RobotoCondensed"),
92-
Text = [[<font family="rbxasset://fonts/families/RobotoCondensed.json">Roboto Condensed</font>]]},
93-
{Id = "RobotoMono",
146+
Text = [[<font family="rbxasset://fonts/families/RobotoCondensed.json">Roboto Condensed</font>]],
147+
},
148+
{
149+
Id = "RobotoMono",
94150
Font = Font.fromName("RobotoMono"),
95-
Text = [[<font family="rbxasset://fonts/families/RobotoMono.json">Roboto Mono</font>]]},
96-
{Id = "Sarpanch",
151+
Text = [[<font family="rbxasset://fonts/families/RobotoMono.json">Roboto Mono</font>]],
152+
},
153+
{
154+
Id = "Sarpanch",
97155
Font = Font.fromName("Sarpanch"),
98-
Text = [[<font family="rbxasset://fonts/families/Sarpanch.json">Sarpanch</font>]]},
99-
{Id = "SourceSansPro",
156+
Text = [[<font family="rbxasset://fonts/families/Sarpanch.json">Sarpanch</font>]],
157+
},
158+
{
159+
Id = "SourceSansPro",
100160
Font = Font.fromName("SourceSansPro"),
101-
Text = [[<font family="rbxasset://fonts/families/SourceSansPro.json">Source Sans Pro</font>]]},
102-
{Id = "SpecialElite",
161+
Text = [[<font family="rbxasset://fonts/families/SourceSansPro.json">Source Sans Pro</font>]],
162+
},
163+
{
164+
Id = "SpecialElite",
103165
Font = Font.fromName("SpecialElite"),
104-
Text = [[<font size="12" family="rbxasset://fonts/families/SpecialElite.json">Special Elite</font>]]},
105-
{Id = "TitilliumWeb",
166+
Text = [[<font size="12" family="rbxasset://fonts/families/SpecialElite.json">Special Elite</font>]],
167+
},
168+
{
169+
Id = "TitilliumWeb",
106170
Font = Font.fromName("TitilliumWeb"),
107-
Text = [[<font family="rbxasset://fonts/families/TitilliumWeb.json">Titillium Web</font>]]},
108-
{Id = "Ubuntu",
171+
Text = [[<font family="rbxasset://fonts/families/TitilliumWeb.json">Titillium Web</font>]],
172+
},
173+
{
174+
Id = "Ubuntu",
109175
Font = Font.fromName("Ubuntu"),
110-
Text = [[<font family="rbxasset://fonts/families/Ubuntu.json">Ubuntu</font>]]},
111-
{Id = "Zekton",
176+
Text = [[<font family="rbxasset://fonts/families/Ubuntu.json">Ubuntu</font>]],
177+
},
178+
{
179+
Id = "Zekton",
112180
Font = Font.fromName("Zekton"),
113-
Text = [[<font family="rbxasset://fonts/families/Zekton.json">Zekton</font>]]}
114-
115-
} -- Array of fonts, please fix this. I really hate this.
181+
Text = [[<font family="rbxasset://fonts/families/Zekton.json">Zekton</font>]],
182+
},
183+
}
116184

117-
return FontFace
185+
return FontFace

0 commit comments

Comments
 (0)