Merge branch 'master' into Mario/weapons
authorMario <mario.mario@y7mail.com>
Sun, 15 Jun 2014 05:04:40 +0000 (15:04 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 15 Jun 2014 05:04:40 +0000 (15:04 +1000)
commit3adaa0873ad9eac20f32e6e3fc0455d4f9e044cd
treeeed783d81f7a0f5ca728fda5e20ba445785733c9
parent34863a007ec889fda4c131fe4ed5e959c4832763
parentca135a84df8858611eba56e8c3eef1e7b21959aa
Merge branch 'master' into Mario/weapons
34 files changed:
bal-wep-xonotic.cfg
balance-xonotic.cfg
defaultXonotic.cfg
oldbalance25.cfg
oldbalanceFruitieX.cfg
oldbalanceXDF.cfg
oldbalanceXPM.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hook.qc
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/t_teleporters.qc
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/tracing.qc