Cael_Aislinn 283ae84dad various mergefixes ...

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-09-22 21:37:42 +10:00

..

ATMOSPHERICS

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

controllers

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

datums

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

defines

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

FEA

-Small improvements to atmos. Most notable is combining two loops into one during initialization and commenting out a loop with no nested code.

2012-09-20 14:24:50 +00:00

game

various mergefixes

2012-09-22 21:37:42 +10:00

js

…

modules

various mergefixes

2012-09-22 21:37:42 +10:00

TriDimension

…

unused

various mergefixes

2012-09-22 21:37:42 +10:00

WorkInProgress

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

ZAS

various mergefixes

2012-09-22 21:37:42 +10:00

global.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

hub.dm

Moved the hub stuff into its own file so server hosts wont have to re-update their hub stuff every time there's a change to world.dm.

2012-09-09 18:32:11 +00:00

names.dm

…

setup_3d.dm

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

setup.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

stylesheet.dm

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

world.dm

Replaces the voting system. It should fix a pretty serious server-crashing exploit and simplify the code a fair bit.

2012-09-12 00:44:13 +00:00

ZAS_defines.dm

missing files

2012-08-22 20:58:12 +10:00