RKF45 9b2ff51486 Merge remote-tracking branch 'upstream/dev'

2014-01-04 19:41:19 +01:00

..

__HELPERS

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-01-04 11:35:07 +10:30

_onclick

AI / Cyborgs will now leave hiddenprints.

2014-01-03 00:28:54 -06:00

ATMOSPHERICS

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

controllers

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-01-04 11:35:07 +10:30

datums

Fixes/tweaks for NanoUI. These were made by TG coders, so I'm just adding them here.

2014-01-03 23:58:44 +00:00

defines

Optimizations of PDA NanoUI

2013-12-28 19:38:14 -06:00

FEA

…

game

Merge pull request #4198 from Zuhayr/dev

2014-01-03 19:33:54 -08:00

js

…

modules

Merge remote-tracking branch 'upstream/dev'

2014-01-04 19:41:19 +01:00

TriDimension

…

unused

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

WorkInProgress

Openable soda cans and beer bottles!

2013-12-31 17:52:12 -08:00

ZAS

Update Fire.dm

2014-01-01 23:19:27 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

stylesheet.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

world.dm

Fixes runtime logging and makes it a config option.

2014-01-02 21:38:15 +00:00