Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 24 Dec 2016 21:26:47 +0000 (07:26 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Dec 2016 21:26:47 +0000 (07:26 +1000)
commitff5abbe10f6a0542cc40e931d0f61aafa359eff9
tree987ee190c529c067bf3b585daba861114de97dd5
parentbd84ca6fa3aa22e2100db210e7a4d7de8442d71f
parentc5fcf672c473edef7139d4250398184b8ae17224
Merge branch 'master' into Mario/wepent_experimental
qcsrc/common/physics/player.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/client.qc
qcsrc/server/impulse.qc
qcsrc/server/portals.qc