Aronai Sieyes 979eac5a48 Merge pull request #3004 from Screemonster/ivegotmyionyou ...

Ion gun / EMP bugfix and refactor

2018-02-11 14:48:51 -06:00

..

__defines

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

_compatibility/509

…

_helpers

Merge pull request #2934 from Verkister/yummytrash

2018-02-04 16:56:47 -05:00

_onclick

Make Darksight Great Again (#4626)

2018-01-25 18:01:33 -06:00

ATMOSPHERICS

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

controllers

Merge branch 'master' into polaris-sync-2018-02-07

2018-02-07 23:06:03 -05:00

datums

Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate

2018-02-10 23:06:35 -06:00

defines

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

game

Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate

2018-02-10 23:06:35 -06:00

js

…

modules

Merge pull request #3004 from Screemonster/ivegotmyionyou

2018-02-11 14:48:51 -06:00

unit_tests

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00

ZAS

Convert ZAS "Airflow" into a subsystem plus fixes

2018-01-30 12:28:45 -05:00

_away_mission_tests.dm

Make Travis run a build matrix, add new test

2018-01-27 15:17:26 -05:00

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00