skull132 c0f22a1cdd Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm

2017-10-29 16:15:53 +02:00

..

antagonism

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

general

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

global

parallax_togs and AO fix (#3693)

2017-10-17 22:02:27 +03:00

loadout

Fixes some runtimes (#3727)

2017-10-22 02:37:44 +03:00

occupation

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

other

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

skills

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

preference_setup.dm

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

preferences_sql.dm

Preferences fixes, ahoy! (#3045)

2017-07-21 20:50:59 +03:00