Jace 0f9208a305 Merge remote-tracking branch 'origin/master' ...

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

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

..

Characters

Merge remote-tracking branch 'origin/master'

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

Core

Fix Error.mesh

2016-02-08 17:14:52 +01:00

Effects

New CylinderShot

2016-02-11 19:05:05 +01:00

Highgrounds

Added Textures to the highgounds. Need some tweaking, but probably better than candyland.

2016-03-04 04:18:27 +01:00

LevelBase

New exports

2016-02-08 15:50:52 +01:00

Props

Assault animations

2016-03-07 17:51:16 +01:00

Test

DamageIndicator png

2016-02-11 21:05:24 +01:00

Weapons

Merge remote-tracking branch 'origin/master'

2016-03-04 08:56:43 +01:00

Widgets

Colored arrows in blue, red and green

2016-03-07 17:13:28 +01:00