]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'divVerent/ballistic2' into samual/weapons
authorRudolf Polzer <divverent@xonotic.org>
Thu, 12 Dec 2013 12:16:14 +0000 (13:16 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 12 Dec 2013 12:38:58 +0000 (13:38 +0100)
commitfbb52b893f7be6bf4073f1853761c4f2fc11a343
treee3a074b8cf16e0095c4c9574b33821f7b6dbccd1
parent05ad860cc8b2bdafcc2f8f16d9dcde7bf1b7ee59
parentd91906e1bb6225cd68269812a6d2b4314e23fcdb
Merge branch 'divVerent/ballistic2' into samual/weapons

Conflicts:
bal-wep-xonotic.cfg
qcsrc/common/weapons/w_machinegun.qc
qcsrc/common/weapons/w_rifle.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/server/autocvars.qh
qcsrc/server/tturrets/units/unit_machinegun.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/weapons/tracing.qc
19 files changed:
bal-wep-xonotic.cfg
defaultXonotic.cfg
oldbalance25.cfg
oldbalanceFruitieX.cfg
oldbalanceXDF.cfg
oldbalanceXPM.cfg
qcsrc/client/Main.qc
qcsrc/client/particles.qc
qcsrc/common/constants.qh
qcsrc/common/weapons/w_machinegun.qc
qcsrc/common/weapons/w_rifle.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/tracing.qh