Merge

Browse Source

...

This commit is contained in:

RaidMax

2019-07-13 20:50:10 -05:00

parent 15eb509ba3 5060b16b4c

commit d4598d6687

127 changed files with 456 additions and 61 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_40mmgrenade.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 594 B

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_aa12.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_ak47.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_akd74u.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_at4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_at4.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_barrett50cal.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_benelli_m4.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_beretta393.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_cheytac.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_colt45.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_colt_anaconda.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_death.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_desert_eagle_gold.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_dragunovsvd.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_famas.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_famas.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_fn2000.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_fnfal.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_g36c_mp.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_glock.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_glock.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_icon_ak47_classic.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_javelin.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_kriss.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m14ebr.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m16a4.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m240.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m240.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m249saw.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m40a3.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m4carbine.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m79.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m79.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_m9beretta.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_masada.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_masada.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mg4.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mini_uzi.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_model1887.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mp5k.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_mp9.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_neutral.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 952 B

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_p90.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_p90.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_peacekeeper.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_pp2000.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_remington_700.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_riot_shield.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_rpd.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_rpg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_sa80_lmg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_sawed_off.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_scar_h.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_skorpian.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_spas12.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_steyr.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_stinger.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_striker.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_striker.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

WebfrontCore/wwwroot/images/hud_weapons/hud_tavor.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.0 KiB

Some files were not shown because too many files have changed in this diff Show More