Merge branch 'master' of git://github.com/chrisforbes/OpenRA

Conflicts:
	sequences.xml
This commit is contained in:
Paul Chote
2010-01-08 20:52:18 +13:00
17 changed files with 272 additions and 189 deletions

View File

@@ -1031,7 +1031,10 @@
<sequence name="left-normal" start="0" length="1" />
<sequence name="left-pressed" start="1" length="1" />
</unit>
<unit name="sputnik">
<sequence name="idle" start="0" length="4" />
<unit name="sputnik"> <sequence name="idle" start="0" length="4" /> </unit> <unit name="dd-crnr"> <sequence name="idle" start="0" length="4" />
<sequence name="top-left" start="0" length="1" />
<sequence name="top-right" start="1" length="1" />
<sequence name="bottom-left" start="2" length="1" />
<sequence name="bottom-right" start="3" length="1" />
</unit>
</sequences>