From: Rudolf Polzer Date: Tue, 6 Mar 2012 15:53:54 +0000 (+0100) Subject: add the GPL the proper way for this map X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0941ff9f14bb2a7ce5c05d89fd413c9aa0c4d803;p=xonotic%2Fxonotic-maps.pk3dir.git add the GPL the proper way for this map --- diff --git a/maps/augenkrebs.map b/maps/augenkrebs.map index 6e4fe074..cde8d112 100644 --- a/maps/augenkrebs.map +++ b/maps/augenkrebs.map @@ -60,7 +60,7 @@ ( 320 1504 -64 ) ( 320 1440 -64 ) ( 320 1504 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } { -( 1504 1536 2048 ) ( 1504 1536 0 ) ( 1504 256 2048 ) map_augenkrebs/magibon -35 37 0 9.1000003815 6.8249998093 0 0 0 +( 1504 1536 2048 ) ( 1504 1536 0 ) ( 1504 256 2048 ) map_augenkrebs/gpl -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 240 256 256 ) ( 1520 256 256 ) ( 240 1536 256 ) map_augenkrebs/bricks -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1472 256 2048 ) ( 1472 1536 0 ) ( 1472 1536 2048 ) map_augenkrebs/rotsnake7 0 0 0 0.5 0.5 0 0 0 ( 1648 1536 1024 ) ( 1648 256 1024 ) ( 368 1536 1024 ) map_augenkrebs/bricks -35 37 0 9.1000003815 6.8249998093 0 0 0 @@ -312,14 +312,14 @@ } { ( 1536 1472 -128 ) ( 1536 1472 1024 ) ( 1504 1472 -128 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 -( 1504 1408 256 ) ( 1504 1408 1408 ) ( 1536 1472 1408 ) map_augenkrebs/magibon -35 37 0 9.1000003815 6.8249998093 0 0 0 +( 1504 1408 256 ) ( 1504 1408 1408 ) ( 1536 1472 1408 ) map_augenkrebs/gpl -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 1408 1024 ) ( 1504 1408 -128 ) ( 1504 1472 -128 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1536 320 1024 ) ( 1504 320 960 ) ( 1504 1472 960 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 1472 320 ) ( 1504 320 320 ) ( 1536 320 256 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 } { ( 1504 320 -128 ) ( 1536 320 1024 ) ( 1536 320 -128 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 -( 1536 320 1408 ) ( 1504 384 1408 ) ( 1504 384 256 ) map_augenkrebs/magibon -35 37 0 9.1000003815 6.8249998093 0 0 0 +( 1536 320 1408 ) ( 1504 384 1408 ) ( 1504 384 256 ) map_augenkrebs/gpl -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 320 -128 ) ( 1504 384 -128 ) ( 1504 384 1024 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1536 320 1024 ) ( 1504 320 960 ) ( 1504 1472 960 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 1472 320 ) ( 1504 320 320 ) ( 1536 320 256 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 @@ -327,14 +327,14 @@ { ( 1536 1472 1024 ) ( 1536 320 1024 ) ( 1504 1472 1024 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1536 1472 1024 ) ( 1504 1472 1024 ) ( 1536 1472 992 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 -( 1504 1472 960 ) ( 1504 320 960 ) ( 1536 320 1024 ) map_augenkrebs/magibon -35 37 0 9.1000003815 6.8249998093 0 0 0 +( 1504 1472 960 ) ( 1504 320 960 ) ( 1536 320 1024 ) map_augenkrebs/gpl -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 320 992 ) ( 1504 320 1024 ) ( 1536 320 992 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 320 960 ) ( 1504 1472 960 ) ( 1504 1472 1024 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 } { ( 1504 1472 256 ) ( 1536 320 256 ) ( 1536 1472 256 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1536 1472 288 ) ( 1504 1472 256 ) ( 1536 1472 256 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 -( 1536 320 256 ) ( 1504 320 320 ) ( 1504 1472 320 ) map_augenkrebs/magibon -35 37 0 9.1000003815 6.8249998093 0 0 0 +( 1536 320 256 ) ( 1504 320 320 ) ( 1504 1472 320 ) map_augenkrebs/gpl -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1536 320 288 ) ( 1504 320 256 ) ( 1504 320 288 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 ( 1504 1472 256 ) ( 1504 1472 320 ) ( 1504 320 320 ) common/caulk -35 37 0 9.1000003815 6.8249998093 0 0 0 } @@ -1400,7 +1400,7 @@ { "classname" "func_button" "lip" "1" -"target" "magibon" +"target" "gpl" "wait" "10" "health" "5" "spawnflags" "256" @@ -1422,7 +1422,7 @@ ( 1519 1072 688 ) ( 1487 1072 752 ) ( 1487 1072 688 ) common/weapclip -35 37 0 9.1000003815 6.8249998093 0 0 0 } { -( 1503 1681 2048 ) ( 1503 1681 0 ) ( 1503 401 2048 ) map_augenkrebs/magibon 2013 11 0 9.1000003815 9.1000003815 0 0 0 +( 1503 1681 2048 ) ( 1503 1681 0 ) ( 1503 401 2048 ) map_augenkrebs/gpl 2013 11 0 9.1000003815 9.1000003815 0 0 0 ( 1488 400 2048 ) ( 1488 1680 0 ) ( 1488 1680 2048 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 ( 256 624 -32 ) ( 256 624 2016 ) ( 1536 624 -32 ) common/caulk 0 0 0 1 1 0 0 0 ( 1504 880 800 ) ( 1504 784 800 ) ( 1472 880 800 ) common/caulk 0 0 0 0.25 0.25 0 0 0 @@ -1430,7 +1430,7 @@ ( 1504 800 720 ) ( 1472 800 784 ) ( 1472 800 720 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { -( 1503 1697 2048 ) ( 1503 1697 0 ) ( 1503 417 2048 ) map_augenkrebs/magibon 2013 11 0 9.1000003815 9.1000003815 0 0 0 +( 1503 1697 2048 ) ( 1503 1697 0 ) ( 1503 417 2048 ) map_augenkrebs/gpl 2013 11 0 9.1000003815 9.1000003815 0 0 0 ( 1488 416 2048 ) ( 1488 1696 0 ) ( 1488 1696 2048 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 ( 1504 896 816 ) ( 1504 800 816 ) ( 1472 896 816 ) common/caulk 0 0 0 0.25 0.25 0 0 0 ( 1503 897 688 ) ( 1471 897 752 ) ( 1503 897 752 ) common/caulk 0 0 0 0.25 0.25 0 0 0 @@ -1571,7 +1571,7 @@ { "classname" "target_spawn" "origin" "1536.000000 832.000000 992.000000" -"targetname" "magibon" +"targetname" "gpl" "message" "modelflags 12" "target" "*activator" } @@ -1627,7 +1627,7 @@ "fade_rate" "1" "volume" "1" "origin" "-1280.000000 1216.000000 1600.000000" -"targetname" "magibon" +"targetname" "gpl" "lifetime" "45" } { diff --git a/scripts/map_augenkrebs.shader b/scripts/map_augenkrebs.shader index adb7c9f2..44f0658c 100644 --- a/scripts/map_augenkrebs.shader +++ b/scripts/map_augenkrebs.shader @@ -1,12 +1,11 @@ -textures/map_augenkrebs/magibon +textures/map_augenkrebs/gpl { { - map textures/map_augenkrebs/magibon - tcmod page 16 16 0.1 + map textures/map_augenkrebs/gpl + tcmod page 4 4 0.2 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -65,7 +64,6 @@ textures/map_augenkrebs/loituma } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -79,7 +77,6 @@ textures/map_augenkrebs/augen } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -95,7 +92,6 @@ textures/map_augenkrebs/bricks } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -109,7 +105,6 @@ textures/map_augenkrebs/bw } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -123,7 +118,6 @@ textures/map_augenkrebs/bwscroll } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -137,7 +131,6 @@ textures/map_augenkrebs/g } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -151,7 +144,6 @@ textures/map_augenkrebs/jumpy } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -166,7 +158,6 @@ textures/map_augenkrebs/mahopa-augenkrebs-01 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -181,7 +172,6 @@ textures/map_augenkrebs/mahopa-augenkrebs-04 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -195,7 +185,6 @@ textures/map_augenkrebs/mahopa-augenkrebs-06 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -209,7 +198,6 @@ textures/map_augenkrebs/omgchucky } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -223,7 +211,6 @@ textures/map_augenkrebs/p } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -237,7 +224,6 @@ textures/map_augenkrebs/pg } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -251,7 +237,6 @@ textures/map_augenkrebs/pgscroll } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -265,7 +250,6 @@ textures/map_augenkrebs/pinchpunch } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -279,7 +263,6 @@ textures/map_augenkrebs/punkte_5 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -294,7 +277,6 @@ textures/map_augenkrebs/rotsnake7 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -309,7 +291,6 @@ textures/map_augenkrebs/sakuras2b } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -323,7 +304,6 @@ textures/map_augenkrebs/thweber-mystics2 } { map $lightmap - tcGen lightmap blendfunc filter } } @@ -337,7 +317,6 @@ textures/map_augenkrebs/epilepsy } { map $lightmap - tcGen lightmap blendfunc filter } } diff --git a/textures/map_augenkrebs/gpl.png b/textures/map_augenkrebs/gpl.png new file mode 100644 index 00000000..1f53aef4 Binary files /dev/null and b/textures/map_augenkrebs/gpl.png differ diff --git a/textures/map_augenkrebs/gpl.txt b/textures/map_augenkrebs/gpl.txt new file mode 100644 index 00000000..4d28bf4f --- /dev/null +++ b/textures/map_augenkrebs/gpl.txt @@ -0,0 +1,7 @@ +screenshots of the GPL3 as viewed in Chromium + +window size: 512x512 +pressed ctrl-minus a few times +added css: line-height: 95% +applied: mogrify -negate gpl?[13579].png +then: montage gpl??.png -border 0 -frame 0 -geometry +0+0 gpl.png diff --git a/textures/map_augenkrebs/gpl00.png b/textures/map_augenkrebs/gpl00.png new file mode 100644 index 00000000..0fa3c63e Binary files /dev/null and b/textures/map_augenkrebs/gpl00.png differ diff --git a/textures/map_augenkrebs/gpl01.png b/textures/map_augenkrebs/gpl01.png new file mode 100644 index 00000000..991ba0d9 Binary files /dev/null and b/textures/map_augenkrebs/gpl01.png differ diff --git a/textures/map_augenkrebs/gpl02.png b/textures/map_augenkrebs/gpl02.png new file mode 100644 index 00000000..b4520dd0 Binary files /dev/null and b/textures/map_augenkrebs/gpl02.png differ diff --git a/textures/map_augenkrebs/gpl03.png b/textures/map_augenkrebs/gpl03.png new file mode 100644 index 00000000..3d2240a9 Binary files /dev/null and b/textures/map_augenkrebs/gpl03.png differ diff --git a/textures/map_augenkrebs/gpl04.png b/textures/map_augenkrebs/gpl04.png new file mode 100644 index 00000000..c2337ea5 Binary files /dev/null and b/textures/map_augenkrebs/gpl04.png differ diff --git a/textures/map_augenkrebs/gpl05.png b/textures/map_augenkrebs/gpl05.png new file mode 100644 index 00000000..fa8c41f9 Binary files /dev/null and b/textures/map_augenkrebs/gpl05.png differ diff --git a/textures/map_augenkrebs/gpl06.png b/textures/map_augenkrebs/gpl06.png new file mode 100644 index 00000000..f1773d6b Binary files /dev/null and b/textures/map_augenkrebs/gpl06.png differ diff --git a/textures/map_augenkrebs/gpl07.png b/textures/map_augenkrebs/gpl07.png new file mode 100644 index 00000000..064a4915 Binary files /dev/null and b/textures/map_augenkrebs/gpl07.png differ diff --git a/textures/map_augenkrebs/gpl08.png b/textures/map_augenkrebs/gpl08.png new file mode 100644 index 00000000..aa2d6e15 Binary files /dev/null and b/textures/map_augenkrebs/gpl08.png differ diff --git a/textures/map_augenkrebs/gpl09.png b/textures/map_augenkrebs/gpl09.png new file mode 100644 index 00000000..b0838231 Binary files /dev/null and b/textures/map_augenkrebs/gpl09.png differ diff --git a/textures/map_augenkrebs/gpl10.png b/textures/map_augenkrebs/gpl10.png new file mode 100644 index 00000000..4128786a Binary files /dev/null and b/textures/map_augenkrebs/gpl10.png differ diff --git a/textures/map_augenkrebs/gpl11.png b/textures/map_augenkrebs/gpl11.png new file mode 100644 index 00000000..fa3d4fa2 Binary files /dev/null and b/textures/map_augenkrebs/gpl11.png differ diff --git a/textures/map_augenkrebs/gpl12.png b/textures/map_augenkrebs/gpl12.png new file mode 100644 index 00000000..5dfd1644 Binary files /dev/null and b/textures/map_augenkrebs/gpl12.png differ diff --git a/textures/map_augenkrebs/gpl13.png b/textures/map_augenkrebs/gpl13.png new file mode 100644 index 00000000..23651aca Binary files /dev/null and b/textures/map_augenkrebs/gpl13.png differ diff --git a/textures/map_augenkrebs/gpl14.png b/textures/map_augenkrebs/gpl14.png new file mode 100644 index 00000000..08464b7a Binary files /dev/null and b/textures/map_augenkrebs/gpl14.png differ diff --git a/textures/map_augenkrebs/gpl15.png b/textures/map_augenkrebs/gpl15.png new file mode 100644 index 00000000..5d86a3ab Binary files /dev/null and b/textures/map_augenkrebs/gpl15.png differ