Zuhayr b4ea25d064 Merge conflict resolution.

2014-11-10 13:00:06 +10:30

..

client defines.dm

Merge pull request #4912 from Ccomp5950/mentors

2014-05-07 10:00:27 +09:30

client procs.dm

Merge pull request #6956 from mwerezak/logo

2014-11-07 03:50:08 +03:00

preferences_factions.dm

A bit of prep work for integegrating player-set backgrounds into gameplay.

2014-08-01 22:54:57 +09:30

preferences_gear.dm

More custom loadout jackets + bandana

2014-11-02 22:51:33 -05:00

preferences_savefile.dm

Merge pull request #6750 from Baystation12/dev-freeze

2014-10-16 20:07:35 +04:00

preferences_spawnpoints.dm

Somehow when I added spawnpoints I put them in the wrong place. Moved the file.

2014-07-01 01:04:19 +09:30

preferences_toggles.dm

Fix intent switching using Change-UI

2014-10-18 16:29:05 +01:00

preferences.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30