fortressforever/fortressforever-scripts
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-scripts.git synced 2025-06-03 10:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into features/disabling-security-rewards

Browse source 
Conflicts:
	resource/FortressForever_english.txt
This commit is contained in:
alaswell 2015-05-24 18:04:48 -06:00
commit 25009c6367
39 changed files with 540 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

84
resource/ClientScheme.res
View file

@ -462,7 +462,6 @@ Scheme
"1"
{
"name" "FortressForever - HUD Glyphs"
"custom" "1"
"tall" "16"
"weight" "0"
"antialias" "1"
@ -471,7 +470,6 @@ Scheme
"2"
{
"name" "FortressForever - HUD Glyphs"
"custom" "1"
"tall" "18"
"weight" "0"
"antialias" "1"
@ -480,7 +478,6 @@ Scheme
"3"
{
"name" "FortressForever - HUD Glyphs"
"custom" "1"
"tall" "24"
"weight" "0"
"antialias" "1"
@ -489,7 +486,6 @@ Scheme
"4"
{
"name" "FortressForever - HUD Glyphs"
"custom" "1"
"tall" "32"
"weight" "0"
"antialias" "1"
@ -498,7 +494,6 @@ Scheme
"5"
{
"name" "FortressForever - HUD Glyphs"
"custom" "1"
"tall" "40"
"weight" "0"
"antialias" "1"
@ -510,7 +505,6 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "32"
"weight" "0"
"antialias" "1"
@ -519,7 +513,6 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "35"
"weight" "0"
"antialias" "1"
@ -528,7 +521,6 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "37"
"weight" "0"
"antialias" "1"
@ -537,7 +529,6 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "43"
"weight" "0"
"antialias" "1"
@ -546,7 +537,6 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "47"
"weight" "0"
"antialias" "1"
@ -802,7 +792,6 @@ Scheme
"weight" "0"
"antialias" "0"
"additive" "1"
"custom" "1"
"yres" "1 10000"
}
}
@ -815,7 +804,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
HudNumbers
@ -827,7 +815,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
HudNumbersGlow
@ -841,7 +828,6 @@ Scheme
"scanlines" "2"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
HudNumbersSmall
@ -853,7 +839,6 @@ Scheme
"weight" "1000"
"additive" "1"
"antialias" "1"
"custom" "1"
}
}
HudSelectionNumbers
@ -877,7 +862,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
@ -892,7 +876,6 @@ Scheme
"scanlines" "2"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
@ -914,7 +897,7 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"tall" "14"
"tall" "15"
"weight" "0"
"antialias" "1"
"additive" "0"
@ -1121,8 +1104,7 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "24"
"tall" "32"
"weight" "0"
"additive" "0"
"antialias" "1"
@ -1132,8 +1114,7 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "40"
"tall" "48"
"weight" "0"
"additive" "0"
"antialias" "1"
@ -1142,8 +1123,7 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "48"
"tall" "64"
"weight" "0"
"additive" "0"
"antialias" "1"
@ -1152,7 +1132,6 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "80"
"weight" "0"
"yres" "1024 1199"
@ -1161,7 +1140,6 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "96"
"weight" "0"
"yres" "1200 6000"
@ -1177,7 +1155,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
CreditsText
@ -1200,7 +1177,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
CreditsOutroText
@ -1277,7 +1253,6 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "9"
"weight" "500"
"antialias" "1"
@ -1286,7 +1261,6 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "11"
"weight" "500"
"antialias" "1"
@ -1295,7 +1269,6 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "13"
"weight" "600"
"antialias" "1"
@ -1304,7 +1277,6 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "16"
"weight" "900"
"antialias" "1"
@ -1313,7 +1285,6 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "17"
"weight" "1000"
"antialias" "1"
@ -1326,7 +1297,6 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "18"
"weight" "500"
"antialias" "1"
@ -1335,7 +1305,6 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "18"
"weight" "500"
"antialias" "1"
@ -1344,7 +1313,6 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "24"
"weight" "600"
"antialias" "1"
@ -1353,7 +1321,6 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "36"
"weight" "900"
"antialias" "1"
@ -1362,7 +1329,6 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "48"
"weight" "1000"
"antialias" "1"
@ -1374,8 +1340,7 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "10"
"tall" "12"
"weight" "300"
"antialias" "1"
"yres" "1 599"
@ -1383,8 +1348,7 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "12"
"tall" "14"
"weight" "500"
"antialias" "1"
"yres" "600 767"
@ -1392,8 +1356,7 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "14"
"tall" "16"
"weight" "500"
"antialias" "1"
"yres" "768 1023"
@ -1401,8 +1364,7 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "20"
"tall" "24"
"weight" "1000"
"antialias" "1"
"yres" "1024 1199"
@ -1410,8 +1372,7 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "24"
"tall" "30"
"weight" "1000"
"antialias" "1"
"yres" "1200 10000"
@ -1423,7 +1384,6 @@ Scheme
{
"name" "FortressForever - HUD Glyphs"
"tall" "31"
"custom" "1"
"antialias" "1"
}
}
@ -1433,7 +1393,6 @@ Scheme
{
"name" "FortressForever - HUD Glyphs"
"tall" "31"
"custom" "1"
"antialias" "1"
}
}
@ -1443,7 +1402,6 @@ Scheme
{
"name" "FortressForever - HUD Glyphs"
"tall" "10"
"custom" "1"
"antialias" "1"
}
@ -1454,7 +1412,6 @@ Scheme
{
"name" "FortressForever - HUD Glyphs"
"tall" "20"
"custom" "1"
"antialias" "1"
}
@ -1483,8 +1440,7 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"tall" "12"
"custom" "1"
"tall" "13"
"antialias" "1"
"additive" "0"
}
@ -1498,7 +1454,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"WeaponIconsSelected"
@ -1512,7 +1467,6 @@ Scheme
"blur" "5"
"scanlines" "2"
"additive" "1"
"custom" "1"
}
}
"WeaponIconsClassSelect"
@ -1524,7 +1478,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"WeaponIconsHUD"
@ -1536,7 +1489,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"WeaponIconsSmall"
@ -1548,7 +1500,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"AmmoIconsSmall"
@ -1560,7 +1511,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"StatusGlyphs"
@ -1572,7 +1522,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"StatusGlyphsSmall"
@ -1584,7 +1533,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"GrenadeIcons"
@ -1607,7 +1555,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
"ClassGlyphs" // icons on hud when you disguise and such
@ -1619,7 +1566,6 @@ Scheme
"weight" "0"
"antialias" "1"
"additive" "0"
"custom" "1"
}
}
@ -1702,7 +1648,7 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"tall" "10"
"tall" "12"
"weight" "0"
"dropshadow" "1"
"antialias" "1"
@ -1712,7 +1658,7 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"tall" "12"
"tall" "14"
"weight" "0"
"antialias" "1"
"dropshadow" "1"
@ -1721,7 +1667,7 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"tall" "14"
"tall" "16"
"weight" "0"
"antialias" "1"
"dropshadow" "1"
@ -1730,7 +1676,7 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"tall" "20"
"tall" "24"
"weight" "0"
"antialias" "1"
"dropshadow" "1"
@ -1739,7 +1685,7 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"tall" "24"
"tall" "30"
"weight" "0"
"antialias" "1"
"dropshadow" "1"

