Ccomp5950 da3ad0a6db Merge pull request #7099 from Amunak/endgame-info ...

Added round end summary (attempt 2)

2014-11-22 03:28:38 -05:00

..

__HELPERS

…

_onclick

Resolves conflicts, cherrypicks my code.

2014-11-21 03:32:00 -05:00

ATMOSPHERICS

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

2014-11-19 14:40:18 +01:00

controllers

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

2014-11-19 14:40:18 +01:00

datums

Merge pull request #7088 from mwerezak/skrell

2014-11-22 03:23:41 -05:00

defines

AI can now track people with max level sensors.

2014-11-21 08:33:20 +01:00

FEA

…

game

Merge pull request #7099 from Amunak/endgame-info

2014-11-22 03:28:38 -05:00

js

…

modules

Merge pull request #7094 from Neerti/borg_hud_port_2

2014-11-22 03:27:10 -05:00

TriDimension

…

unused

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

WorkInProgress

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

2014-11-21 15:28:54 +01:00

ZAS

…

global.dm

AI can now track people with max level sensors.

2014-11-21 08:33:20 +01:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #7088 from mwerezak/skrell

2014-11-22 03:23:41 -05:00

stylesheet.dm

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

world.dm

…