]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 10 May 2013 06:50:55 +0000 (16:50 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 10 May 2013 06:50:55 +0000 (16:50 +1000)
commit306b95b7d03edfdada049ad3118809137bfe731d
tree8b5f1e79323928a1dc63f8acff3f6f79be9df75c
parentd04af9953eae59faecae3aca2cc1182dd1adec1f
parente63ba76493751c027455b946d0b94b3a5beace47
Merge branch 'master' into Mario/monsters
32 files changed:
defaultXonotic.cfg
qcsrc/client/scoreboard.qc
qcsrc/common/deathtypes.qh
qcsrc/common/notifications.qh
qcsrc/server/accuracy.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/monsters/lib/monsters.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/system/system_damage.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_scoreprocs.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_electro.qc