]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into samual/weapons
authorRudolf Polzer <divverent@xonotic.org>
Thu, 25 Sep 2014 16:22:31 +0000 (18:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 25 Sep 2014 16:22:31 +0000 (18:22 +0200)
commitd6e1aa437e7eb8e182053cf17231597e79df0f81
tree211cf21455394c794f44c1e957d0332734e8e6bf
parentdccfc3eef40ca210167d43bb30fae6bb116e12f0
parent3f1297c955ff567121bee040ee94f5b4022d046f
Merge branch 'master' into samual/weapons

Conflicts:
balanceXonotic.cfg
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/t_items.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/weapons/weaponsystem.qc
35 files changed:
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/miscfunctions.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/common/weapons/w_minelayer.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.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/gamemode_nexball.qc
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh
qcsrc/server/t_teleporters.qc
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/tracing.qc