Techhead0 f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox ...

Conflicts:
	maps/exodus-1.dmm

2015-05-13 03:10:36 -04:00

..

__HELPERS

Fixes #9210.

2015-05-12 08:11:48 +02:00

_onclick

Final adjustments to icons, adds delay to pinning

2015-05-12 17:21:37 +02:00

ATMOSPHERICS

Merge pull request #9073 from PsiOmegaDelta/QDels

2015-05-12 18:26:57 +03:00

controllers

Merge pull request #9073 from PsiOmegaDelta/QDels

2015-05-12 18:26:57 +03:00

datums

Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart.

2015-05-12 06:42:08 +03:00

defines

Merge pull request #9073 from PsiOmegaDelta/QDels

2015-05-12 18:26:57 +03:00

FEA

Adds Destroys.

2015-04-24 17:11:14 +02:00

game

Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox

2015-05-13 03:10:36 -04:00

js

…

modules

Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox

2015-05-13 03:10:36 -04:00

TriDimension

Grilles and rods.

2015-05-02 21:35:02 +02:00

ZAS

dynamic fire colours

2015-05-10 20:54:29 +01:00

global.dm

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

2015-04-14 15:54:22 +02:00

hub.dm

…

names.dm

…

setup.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

stylesheet.dm

…

world.dm

Merge resolution.

2015-05-11 11:47:24 +09:30