Chris Forbes a2b92d0fe4 Merge commit 'matt/dune^' ...

Conflicts:
	.gitignore
	mods/d2k/rules/system.yaml

2012-06-25 09:05:49 +12:00

..

ActorInfo.cs

expose appropriate *Inits, and make them work in editor

2011-11-06 18:17:13 +13:00

MusicInfo.cs

fix trailing whitespace everywhere

2011-09-26 08:40:39 +13:00

Rules.cs

fix trailing whitespace everywhere

2011-09-26 08:40:39 +13:00

Settings.cs

fix #2199; Game Timer (min 10 seconds)

2012-06-10 17:08:49 +12:00

VoiceInfo.cs

replaced RA sounds by Dune 2000 ones

2012-06-23 16:00:20 +02:00

WeaponInfo.cs

New types for cell and pixel coordinate position/vectors.

2012-06-21 15:36:59 -05:00