]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 16 Aug 2013 00:27:19 +0000 (10:27 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 16 Aug 2013 00:27:19 +0000 (10:27 +1000)
commitd820bc6acfe936141e2fc15d0d3bbcf98ad278ab
treea0b754a2ad53f8ae7c15c83e5466cbdd2a483bbc
parent7e9cc04323b1746e321956b7fe117cdb914fb0fc
parent53fa7721a5a8cbcc20438c90c146c5f7cbf87ff5
Merge branch 'master' into Mario/monsters
28 files changed:
defaultXonotic.cfg
effectinfo.txt
gamemodes.cfg
monsters.cfg
qcsrc/client/View.qc
qcsrc/client/projectile.qc
qcsrc/common/constants.qh
qcsrc/common/deathtypes.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc
scripts/shaderlist.txt