Zuhayr 361ecb4e2b Merge resolution.

2013-07-30 17:33:18 -07:00

..

__HELPERS

Fixed a potential runtime and removed buggy mobs from gold slime's spawn list as per raven's request.

2013-07-09 13:40:04 +04:00

ATMOSPHERICS

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

controllers

Several ZAS fixes.

2013-07-25 21:34:12 -07:00

datums

Added employment records.

2013-07-24 22:23:50 -04:00

defines

Revert #3316 from BEF due to compile errors and (assumed) missing files.

2013-07-20 18:38:00 +01:00

FEA

…

game

Merge resolution.

2013-07-30 17:33:18 -07:00

js

…

modules

Merge resolution.

2013-07-30 17:33:18 -07:00

TriDimension

…

unused

…

WorkInProgress

Merge pull request #3372 from Segrain/dev

2013-07-27 15:42:04 -07:00

ZAS

Merge pull request #3384 from SkyMarshal/airfixes

2013-07-28 19:13:13 -07:00

global.dm

Adds a vox heist game mode. Fairly complex.

2013-07-28 05:18:04 -07:00

hub.dm

…

names.dm

…

setup.dm

Conflict fix?

2013-07-29 08:15:54 +03:00

stylesheet.dm

Revert "Adds in the Kida"

2013-07-12 12:22:35 +01:00

world.dm

Add error reporting on failed DB connection.

2013-07-22 09:19:19 +04:00