skull132 d536d9f4aa Merge branch 'fake-master' into development ...

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

2017-12-09 00:08:21 +02:00

..

preference_setup

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02:00

asset_cache.dm

experimental caching performance tweaks (#3364)

2017-09-02 21:35:03 +03:00

client defines.dm

Minor parallax performance tweaks (#2967)

2017-07-09 00:25:12 +03:00

client procs.dm

MC Performance Tweaks (#3621)

2017-10-14 19:31:14 +03:00

movement.dm

…

preferences_ambience.dm

…

preferences_factions.dm

…

preferences_notification.dm

SOFTREF macro (#2574)

2017-06-02 20:22:38 +03:00

preferences_savefile.dm

Preferences fixes, ahoy! (#3045)

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

preferences_spawnpoints.dm

Runtime Map Loading (#3597)

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

preferences_toggles.dm

Fix parallax (#2983)

2017-07-09 19:35:02 +03:00

preferences.dm

Space Dust Parallax defaults on. (#3581)

2017-10-13 17:41:19 +03:00

ui_style.dm

…