added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566

This commit is contained in:
oy 2011-04-04 20:37:12 +02:00
parent 4ad6d2f01e
commit 5c6e274a88
87 changed files with 708 additions and 43 deletions

BIN
data/countryflags/AR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
data/countryflags/AT.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/AU.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
data/countryflags/BE.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/BG.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/BR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
data/countryflags/BY.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
data/countryflags/CA.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
data/countryflags/CH.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/CL.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
data/countryflags/CN.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

BIN
data/countryflags/CO.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/CZ.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
data/countryflags/DE.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
data/countryflags/DK.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
data/countryflags/EE.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
data/countryflags/EG.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
data/countryflags/ES.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
data/countryflags/FI.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/FR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/GB.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
data/countryflags/GR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
data/countryflags/HR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
data/countryflags/HU.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/ID.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/IL.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
data/countryflags/IN.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
data/countryflags/IR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
data/countryflags/IT.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/KZ.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
data/countryflags/LT.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/LV.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/MX.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
data/countryflags/NL.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/NO.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
data/countryflags/PH.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
data/countryflags/PK.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
data/countryflags/PL.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/PT.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
data/countryflags/RO.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/RS.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
data/countryflags/RU.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/SA.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
data/countryflags/SE.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/countryflags/SK.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
data/countryflags/TR.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
data/countryflags/UA.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
data/countryflags/US.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
data/countryflags/XEN.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
data/countryflags/XNI.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

BIN
data/countryflags/XSC.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
data/countryflags/XWA.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
data/countryflags/ZA.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 820 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 814 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

View file

