Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	Models/Characters/Assault/FirstPersonAssaultBlue.anim
#	Models/Characters/Assault/FirstPersonAssaultRed.anim

...

This commit is contained in:

sippeangelo

2016-03-07 17:56:53 +01:00

parent 6451a3f5a5 3a7f782958

commit 0f9208a305

58 changed files with 0 additions and 0 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

Models/Characters/Assault/FirstPersonAssaultBlue.anim

BIN

Binary file not shown.

Models/Characters/Assault/FirstPersonAssaultRed.anim

BIN

Binary file not shown.

Models/Props/Stones/ShinyStoneCrystalBlue.mesh

BIN

Binary file not shown.

Models/Props/Stones/ShinyStoneCrystalRed.mesh

BIN

Binary file not shown.

Models/Props/Walls/SpecialWall1.colli

BIN

Binary file not shown.

Models/Widgets/Arrows/ArrowBlue.mesh

BIN

Binary file not shown.

Models/Widgets/Arrows/ArrowBlue.mtrl

BIN

Binary file not shown.

Models/Widgets/Arrows/ArrowGreen.mesh

BIN

Binary file not shown.

Models/Widgets/Arrows/ArrowGreen.mtrl

BIN

Binary file not shown.

Models/Widgets/Arrows/ArrowRed.mesh

BIN

Binary file not shown.

Models/Widgets/Arrows/ArrowRed.mtrl

BIN

Binary file not shown.

Textures/Characters/Assault/Assault_Armor_Specular_Blue.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 855 KiB After Width:  |  Height:  |  Size: 1.0 MiB

Textures/Characters/Assault/Assault_Armor_Specular_Red.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 832 KiB After Width:  |  Height:  |  Size: 1.0 MiB

Textures/Characters/Assault/Body_Specular_Blue.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 753 KiB After Width:  |  Height:  |  Size: 850 KiB

Textures/Characters/Assault/Body_Specular_Red.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 753 KiB After Width:  |  Height:  |  Size: 850 KiB

Textures/Characters/Defender/Defender_Armor_Specular_Blue.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 812 KiB After Width:  |  Height:  |  Size: 880 KiB

Textures/Characters/Defender/Defender_Armor_Specular_Red.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 786 KiB After Width:  |  Height:  |  Size: 870 KiB

Textures/Characters/Sniper/Sniper_Armor_Specular_Blue.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 838 KiB After Width:  |  Height:  |  Size: 912 KiB

Textures/Characters/Sniper/Sniper_Armor_Specular_Red.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 823 KiB After Width:  |  Height:  |  Size: 906 KiB

Textures/HUD/HealthHUD3.png

BIN

Binary file not shown.

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

Textures/HUD/HealthHudTriBoost.png

BIN

Binary file not shown.

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

Textures/HUD/HealthHudTriMain.png

BIN

Binary file not shown.

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

Textures/HUD/HealthHudTriShift.png

BIN

Binary file not shown.

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

Textures/Icons/Crosshair-01-01.png

BIN

Binary file not shown.

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

Textures/Icons/Dash-01-01.png

BIN

Binary file not shown.

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

Textures/Icons/SheildDots-01-01.png

BIN

Binary file not shown.

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

Textures/Icons/SheildGradient-01-01.png

BIN

Binary file not shown.

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

Textures/Icons/SheildPlain-01-01.png

BIN

Binary file not shown.

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

Textures/Icons/ShieldBall-01-01.png

BIN

Binary file not shown.

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

Textures/Icons/Superman-01.png

BIN

Binary file not shown.

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

Textures/Props/Flora/Bush2Diff.png

BIN

Binary file not shown.

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

Textures/Props/Flora/Bush2Norm.png

BIN

Binary file not shown.

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

Textures/Props/Flora/Bush2Spec.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush1Diff.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush1Norm.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 MiB

Textures/Props/Flora/HangingBush1Spec.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush2Diff.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush2Norm.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush2Spec.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush3Diff.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush3Norm.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush3Spec.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush4Diff.png

BIN

Binary file not shown.

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

Textures/Props/Flora/HangingBush4Norm.png

BIN

Binary file not shown.

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

Textures/Props/PickUps/AmmoPickUpSpec.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 46 KiB After Width:  |  Height:  |  Size: 46 KiB

Textures/Props/PickUps/HealthPickUpSpec.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 45 KiB After Width:  |  Height:  |  Size: 45 KiB

Textures/Props/PickUps/PickUpHolderSpec.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 24 KiB

Textures/Props/Stones/ShinyCrystalStoneBlueDiff.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 757 KiB After Width:  |  Height:  |  Size: 173 KiB

Textures/Props/Stones/ShinyCrystalStoneBlueIncd.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 70 KiB After Width:  |  Height:  |  Size: 41 KiB

Textures/Props/Stones/ShinyCrystalStoneRedDiff.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 732 KiB After Width:  |  Height:  |  Size: 163 KiB

Textures/Props/Stones/ShinyCrystalStoneRedIncd.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 66 KiB After Width:  |  Height:  |  Size: 36 KiB

Textures/Props/Stones/ShinyCrystalStoneSpec.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 94 KiB After Width:  |  Height:  |  Size: 40 KiB

Textures/Weapons/DefenderGunSpec.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 576 KiB After Width:  |  Height:  |  Size: 606 KiB

Textures/Weapons/Secondary_Weapon_Specular_Blue.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 280 KiB After Width:  |  Height:  |  Size: 266 KiB

Textures/Weapons/Secondary_Weapon_Specular_Red.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 278 KiB After Width:  |  Height:  |  Size: 263 KiB

Textures/Widgets/Arrows/Arrow3Blue.png

BIN

Binary file not shown.

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

Textures/Widgets/Arrows/Arrow3Green.png

BIN

Binary file not shown.

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

Textures/Widgets/Arrows/Arrow3Red.png

BIN

Binary file not shown.

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