Kelenius 18358936ee Merge branch 'dev' into ofSleepersAndNano ...

Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-5.dmm

2015-08-14 16:50:44 +03:00

..

effects

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-10 17:56:14 +02:00

items

Compilation fixes.

2015-08-14 08:51:06 +02:00

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge branch 'dev' into ofSleepersAndNano

2015-08-14 16:50:44 +03:00

buckling.dm

…

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

…

explosion.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-10 12:57:46 +02:00

items.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

objs.dm

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

structures.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weapons.dm

…