Zulker Nayeen Nahiyan 490027405a Merge remote-tracking branch 'origin/dev' into dev ...

Conflicts:
	code/modules/virus2/helpers.dm

2015-01-19 02:15:38 +06:00

..

__HELPERS

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

_onclick

Fixes runtime error: pick() from empty list

2015-01-13 13:37:07 -08:00

ATMOSPHERICS

Cleanup global.dm and setup.dm, fix typos in the other files

2015-01-10 02:01:55 +06:00

controllers

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

datums

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

defines

Reverted health status hud icon from AI overlay

2015-01-15 21:18:58 +13:00

FEA

…

game

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

js

…

modules

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

TriDimension

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

unused

…

WorkInProgress

Merge remote-tracking branch 'origin/dev' into dev

2015-01-19 02:15:38 +06:00

ZAS

ZAS Emergency fix

2015-01-04 02:16:07 +01:00

global.dm

Cleanup global.dm and setup.dm, fix typos in the other files

2015-01-10 02:01:55 +06:00

hub.dm

…

names.dm

…

setup.dm

Fix compile errors, rename mathematical constants to M_PI etc.

2015-01-10 03:47:11 +06:00

stylesheet.dm

Admin name colour msay colour fix

2015-01-05 18:40:52 +01:00

world.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30