Skip to content

Commit 5c4adfa

Browse files
tekunotritekunotri
committed
proper merge + ver bump + whatnot
2 parents 627288a + a7a9b8f commit 5c4adfa

21 files changed

+1467
-113
lines changed

‎resource/scheme/mm_borders.res‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -380,27 +380,28 @@ Borders
380380
}
381381
}
382382

383-
MainMenuSubButtonBorder
384-
{
385-
"inset" "0 0 1 1"
386-
Left
387-
{
388-
"1"
389-
{
390-
"color" "TanDarker"
391-
"offset" "0 1"
392-
}
393-
}
394-
395-
Right
396-
{
397-
"1"
398-
{
399-
"color" "TanDarker"
400-
"offset" "1 0"
401-
}
402-
}
403-
}
383+
MainMenuSubButtonBorder
384+
{
385+
"inset" "0 0 1 0"
386+
"proportional_scalar" "0.667"
387+
Left
388+
{
389+
"1"
390+
{
391+
"color" "TanDarker"
392+
"offset" "0 0"
393+
}
394+
}
395+
396+
Right
397+
{
398+
"1"
399+
{
400+
"color" "TanDarker"
401+
"offset" "0 0"
402+
}
403+
}
404+
}
404405

405406
CrosshatchedBackground
406407
{

‎resource/scheme/mm_fonts.res‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
{
88
"1"
99
{
10-
"name" "ToonHUD Montserrat" [$WINDOWS]
11-
"name" "ToonHUD Montserrat" [!$WINDOWS]
10+
"name" "toonhud_montserrat" [$WINDOWS]
11+
"name" "toonhud_montserrat" [!$WINDOWS]
1212
"tall" "13" [$WINDOWS]
1313
"tall" "14" [!$WINDOWS]
1414
"weight" "500"
@@ -20,8 +20,8 @@
2020
{
2121
"1"
2222
{
23-
"name" "ToonHUD Montserrat" [$WINDOWS]
24-
"name" "ToonHUD Montserrat" [!$WINDOWS]
23+
"name" "toonhud_montserrat" [$WINDOWS]
24+
"name" "toonhud_montserrat" [!$WINDOWS]
2525
"tall" "25" [$WINDOWS]
2626
"tall" "20" [!$WINDOWS]
2727
"weight" "0"
@@ -527,6 +527,15 @@
527527
"additive" "0"
528528
"antialias" "1"
529529
}
530+
"linux"
531+
{
532+
"name" "TF2 Build"
533+
"tall" "43"
534+
"tall_lodef" "52"
535+
"weight" "500"
536+
"additive" "0"
537+
"antialias" "1"
538+
}
530539
}
531540
"HudFontMediumSmallDAMAGE"
532541
{
@@ -734,6 +743,17 @@
734743
"antialias" "1"
735744
}
736745
}
746+
"HudFontSmallish1Bold"
747+
{
748+
"1"
749+
{
750+
"name" "TF2 Build"
751+
"tall" "15"
752+
"weight" "500"
753+
"additive" "0"
754+
"antialias" "1"
755+
}
756+
}
737757
"HudFontSmallBold"
738758
{
739759
"1"
@@ -2976,29 +2996,29 @@
29762996
}
29772997
}
29782998

2979-
"TF2 Icons"
2999+
"tf2icons"
29803000
{
29813001
"1"
29823002
{
2983-
"name" "TF2 Icons"
3003+
"name" "tf2icons"
29843004
"tall" "16"
29853005
"antialias" "1"
29863006
}
29873007
}
2988-
"TF2 Icons18"
3008+
"tf2icons18"
29893009
{
29903010
"1"
29913011
{
2992-
"name" "TF2 Icons"
3012+
"name" "tf2icons"
29933013
"tall" "18"
29943014
"antialias" "1"
29953015
}
29963016
}
2997-
"TF2 Icons20"
3017+
"tf2icons20"
29983018
{
29993019
"1"
30003020
{
3001-
"name" "TF2 Icons"
3021+
"name" "tf2icons"
30023022
"tall" "20"
30033023
"antialias" "1"
30043024
}
@@ -3175,7 +3195,7 @@
31753195
"font" "resource/fonts/toonhud_montserrat.ttf"
31763196
"name" "toonhud_montserrat"
31773197
}
3178-
"12"
3198+
"19"
31793199
{
31803200
"font" "resource/fonts/tf2icons.ttf"
31813201
"name" "tf2icons"

‎resource/ui/basechat.res‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#base "../../customizations/chatposition.res"
1+
#base "../../customizations/chatposition.res"
22
// BASE CONTENT, EDIT THIS!!!
33
#base "basechat_base.res"

‎resource/ui/charinfopanel.res‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"title" "#CharInfoAndSetup"
2323
"title_font" "HudFontMediumBold"
2424
"titletextinsetX" "40"
25-
"titletextinsetY" "10"
25+
"titletextinsetY" "0"
2626
"titlebarfgcolor_override" "200 187 161 255"
2727
"titlebardisabledfgcolor_override" "200 187 161 255"
2828
"titlebarbgcolor_override" "46 43 42 255"
@@ -81,7 +81,7 @@
8181
"tabxindent" "80"
8282
"tabxdelta" "10"
8383
"tabwidth" "240"
84-
"tabheight" "25"
84+
"tabheight" "20"
8585
"transition_time" "0"
8686
"yoffset" "14"
8787

@@ -90,7 +90,7 @@
9090
"ControlName" "ImagePanel"
9191
"fieldName" "HeaderLine"
9292
"xpos" "0"
93-
"ypos" "25"
93+
"ypos" "32"
9494
"zpos" "5"
9595
"wide" "f0"
9696
"tall" "10"

‎resource/ui/classloadoutpanel.res‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"ControlName" "ImagePanel"
66
"xpos" "0"
7-
"ypos" "-20"
7+
"ypos" "0"
88
"zpos" "-2"
99
"wide" "f0" //Change this to "0" if you dont want a bg here
1010
"tall" "400"
@@ -401,16 +401,16 @@
401401
{
402402
"ControlName" "CExButton"
403403
"fieldName" "CharacterLoadoutButton"
404-
"xpos" "c-25"
405-
"ypos" "c90"
404+
"xpos" "c-27"
405+
"ypos" "c80"
406406
"zpos" "2"
407407
"wide" "25"
408408
"tall" "25"
409409
"visible" "1"
410410
"enabled" "1"
411411
"textAlignment" "center"
412412
"labeltext" "P"
413-
"font" "TF2 Icons"
413+
"font" "tf2icons"
414414
"Command" "characterloadout"
415415
"sound_depressed" "UI/buttonclick.wav"
416416
"sound_released" "UI/buttonclickrelease.wav"
@@ -423,16 +423,16 @@
423423
{
424424
"ControlName" "CExButton"
425425
"fieldName" "TauntLoadoutButton"
426-
"xpos" "c2"
427-
"ypos" "c90"
426+
"xpos" "c1"
427+
"ypos" "c80"
428428
"zpos" "2"
429429
"wide" "25"
430430
"tall" "25"
431431
"visible" "1"
432432
"enabled" "1"
433433
"textAlignment" "center"
434-
"labeltext" "Q"
435-
"font" "TF2 Icons"
434+
"labeltext" ":"
435+
"font" "tf2icons"
436436
"Command" "tauntloadout"
437437
"sound_depressed" "UI/buttonclick.wav"
438438
"sound_released" "UI/buttonclickrelease.wav"
@@ -441,56 +441,57 @@
441441
"armedFgColor_override" "White"
442442
"depressedFgColor_override" "White"
443443
}
444-
"BlueButton"
444+
"RedButton"
445445
{
446446
"ControlName" "CExImageButton"
447-
"fieldName" "BlueButton"
448-
"xpos" "c-25"
449-
"ypos" "r124"
447+
"fieldName" "RedButton"
448+
"xpos" "c-27"
449+
"ypos" "r133"
450450
"zpos" "20"
451451
"wide" "25"
452-
"tall" "8"
452+
"tall" "10"
453453
"visible" "1"
454454
"enabled" "1"
455455
"labelText" ""
456456
"textAlignment" "center"
457457
"font" ""
458458
"scaleImage" "1"
459-
"command" "sv_cheats 1;r_skin 1"
459+
"command" "sv_cheats 1;r_skin 0"
460460
"sound_depressed" "UI/buttonclick.wav"
461461
"sound_released" "UI/buttonclickrelease.wav"
462462

463463
"paintbackground" "1"
464464
"paintbackgroundtype" "2"
465-
"defaultBgColor_override" "90 122 143 255"
466-
"armedBgColor_override" "90 122 143 255"
467-
"depressedBgColor_override" "90 122 143 255"
465+
"defaultBgColor_override" "189 59 61 255"
466+
"armedBgColor_override" "189 59 61 255"
467+
"depressedBgColor_override" "189 59 61 255"
468468
}
469-
"RedButton"
469+
"BlueButton"
470470
{
471471
"ControlName" "CExImageButton"
472-
"fieldName" "RedButton"
473-
"xpos" "c2"
474-
"ypos" "r124"
472+
"fieldName" "BlueButton"
473+
"xpos" "c1"
474+
"ypos" "r133"
475475
"zpos" "20"
476476
"wide" "25"
477-
"tall" "8"
477+
"tall" "10"
478478
"visible" "1"
479479
"enabled" "1"
480480
"labelText" ""
481481
"textAlignment" "center"
482482
"font" ""
483483
"scaleImage" "1"
484-
"command" "sv_cheats 1;r_skin 0"
484+
"command" "sv_cheats 1;r_skin 1"
485485
"sound_depressed" "UI/buttonclick.wav"
486486
"sound_released" "UI/buttonclickrelease.wav"
487487

488488
"paintbackground" "1"
489489
"paintbackgroundtype" "2"
490-
"defaultBgColor_override" "189 59 61 255"
491-
"armedBgColor_override" "189 59 61 255"
492-
"depressedBgColor_override" "189 59 61 255"
490+
"defaultBgColor_override" "90 122 143 255"
491+
"armedBgColor_override" "90 122 143 255"
492+
"depressedBgColor_override" "90 122 143 255"
493493
}
494+
494495
"TauntsExplanation"
495496
{
496497
"ControlName" "CExplanationPopup"

‎resource/ui/econ/backpackpanel.res‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
"textAlignment" "west"
230230
"textinsetx" "3"
231231
"labeltext" "q"
232-
"font" "TF2 Icons"
232+
"font" "tf2icons"
233233
"fgcolor" "White"
234234
"paintbackground" "1"
235235
"paintbackgroundtype" "2"

‎resource/ui/globalchat.res‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"fieldName" "partychat"
66
"visible" "1"
77
"enabled" "1"
8-
"xpos" "1"
9-
"ypos" "-50"
8+
"xpos" "-1"
9+
"ypos" "100"
1010
"zpos" "1001"
11-
"wide" "167"
11+
"wide" "400"
1212
"tall" "200"
1313
"proportionaltoparent" "1"
1414
"keyboardinputenabled" "1"
@@ -34,11 +34,11 @@
3434
{
3535
// "ControlName" "richtext"
3636
"fieldName" "chatlog"
37-
"xpos" "1"
38-
"ypos" "5"
37+
"xpos" "cs-0.5"
38+
"ypos" "1"
3939
"zpos" "1"
40-
"wide" "f-50"
41-
"tall" "f20"
40+
"wide" "f0"
41+
"tall" "f16"
4242
"visible" "1"
4343
"proportionaltoparent" "1"
4444
"RoundedCorners" "0"
@@ -85,17 +85,17 @@
8585
{
8686
// "ControlName" "TextEntry"
8787
"fieldName" "chatentry"
88-
"xpos" "2"
89-
"ypos" "rs1+19"
88+
"xpos" "-1"
89+
"ypos" "rs1+17"
9090
"zpos" "1"
91-
"wide" "165"
91+
"wide" "f1"
9292
"tall" "13"
9393
"visible" "1"
9494
"proportionaltoparent" "1"
9595
"bgcolor_override" "0 0 0 255"
9696
"RoundedCorners" "0"
9797
"font" "HudFontSmallest"
98-
"alpha" "1"
98+
"alpha" "0"
9999
"mouseinputenabled" "0"
100100

101101
"pinCorner" "2"

‎resource/ui/itemselectionpanel.res‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"ControlName" "EditablePanel"
77
"fieldName" "ItemSelectionPanel"
88
"xpos" "0"
9-
"ypos" "0"
9+
"ypos" "-10"
1010
"zpos" "500"
1111
"wide" "f0"
1212
"tall" "480"
@@ -99,7 +99,7 @@
9999
"textAlignment" "west"
100100
"textinsetx" "2"
101101
"labeltext" "q"
102-
"font" "TF2 Icons"
102+
"font" "tf2icons"
103103
"fgcolor" "White"
104104
"paintbackground" "1"
105105
"paintbackgroundtype" "2"

‎resource/ui/mainmenuoverride.res‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
#base "custom/preload.res"
12
#base "../../customizations/streamermode/mainmenuoverride.res"
23
#base "mainmenuoverride_base.res"

0 commit comments

Comments
 (0)