@ -6,95 +6,760 @@
default default
== -1 == -1
england XEN
== 901 == 901
northern_ireland XNI
== 902 == 902
scotland XSC
== 903 == 903
wales XWA
== 904 == 904
##### ISO 3166-1 based ##### ##### ISO 3166-1 based #####
argentina AF
== 032 == 4
austria AX
== 040 == 248
belgium AL
== 056 == 8
bosnia_and_herzegovina DZ
== 070 == 12
czech_republic AS
== 16
AD
== 20
AO
== 24
AI
== 660
AQ
== 10
AG
== 28
AR
== 32
AM
== 51
AW
== 533
AU
== 36
AT
== 40
AZ
== 31
BS
== 44
BH
== 48
BD
== 50
BB
== 52
BY
== 112
BE
== 56
BZ
== 84
BJ
== 204
BM
== 60
BT
== 64
BO
== 68
BQ
== 535
BA
== 70
BW
== 72
BV
== 74
BR
== 76
IO
== 86
BN
== 96
BG
== 100
BF
== 854
BI
== 108
KH
== 116
CM
== 120
CA
== 124
CV
== 132
KY
== 136
CF
== 140
TD
== 148
CL
== 152
CN
== 156
CX
== 162
CC
== 166
CO
== 170
KM
== 174
CG
== 178
CD
== 180
CK
== 184
CR
== 188
CI
== 384
HR
== 191
CU
== 192
CW
== 531
CY
== 196
CZ
== 203 == 203
denmark DK
== 208 == 208
finland DJ
== 262
DM
== 212
DO
== 214
EC
== 218
EG
== 818
SV
== 222
GQ
== 226
ER
== 232
EE
== 233
ET
== 231
FK
== 238
FO
== 234
FJ
== 242
FI
== 246 == 246
france FR
== 250 == 250
germany GF
== 254
PF
== 258
TF
== 260
GA
== 266
GM
== 270
GE
== 268
DE
== 276 == 276
greece GH
== 288
GI
== 292
GR
== 300 == 300
#ireland GL
#== 372 == 304
italy GD
== 308
GP
== 312
GU
== 316
GT
== 320
GG
== 831
GN
== 324
GW
== 624
GY
== 328
HT
== 332
HM
== 334
VA
== 336
HN
== 340
HK
== 344
HU
== 348
IS
== 352
IN
== 356
ID
== 360
IR
== 364
IQ
== 368
IE
== 372
IM
== 833
IL
== 376
IT
== 380 == 380
netherlands JM
== 388
JP
== 392
JE
== 832
JO
== 400
KZ
== 398
KE
== 404
KI
== 296
KP
== 408
KR
== 410
KW
== 414
KG
== 417
LA
== 418
LV
== 428
LB
== 422
LS
== 426
LR
== 430
LY
== 434
LI
== 438
LT
== 440
LU
== 442
MO
== 446
MK
== 807
MG
== 450
MW
== 454
MY
== 458
MV
== 462
ML
== 466
MT
== 470
MH
== 584
MQ
== 474
MR
== 478
MU
== 480
YT
== 175
MX
== 484
FM
== 583
MD
== 498
MC
== 492
MN
== 496
ME
== 499
MS
== 500
MA
== 504
MZ
== 508
MM
== 104
NA
== 516
NR
== 520
NP
== 524
NL
== 528 == 528
norway NC
== 540
NZ
== 554
NI
== 558
NE
== 562
NG
== 566
NU
== 570
NF
== 574
MP
== 580
NO
== 578 == 578
poland OM
== 512
PK
== 586
PW
== 585
PS
== 275
PA
== 591
PG
== 598
PY
== 600
PE
== 604
PH
== 608
PN
== 612
PL
== 616 == 616
portugal PT
== 620 == 620
romania PR
== 630
QA
== 634
RE
== 638
RO
== 642 == 642
russian_federation RU
== 643 == 643
serbia RW
== 646
BL
== 652
SH
== 654
KN
== 659
LC
== 662
MF
== 663
PM
== 666
VC
== 670
WS
== 882
SM
== 674
ST
== 678
SA
== 682
SN
== 686
RS
== 688 == 688
slovakia SC
== 690
SL
== 694
SG
== 702
SX
== 534
SK
== 703 == 703
spain SI
== 705
SB
== 90
SO
== 706
ZA
== 710
GS
== 239
ES
== 724 == 724
sweden LK
== 144
SD
== 736
SR
== 740
SJ
== 744
SZ
== 748
SE
== 752 == 752
switzerland CH
== 756 == 756
ukraine SY
== 760
TW
== 158
TJ
== 762
TZ
== 834
TH
== 764
TL
== 626
TG
== 768
TK
== 772
TO
== 776
TT
== 780
TN
== 788
TR
== 792
TM
== 795
TC
== 796
TV
== 798
UG
== 800
UA
== 804 == 804
united_kingdom AE
== 784
GB
== 826 == 826
united_states US
== 840 == 840
UM
== 581
UY
== 858
UZ
== 860
VU
== 548
VE
== 862
VN
== 704
VG
== 92
VI
== 850
WF
== 876
EH
== 732
YE
== 887
ZM
== 894
ZW
== 716

Binary file not shown.

Before

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 911 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 789 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

View file

@ -626,8 +626,8 @@ void CMenus::RenderServerbrowserServerDetail(CUIRect View)
CUIRect Name, Clan, Score, Flag; CUIRect Name, Clan, Score, Flag;
ServerScoreBoard.HSplitTop(25.0f, &Name, &ServerScoreBoard); ServerScoreBoard.HSplitTop(25.0f, &Name, &ServerScoreBoard);
Name.VSplitLeft(30.0f, &Score, &Name); Name.VSplitLeft(30.0f, &Score, &Name);
Name.VSplitRight(23.0f*96.0f/64.0f, &Name, &Flag); Name.VSplitRight(34.0f, &Name, &Flag);
Flag.HMargin(1.0f, &Flag); Flag.HMargin(4.0f, &Flag);
Name.HSplitTop(12.0f, &Name, &Clan); Name.HSplitTop(12.0f, &Name, &Clan);
// score // score
@ -687,7 +687,7 @@ void CMenus::RenderServerbrowserServerDetail(CUIRect View)
// flag // flag
Graphics()->TextureSet(m_pClient->m_pCountryFlags->Get(pSelectedServer->m_aClients[i].m_Country)->m_Texture); Graphics()->TextureSet(m_pClient->m_pCountryFlags->Get(pSelectedServer->m_aClients[i].m_Country)->m_Texture);
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f); Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
IGraphics::CQuadItem QuadItem(Flag.x, Flag.y, Flag.w, Flag.h); IGraphics::CQuadItem QuadItem(Flag.x, Flag.y, Flag.w, Flag.h);
Graphics()->QuadsDrawTL(&QuadItem, 1); Graphics()->QuadsDrawTL(&QuadItem, 1);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();

