skull132 16d33365c2 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

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

..

preference_setup

Merge branch 'master' into development

2017-09-09 21:38:02 +03: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

experimental caching performance tweaks (#3364)

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

movement.dm

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

preferences_ambience.dm

…

preferences_factions.dm

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

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

Random spawn changes (#3317)

2017-08-25 19:01:35 +02:00

preferences_toggles.dm

Fix parallax (#2983)

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

preferences.dm

Adds messenger bags (#3289)

2017-08-20 14:02:55 +03:00

ui_style.dm

…