]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/turrets
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 01:28:40 +0000 (12:28 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 01:28:40 +0000 (12:28 +1100)
commit7f6f6ddf5a60125f13cbc906c5e29faf61310d80
treeafdebf18179cbb2e4a625a4f8432b76c39d766d2
parentf7e94b65e02264d68313477ba4377553e12be658
parent4c3cf7efc863be994bad18a855c771c0d1ded098
Merge branch 'master' into Mario/turrets

Conflicts:
qcsrc/common/command/generic.qc
qcsrc/common/notifications.qh
qcsrc/server/g_damage.qc
qcsrc/server/progs.src
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/units/unit_ewheel.qc
qcsrc/server/tturrets/units/unit_flac.qc
qcsrc/server/tturrets/units/unit_machinegun.qc
qcsrc/server/tturrets/units/unit_walker.qc
30 files changed:
qcsrc/client/Main.qc
qcsrc/client/damage.qc
qcsrc/client/progs.src
qcsrc/common/command/generic.qc
qcsrc/common/notifications.qh
qcsrc/common/turrets/cl_turrets.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/turrets.qc
qcsrc/common/turrets/unit/ewheel.qc
qcsrc/common/turrets/unit/flac.qc
qcsrc/common/turrets/unit/fusionreactor.qc
qcsrc/common/turrets/unit/hellion.qc
qcsrc/common/turrets/unit/hk.qc
qcsrc/common/turrets/unit/machinegun.qc
qcsrc/common/turrets/unit/mlrs.qc
qcsrc/common/turrets/unit/phaser.qc
qcsrc/common/turrets/unit/plasma.qc
qcsrc/common/turrets/unit/plasma_dual.qc
qcsrc/common/turrets/unit/tesla.qc
qcsrc/common/turrets/unit/walker.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/progs.src
qcsrc/server/t_teleporters.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/vehicles.qc