]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Melanosuchus/minigames' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Sat, 25 Apr 2015 15:46:19 +0000 (01:46 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 25 Apr 2015 15:46:19 +0000 (01:46 +1000)
commit4f3d027affaac1c01bd22de9b56ea037d826e972
tree71c96286b7235f48a2fb2b0174cf5e460f582162
parent7f7be60edf1664e2489672cd7e64baa6df77d3dd
parenteff92d4aee25ebe31fe768af2b86c8bea80d1a51
Merge branch 'Melanosuchus/minigames' into Mario/combined_updates

Conflicts:
_hud_descriptions.cfg
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/constants.qh
qcsrc/common/minigames/cl_minigames.qc
qcsrc/common/minigames/cl_minigames.qh
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/minigames/minigame/all.qh
qcsrc/common/minigames/minigame/nmm.qc
qcsrc/common/minigames/minigame/ttt.qc
qcsrc/common/minigames/minigames.qc
qcsrc/common/minigames/minigames.qh
qcsrc/common/minigames/sv_minigames.qc
qcsrc/common/minigames/sv_minigames.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/progs.src
18 files changed:
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/main.qc
qcsrc/common/minigames/cl_minigames.qc
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/minigames/minigame/all.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc