From: Rudolf Polzer Date: Mon, 8 Jul 2013 09:56:30 +0000 (+0200) Subject: Merge commit '145caec5a836be05bfd091f175605bed237516e3' X-Git-Tag: xonotic-v0.8.0~41 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=eda70ff01ada5a6f2510b2e0720ece7ccbab1adf;hp=145caec5a836be05bfd091f175605bed237516e3 Merge commit '145caec5a836be05bfd091f175605bed237516e3' --- diff --git a/maps/afterslime.jpg b/maps/afterslime.jpg deleted file mode 100644 index d9e688a5..00000000 Binary files a/maps/afterslime.jpg and /dev/null differ diff --git a/maps/leave_em_behind.jpg b/maps/leave_em_behind.jpg deleted file mode 100644 index ad03b33f..00000000 Binary files a/maps/leave_em_behind.jpg and /dev/null differ diff --git a/maps/red-planet.jpg b/maps/red-planet.jpg deleted file mode 100644 index 8f6dd712..00000000 Binary files a/maps/red-planet.jpg and /dev/null differ diff --git a/maps/runningman.jpg b/maps/runningman.jpg deleted file mode 100644 index a00ff3de..00000000 Binary files a/maps/runningman.jpg and /dev/null differ diff --git a/maps/runningmanctf.jpg b/maps/runningmanctf.jpg deleted file mode 100644 index f7b394f1..00000000 Binary files a/maps/runningmanctf.jpg and /dev/null differ diff --git a/maps/stormkeep.jpg b/maps/stormkeep.jpg deleted file mode 100644 index 3a158cba..00000000 Binary files a/maps/stormkeep.jpg and /dev/null differ diff --git a/maps/techassault.jpg b/maps/techassault.jpg deleted file mode 100644 index 330b83d7..00000000 Binary files a/maps/techassault.jpg and /dev/null differ diff --git a/scripts/Makefile b/scripts/Makefile index a4bfcefb..ba99e8ef 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -7,7 +7,8 @@ all: shaderlist.txt $(GENERATEDFILES) ./shader-cpp.sh "$<" > "$@" clean: - $(RM) "$(GENERATEDFILES)" + $(RM) $(GENERATEDFILES) +.PHONY: shaderlist.txt shaderlist.txt: ls -1 *.shader | cut -d . -f 1 > "$@" diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt index ce08e64f..fd5f8f51 100644 --- a/scripts/shaderlist.txt +++ b/scripts/shaderlist.txt @@ -24,6 +24,7 @@ map_glowplant map_leave_em_behind map_lightspeed map_newtonian-nightmare +map_oilrig map_red-planet map_silentsiege map_solarium