]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ft_autorevive_progress
authorterencehill <piuntn@gmail.com>
Fri, 12 Jun 2020 20:12:04 +0000 (22:12 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 12 Jun 2020 20:12:04 +0000 (22:12 +0200)
commit24151b08c3de08e46dace760129f0526a455be4b
tree0e9243b75e4f22bb5c174d0c2b78dd8e200698ac
parentdc7c41d7f6ab09d2dd8a628f2209051e85626153
parent1f79db212536f24f697c934d3e50f1870705e2a7
Merge branch 'master' into terencehill/ft_autorevive_progress
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
qcsrc/server/g_damage.qc
qcsrc/server/player.qc