]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge changes from local copies
authorMario <mario.mario@y7mail.com>
Tue, 6 Aug 2013 14:04:07 +0000 (00:04 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 6 Aug 2013 14:04:07 +0000 (00:04 +1000)
commit8683f95feaa114556a160e928820d203fa44fecf
tree8a67f35dce0aa159aa4ae0c4f36a88de46e81d7a
parent6361453ce9dd1b4978e8fa36412ea4e0128cbdee
Merge changes from local copies
28 files changed:
effectinfo.txt
gamemodes.cfg
gfx/hud/default/flag_pink_carrying.tga [new file with mode: 0644]
gfx/hud/default/flag_pink_lost.tga [new file with mode: 0644]
gfx/hud/default/flag_pink_shielded.tga [new file with mode: 0644]
gfx/hud/default/flag_pink_taken.tga [new file with mode: 0644]
gfx/hud/default/flag_yellow_carrying.tga [new file with mode: 0644]
gfx/hud/default/flag_yellow_lost.tga [new file with mode: 0644]
gfx/hud/default/flag_yellow_shielded.tga [new file with mode: 0644]
gfx/hud/default/flag_yellow_taken.tga [new file with mode: 0644]
models/ctf/glow_pink.tga [new file with mode: 0644]
models/ctf/glow_pink_glow.tga [new file with mode: 0644]
models/ctf/glow_yellow.tga [new file with mode: 0644]
models/ctf/glow_yellow_glow.tga [new file with mode: 0644]
qcsrc/client/hud.qc
qcsrc/common/items.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/teamplay.qc
sound/ctf/pink_capture.ogg [new file with mode: 0644]
sound/ctf/pink_dropped.wav [new file with mode: 0644]
sound/ctf/pink_returned.wav [new file with mode: 0644]
sound/ctf/pink_taken.wav [new file with mode: 0644]
sound/ctf/yellow_capture.ogg [new file with mode: 0644]
sound/ctf/yellow_dropped.wav [new file with mode: 0644]
sound/ctf/yellow_returned.wav [new file with mode: 0644]
sound/ctf/yellow_taken.wav [new file with mode: 0644]