Neerti d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge ...

Conflicts:
	.travis.yml
	polaris.dme

2015-08-07 20:25:57 -04:00

..

__defines

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

_helpers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

_onclick

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

2015-07-20 08:28:32 +02:00

ATMOSPHERICS

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

controllers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge

2015-08-07 20:25:57 -04:00

datums

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

defines

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

2015-07-06 18:33:09 +02:00

FEA

Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS

2015-05-29 20:36:48 +01:00

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge

2015-08-07 20:25:57 -04:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge

2015-08-07 20:25:57 -04:00

TriDimension

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

2015-06-26 20:28:47 +02:00

ZAS

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

2015-07-31 10:00:16 +02:00

global.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

2015-07-30 10:49:37 +02:00