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

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

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

..

bits

replaced RA sounds by Dune 2000 ones

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

chrome

fix settings for d2k and cnc

2012-06-18 17:07:56 +02:00

maps

added special infantry, fixed UI, added new map

2012-06-16 14:17:35 +02:00

rules

Merge commit 'matt/dune^'

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

tilesets

fix passable edges in Cliff terrain tiles

2012-06-16 21:19:46 +02:00

uibits

added special infantry, fixed UI, added new map

2012-06-16 14:17:35 +02:00

chrome.yaml

added Ordos

2012-05-27 15:17:03 +02:00

cursors.yaml

new settings Transparent for cursors.yaml

2012-06-19 07:43:06 +02:00

metrics.yaml

make Dune 2000 an independent mod

2012-05-26 18:13:51 +02:00

mod.yaml

fix settings for d2k and cnc

2012-06-18 17:07:56 +02:00

music.yaml

inherit units that differ only slightly for each faction

2012-05-26 20:20:01 +02:00

sequences.yaml

make orni flap slower

2012-06-24 11:21:50 +02:00

TODO

replaced RA sounds by Dune 2000 ones

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

voices.yaml

replaced RA sounds by Dune 2000 ones

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

weapons.yaml

replaced RA sounds by Dune 2000 ones

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