PsiOmegaDelta 299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm

2015-10-16 13:02:59 +02:00

..

client defines.dm

…

client procs.dm

Merge with master.

2015-08-18 11:31:10 -07:00

preferences_factions.dm

…

preferences_gear.dm

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

2015-10-16 13:02:59 +02:00

preferences_savefile.dm

Players can now select their own language shortcut keys.

2015-08-26 15:15:54 +02:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00

preferences.dm

Adds language prefix reset option.

2015-09-18 21:42:02 +02:00

ui_style.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00