Merge remote-tracking branch 'matt/bleed'

This commit is contained in:
Chris Forbes
2012-06-24 21:34:37 +12:00
24 changed files with 69 additions and 1329 deletions

View File

@@ -185,6 +185,7 @@ Player:
SquadSize: 7
PlayerColorPalette:
BasePalette: terrain
RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
DebugResourceCash:
DebugResourceOre:
DebugResourceOreCapacity: