Merge commit 'alzeih/master'; commit 'pchote/master'

This commit is contained in:
Chris Forbes
2010-01-08 10:13:23 +13:00
18 changed files with 372 additions and 111 deletions

View File

@@ -201,8 +201,10 @@
</unit>
<!-- iron curtain -->
<unit name="iron">
<sequence name="idle" start="0" length="11" />
<sequence name="damaged-idle" start="11" length="11" />
<sequence name="idle" start="0" length="1" />
<sequence name="active" start="0" length="11" />
<sequence name="damaged-idle" start="11" length="1" />
<sequence name="damaged-active" start="11" length="11" />
<sequence name="make" start="0" length="*" src="ironmake" />
</unit>
<!-- chronosphere -->