git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

author	terencehill <piuntn@gmail.com>
	Sat, 15 Oct 2022 10:17:59 +0000 (12:17 +0200)
committer	terencehill <piuntn@gmail.com>
	Sat, 15 Oct 2022 10:17:59 +0000 (12:17 +0200)
commit	549605429c8e5dc158a597d7b97671aeefe86ed2
tree	fa2b7bc68008e7dac5e962344c12678afab7bae7	tree \| snapshot
parent	b299b9bcb82c12791406f3540305919414d745a7	commit \| diff

Revert "Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards-compatibility. It will be merged back when we are close to a release."

This reverts commit b299b9bcb82c12791406f3540305919414d745a7.

55 files changed:

models/ctf/banner.tga	[new file with mode: 0644]	blob
models/ctf/banner_blue.tga	[deleted file]	blob \| history
models/ctf/banner_gloss.tga	[new file with mode: 0644]	blob
models/ctf/banner_neutral.tga	[deleted file]	blob \| history
models/ctf/banner_neutral_gloss.tga	[deleted file]	blob \| history
models/ctf/banner_pink.tga	[deleted file]	blob \| history
models/ctf/banner_pink_gloss.tga	[deleted file]	blob \| history
models/ctf/banner_red.tga	[deleted file]	blob \| history
models/ctf/banner_red_gloss.tga	[deleted file]	blob \| history
models/ctf/banner_shirt.tga	[new file with mode: 0644]	blob
models/ctf/banner_yellow.tga	[deleted file]	blob \| history
models/ctf/banner_yellow_gloss.tga	[deleted file]	blob \| history
models/ctf/flag.tga	[new file with mode: 0644]	blob
models/ctf/flag_blue.tga	[deleted file]	blob \| history
models/ctf/flag_blue_gloss.tga	[deleted file]	blob \| history
models/ctf/flag_blue_glow.tga	[deleted file]	blob \| history
models/ctf/flag_blue_norm.tga	[deleted file]	blob \| history
models/ctf/flag_gloss.tga	[new file with mode: 0644]	blob
models/ctf/flag_glow.tga	[new file with mode: 0644]	blob
models/ctf/flag_neutral.tga	[deleted file]	blob \| history
models/ctf/flag_neutral_gloss.tga	[deleted file]	blob \| history
models/ctf/flag_neutral_glow.tga	[deleted file]	blob \| history
models/ctf/flag_neutral_norm.tga	[deleted file]	blob \| history
models/ctf/flag_norm.tga	[new file with mode: 0644]	blob
models/ctf/flag_pink.tga	[deleted file]	blob \| history
models/ctf/flag_pink_gloss.tga	[deleted file]	blob \| history
models/ctf/flag_pink_glow.tga	[deleted file]	blob \| history
models/ctf/flag_pink_norm.tga	[deleted file]	blob \| history
models/ctf/flag_red.tga	[deleted file]	blob \| history
models/ctf/flag_red_gloss.tga	[deleted file]	blob \| history
models/ctf/flag_red_glow.tga	[deleted file]	blob \| history
models/ctf/flag_red_norm.tga	[deleted file]	blob \| history
models/ctf/flag_yellow.tga	[deleted file]	blob \| history
models/ctf/flag_yellow_gloss.tga	[deleted file]	blob \| history
models/ctf/flag_yellow_glow.tga	[deleted file]	blob \| history
models/ctf/flag_yellow_norm.tga	[deleted file]	blob \| history
models/ctf/flags.md3_0.skin		diff \| blob \| history
models/ctf/flags.md3_1.skin	[deleted file]	blob \| history
models/ctf/flags.md3_2.skin	[deleted file]	blob \| history
models/ctf/flags.md3_3.skin	[deleted file]	blob \| history
models/ctf/flags.md3_4.skin	[deleted file]	blob \| history
models/ctf/glow.tga	[new file with mode: 0644]	blob
models/ctf/glow_blue.tga	[deleted file]	blob \| history
models/ctf/glow_blue_glow.tga	[deleted file]	blob \| history
models/ctf/glow_glow.tga	[new file with mode: 0644]	blob
models/ctf/glow_neutral.tga	[deleted file]	blob \| history
models/ctf/glow_neutral_glow.tga	[deleted file]	blob \| history
models/ctf/glow_pink.tga	[deleted file]	blob \| history
models/ctf/glow_pink_glow.tga	[deleted file]	blob \| history
models/ctf/glow_red.tga	[deleted file]	blob \| history
models/ctf/glow_red_glow.tga	[deleted file]	blob \| history
models/ctf/glow_yellow.tga	[deleted file]	blob \| history
models/ctf/glow_yellow_glow.tga	[deleted file]	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc		diff \| blob \| history
scripts/ctf.shader		diff \| blob \| history

RSS Atom