Merge branch 'master' into DefaultUser/trigger_cleanup 542/head
authorMario <mario@smbclan.net>
Wed, 25 Apr 2018 12:26:45 +0000 (22:26 +1000)
committerMario <mario@smbclan.net>
Wed, 25 Apr 2018 12:26:45 +0000 (22:26 +1000)
commit0b6694545ba935bbac13c20fc11842ba1850d972
tree8d49382d3d781e6c1573f4c5b8ea5d8f6a4924cf
parentbb14962efdb3a430a2d83a6365ec8b4e00824e18
parent64abbe49fae92a9447d440eab3f705d6dbf9194e
Merge branch 'master' into DefaultUser/trigger_cleanup

# Conflicts:
# qcsrc/common/triggers/func/pointparticles.qc
# qcsrc/common/triggers/misc/laser.qc
# qcsrc/common/triggers/target/music.qc
qcsrc/common/sounds/sound.qh
qcsrc/common/triggers/func/door.qc
qcsrc/common/triggers/func/pointparticles.qc
qcsrc/common/triggers/misc/laser.qc
qcsrc/common/triggers/misc/teleport_dest.qc
qcsrc/common/triggers/target/music.qc
qcsrc/common/triggers/target/music.qh
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/triggers.qc
qcsrc/lib/net.qh
qcsrc/lib/spawnfunc.qh