]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 65cc53d 4f14e18)
Merge branch 'master' into Mario/buffs
authorMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:33:23 +0000 (17:33 +1100)
commit20256058c4de97b81ee5aaedaa383a99010752f0
tree28fa160773c62f22f337cc0a21fe549270e2fd35tree | snapshot
parent65cc53d883dd9b2d61456400a30aae7548f5d5eacommit | diff
parent4f14e187eed72fc81aa829300f95a6d689cbced6commit | diff
Merge branch 'master' into Mario/buffs
20 files changed:
_hud_descriptions.cfg diff1 | diff2 | blob | history
hud_luminos.cfg diff1 | diff2 | blob | history
hud_luminos_minimal.cfg diff1 | diff2 | blob | history
hud_luminos_minimal_xhair.cfg diff1 | diff2 | blob | history
hud_luminos_old.cfg diff1 | diff2 | blob | history
hud_nexuiz.cfg diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh diff1 | diff2 | blob | history
qcsrc/client/hud.qc diff1 | diff2 | blob | history
qcsrc/client/hud.qh diff1 | diff2 | blob | history
qcsrc/common/constants.qh diff1 | diff2 | blob | history
qcsrc/common/notifications.qh diff1 | diff2 | blob | history
qcsrc/menu/classes.c diff1 | diff2 | blob | history
qcsrc/menu/xonotic/mainwindow.c diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc diff1 | diff2 | blob | history
qcsrc/server/cl_physics.qc diff1 | diff2 | blob | history
qcsrc/server/cl_weaponsystem.qc diff1 | diff2 | blob | history
qcsrc/server/g_world.qc diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc diff1 | diff2 | blob | history
qcsrc/server/mutators/base.qh diff1 | diff2 | blob | history