Merge branch 'master' into Mario/qc_physics_prehax
authorMario <zacjardine@y7mail.com>
Fri, 1 May 2015 11:55:49 +0000 (21:55 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 1 May 2015 11:55:49 +0000 (21:55 +1000)
commit117fa45380851579df9e6c465a207d733f6ca748
tree2f5f5a597f2ea16983fda06f294f58530f613b6f
parentb5dca4b47b21014868e29fbbd510c9fa735f7fde
parent51556c68ea3024fc22a9a38e0d0d72e5107e2d60
Merge branch 'master' into Mario/qc_physics_prehax

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/t_plats.qc
qcsrc/server/target_music.qc
27 files changed:
defaultXonotic.cfg
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/util.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/common/weapons/weapons.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_models.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/portals.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/t_items.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/warpzonelib/server.qc