View file

@ -219,7 +219,7 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView)
{ {
Item.m_Rect.Margin(10.0f, &Item.m_Rect); Item.m_Rect.Margin(10.0f, &Item.m_Rect);
float OldWidth = Item.m_Rect.w; float OldWidth = Item.m_Rect.w;
Item.m_Rect.w = 96.0f*Item.m_Rect.h/64.0f; Item.m_Rect.w = Item.m_Rect.h*2;
Item.m_Rect.x += (OldWidth-Item.m_Rect.w)/ 2.0f; Item.m_Rect.x += (OldWidth-Item.m_Rect.w)/ 2.0f;
Graphics()->TextureSet(pEntry->m_Texture); Graphics()->TextureSet(pEntry->m_Texture);
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();

View file

@ -169,7 +169,7 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
x += 10.0f; x += 10.0f;
float LineHeight = 60.0f; float LineHeight = 60.0f;
float TeeSizeMod = 1.0f; float TeeSizeMod = 1.0f;
float Spacing = 10.0f; float Spacing = 16.0f;
if(m_pClient->m_Snap.m_aTeamSize[Team] > 12) if(m_pClient->m_Snap.m_aTeamSize[Team] > 12)
{ {
LineHeight = 40.0f; LineHeight = 40.0f;
@ -180,14 +180,14 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
{ {
LineHeight = 50.0f; LineHeight = 50.0f;
TeeSizeMod = 0.9f; TeeSizeMod = 0.9f;
Spacing = 5.0f; Spacing = 8.0f;
} }
float ScoreOffset = x+10.0f, ScoreLength = 60.0f; float ScoreOffset = x+10.0f, ScoreLength = 60.0f;
float TeeOffset = ScoreOffset+ScoreLength, TeeLength = 60*TeeSizeMod; float TeeOffset = ScoreOffset+ScoreLength, TeeLength = 60*TeeSizeMod;
float NameOffset = TeeOffset+TeeLength, NameLength = 300.0f-TeeLength; float NameOffset = TeeOffset+TeeLength, NameLength = 300.0f-TeeLength;
float PingOffset = x+610.0f, PingLength = 65.0f; float PingOffset = x+610.0f, PingLength = 65.0f;
float CountryOffset = PingOffset-(LineHeight-Spacing-TeeSizeMod*5.0f)*96.0f/64.0f, CountryLength = (LineHeight-Spacing-TeeSizeMod*5.0f)*96.0f/64.0f; float CountryOffset = PingOffset-(LineHeight-Spacing-TeeSizeMod*5.0f)*2.0f, CountryLength = (LineHeight-Spacing-TeeSizeMod*5.0f)*2.0f;
float ClanOffset = x+370.0f, ClanLength = 230.0f-CountryLength; float ClanOffset = x+370.0f, ClanLength = 230.0f-CountryLength;
// render headlines // render headlines
@ -269,7 +269,7 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
// country flag // country flag
Graphics()->TextureSet(m_pClient->m_pCountryFlags->Get(m_pClient->m_aClients[pInfo->m_ClientID].m_Country)->m_Texture); Graphics()->TextureSet(m_pClient->m_pCountryFlags->Get(m_pClient->m_aClients[pInfo->m_ClientID].m_Country)->m_Texture);
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f); Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f);
IGraphics::CQuadItem QuadItem(CountryOffset, y+(Spacing+TeeSizeMod*5.0f)/2.0f, CountryLength, LineHeight-Spacing-TeeSizeMod*5.0f); IGraphics::CQuadItem QuadItem(CountryOffset, y+(Spacing+TeeSizeMod*5.0f)/2.0f, CountryLength, LineHeight-Spacing-TeeSizeMod*5.0f);
Graphics()->QuadsDrawTL(&QuadItem, 1); Graphics()->QuadsDrawTL(&QuadItem, 1);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();