Merge branch 'master' into timelimit

This commit is contained in:
Nickelony 2017-08-20 22:08:57 +02:00 committed by GitHub
commit f4a34b5bdd

View File

@ -15,52 +15,71 @@
"Start"
{
"visible" "1"
"red" "67"
"green" "210"
"blue" "230"
"alpha" "255"
"width" "0.5"
}
"End"
{
"visible" "1"
"red" "165"
"green" "19"
"blue" "194"
"alpha" "255"
"width" "0.5"
}
"Glitch_Respawn"
{
"visible" "0"
"red" "255"
"green" "200"
"blue" "0"
"alpha" "255"
"width" "0.5"
}
"Glitch_Stop"
{
"visible" "0"
"red" "255"
"green" "200"
"blue" "0"
"alpha" "255"
"width" "0.5"
}
"Glitch_Slay"
{
"visible" "0"
"red" "255"
"green" "200"
"blue" "0"
"alpha" "255"
"width" "0.5"
}
"Freestyle"
{
"visible" "1"
"red" "25"
"green" "25"
"blue" "255"
"alpha" "195"
"width" "0.5"
}
@ -68,9 +87,11 @@
"Nolimit"
{
"visible" "1"
"red" "247"
"green" "3"
"blue" "255"
"alpha" "50"
"width" "0.5"
}
@ -78,9 +99,11 @@
"Teleport"
{
"visible" "0"
"red" "255"
"green" "200"
"blue" "0"
"alpha" "255"
"width" "4.0"
}
@ -94,9 +117,11 @@
"Easybhop"
{
"visible" "1"
"red" "57"
"green" "196"
"blue" "92"
"alpha" "175"
"width" "2.5"
}