Peter Wall e599f125f4 Merge remote-tracking branch 'upstream/dev' into dev

2013-07-26 04:20:46 +02: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

Cleaned up vote oocmute a tad

2013-07-21 19:26:05 -04: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 remote-tracking branch 'upstream/dev' into dev

2013-07-26 04:20:46 +02:00

js

…

modules

Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.

2013-07-25 18:30:24 +01:00

TriDimension

…

unused

…

WorkInProgress

Fixed a few small issues with admin-ERT

2013-07-25 00:03:54 -04:00

ZAS

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

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

global.dm

Space Ninja Gamemode Implementation

2013-06-22 00:19:32 -07:00

hub.dm

…

names.dm

…

setup.dm

Merge branch 'master' into bleeding-edge-freeze

2013-07-19 14:48:40 +01: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