PsiOmegaDelta 079ea9ad9a Merge remote-tracking branch 'upstream/dev' into 151205-MoreCharacterSetupOptions ...

Conflicts:
	code/modules/client/preferences.dm

2015-12-06 12:15:04 +01:00

..

preference_setup

Transfers language shortcut keys from per character setting to a global one.

2015-12-05 13:01:51 +01:00

client defines.dm

Cleaner mouse death.

2015-11-08 13:03:02 +01:00

client procs.dm

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

2015-11-19 09:06:32 +01:00

movement.dm

add verbs to allow players to spin their view

2015-12-05 10:42:00 +00:00

preferences_factions.dm

Fix Dionea home system

2015-11-22 20:34:29 -06:00

preferences_gear.dm

Added boot knives and putting a knife in your boot.

2015-12-01 02:05:29 +10:30

preferences_savefile.dm

Changes the character setup update flow.

2015-12-05 12:03:34 +01:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

…

preferences.dm

Merge remote-tracking branch 'upstream/dev' into 151205-MoreCharacterSetupOptions

2015-12-06 12:15:04 +01:00

ui_style.dm

…