xxalpha 3316070ac0 Merge remote-tracking branch 'upstream/master' into putin

2016-02-05 01:27:26 +00:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #15081 from Menshin/astar_passflags

2016-01-31 14:11:02 -03:00

__HELPERS

Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj

2016-01-30 19:45:45 +00:00

__PATH_COMPATIBILITY

…

_globalvars

Fixes shuttles loading improperly in templates

2016-01-29 20:51:12 +01:00

_onclick

Merge pull request #14989 from ChangelingRain/holoclarity

2016-01-29 20:20:25 +03:00

controllers

Makes the roundstart intercept report a config option.

2016-01-31 18:24:34 -08:00

datums

Merge pull request #15133 from Firecage/Moremodulemoves

2016-02-03 22:09:12 -03:00

game

Merge pull request #15174 from kingofkosmos/healthanalyzerhealthfix

2016-02-05 02:07:57 +01:00

js

…

modules

Merge remote-tracking branch 'upstream/master' into putin

2016-02-05 01:27:26 +00:00

orphaned procs

Added passflag checking for A*.

2016-01-30 13:51:52 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

Adds a 1 second delay to initializing the MC.

2016-01-27 19:35:11 -08:00