Merge branch 'master' into Mario/use1
authorMario <mario@smbclan.net>
Sun, 27 Mar 2016 11:53:07 +0000 (21:53 +1000)
committerMario <mario@smbclan.net>
Sun, 27 Mar 2016 11:53:07 +0000 (21:53 +1000)
commitf438b415278f56c0cf86e2018b45fb3e6972259c
tree262ae661eeb5ad6faee0e7148bc79053abdfc73e
parentfaabb9816d6a3ec67230da0bd37dd4f59abf47c7
parentb34c9928b7ffaa29800572dc7d5c78e3b6427cc5
Merge branch 'master' into Mario/use1

# Conflicts:
# qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
# qcsrc/common/triggers/target/spawn.qc
# qcsrc/common/triggers/trigger/gamestart.qc
# qcsrc/lib/defer.qh
# qcsrc/server/mutators/mutator/gamemode_assault.qc
22 files changed:
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh
qcsrc/common/triggers/func/door.qc
qcsrc/common/triggers/func/door_rotating.qc
qcsrc/common/triggers/func/plat.qc
qcsrc/common/triggers/func/train.qc
qcsrc/common/triggers/misc/laser.qc
qcsrc/common/triggers/target/spawn.qc
qcsrc/common/triggers/teleporters.qh
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/jumppads.qh
qcsrc/common/turrets/turret/walker.qc
qcsrc/lib/self.qh
qcsrc/server/cheats.qc
qcsrc/server/g_lights.qc
qcsrc/server/g_models.qc
qcsrc/server/g_subs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_domination.qc
qcsrc/server/race.qc