Merge branch 'master' into p9_wip

7 files changed, 12 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 75aa6a7..4301ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.pk3
 maps/*.bak
 maps/prefabs/*.bak
 maps/*.srf
diff --git a/Makefile b/Makefile
index fb985d6..ae9e7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ MAP ?= analmango
 #
 
 analmango.pk3: $(WHOLE).bsp
-	zip -r9 $@ maps/analmango.bsp scripts sound textures models
+	xargs zip -r9 analmango.pk3 < pk3.list
 
 #
 # Testing a map
diff --git a/README b/README
index c77c610..00165be 100644
--- a/README
+++ b/README
@@ -38,6 +38,10 @@ The "uncommon" texture pack is a copy of common textures from the data-radiant p
 
 sound/analmango/wtf_*.wav are samples from random viral videos found on the Internet.
 
+The chicken poster uses the following photo as background:
+	https://commons.wikimedia.org/wiki/Category:White_chickens#/media/File:Canadian_chicken.jpg
+	"Chicken 2" by Chicken Farmers of Canada, CC-BY 2.0
+
 Transcripts:
 ------------
 
diff --git a/pending/kaleka_kura_poster.jpg b/pending/kaleka_kura_poster.jpg
new file mode 100644
index 0000000..cf46d91
--- /dev/null
+++ b/pending/kaleka_kura_poster.jpg
diff --git a/pk3.list b/pk3.list
new file mode 100644
index 0000000..7cf9c6b
--- /dev/null
+++ b/pk3.list
@@ -0,0 +1,6 @@
+maps/analmango.bsp
+scripts/
+sound/
+textures/analmango
+textures/uncommon
+README
diff --git a/raws/poster_diamond.xcf b/raws/poster_diamond.xcf
new file mode 100644
index 0000000..a40b583
--- /dev/null
+++ b/raws/poster_diamond.xcf
diff --git a/raws/tip_logo.png b/raws/tip_logo.png
new file mode 100644
index 0000000..522f63a
--- /dev/null
+++ b/raws/tip_logo.png