Kelenius c3312be968 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	maps/exodus-1.dmm

2015-03-30 10:35:37 +03:00

..

__HELPERS

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

_defines

Chemistry commit

2015-03-25 19:09:10 +03:00

_onclick

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

ATMOSPHERICS

#define CONNECT_TYPE_HE 8

2015-03-26 16:31:13 +02:00

controllers

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

datums

Merge branch 'dev' into ofChemistryAndStuff

2015-03-30 10:35:37 +03:00

defines

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

2015-03-29 16:23:06 +02:00

FEA

…

game

Merge branch 'dev' into ofChemistryAndStuff

2015-03-30 10:35:37 +03:00

js

…

modules

Merge branch 'dev' into ofChemistryAndStuff

2015-03-30 10:35:37 +03:00

TriDimension

…

ZAS

Fixes #8450

2015-03-25 02:17:02 +00:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

stylesheet.dm

…

world.dm

Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation.

2015-03-21 11:13:53 +10:30