BIN
resource/FortressForever_brazilian.txt Normal file
View file

Binary file not shown.

BIN
resource/FortressForever_russian.txt Normal file
View file

Binary file not shown.

BIN
resource/FortressForever_spanish.txt Normal file
View file

Binary file not shown.

BIN
resource/HUDfont.ttf
View file

Binary file not shown.

26
resource/SourceScheme.res
View file

@ -252,9 +252,8 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"tall" "14"
"tall" "16"
"antialias" "1"
"custom" "1"
}
}
"DefaultBold" //doesn't appear to be used
@ -263,7 +262,6 @@ Scheme
{
"name" "Tahoma"
"custom" "1"
"tall" "16"
"weight" "500"
}
@ -284,7 +282,6 @@ Scheme
{
"name" "Verdana"
"custom" "1"
"tall" "12"
"weight" "0"
}
@ -295,7 +292,6 @@ Scheme
{
"name" "Verdana"
"custom" "1"
"tall" "13"
"weight" "0"
"dropshadow" "1"
@ -307,7 +303,6 @@ Scheme
{
"name" "Tahoma"
"custom" "1"
"tall" "14"
"weight" "0"
}
@ -319,7 +314,6 @@ Scheme
{
"name" "Verdana"
"custom" "1"
"tall" "18"
"weight" "0"
}
@ -330,8 +324,7 @@ Scheme
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "16"
"tall" "18"
"weight" "500"
"antialias" "1"
}
@ -342,8 +335,7 @@ Scheme
"1"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "16"
"tall" "18"
"weight" "500"
"antialias" "1"
@ -352,8 +344,7 @@ Scheme
"2"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "18"
"tall" "20"
"weight" "500"
"antialias" "1"
"yres" "600 767"
@ -361,8 +352,7 @@ Scheme
"3"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "22"
"tall" "24"
"weight" "500"
"antialias" "1"
"yres" "768 1023"
@ -370,8 +360,7 @@ Scheme
"4"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "24"
"tall" "26"
"weight" "600"
"antialias" "1"
"yres" "1024 1199"
@ -379,7 +368,6 @@ Scheme
"5"
{
"name" "FortressForever - HUD Font"
"custom" "1"
"tall" "32"
"weight" "600"
"antialias" "1"
@ -581,7 +569,6 @@ Scheme
"tall" "72"
"weight" "400"
"antialias" "1"
"custom" "1"
}
}
@ -593,7 +580,6 @@ Scheme
"tall" "120"
"weight" "400"
"antialias" "1"
"custom" "1"
}
}
}

2
resource/ff_version_client.txt
View file

@ -1,4 +1,4 @@
2.46.1
2.5.0
CLIENT version:
- only the first line of this file matters

2
resource/ff_version_server.txt
View file

@ -1,4 +1,4 @@
2.46
2.5.0
SERVER version:
- only the first line of this file matters

BIN
resource/gameui_brazilian.txt Normal file
View file

Binary file not shown.

BIN
resource/gameui_russian.txt Normal file
View file

Binary file not shown.

BIN
resource/gameui_spanish.txt Normal file
View file

Binary file not shown.

8
resource/ui/FFOptionsSubCrosshairs.res
View file

@ -429,7 +429,7 @@
"xpos" "275"
"ypos" "49"
"wide" "185"
"tall" "24"
"tall" "32"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
@ -439,7 +439,7 @@
"textAlignment" "west"
"dulltext" "0"
"brighttext" "0"
"wrap" "0"
"wrap" "1"
"Default" "0"
}
"innerDisplay"
@ -500,10 +500,10 @@
"border" "DepressedBorder"
"scaleImage" "1"
}
"weapon"
"Crosshair"
{
"ControlName" "ComboBox"
"fieldName" "Weapon"
"fieldName" "Crosshair"
"xpos" "292"
"ypos" "23"
"wide" "150"