Merge remote branch 'refs/remotes/origin/merlijn/download-script-fix'

diff --git a/all b/all
index 5d38877d75f0f98390a6206f80bf65ed0bb919d5..49e029635216c38e6af86eba4706f013c56102c9 100755 (executable)
--- a/all
+++ b/all
@@ -113,11 +113,11 @@ repos_urls="
 data/xonotic-data.pk3dir      |                                                   | master      |
 data/xonotic-maps.pk3dir      |                                                   | master      |
 data/xonotic-music.pk3dir     |                                                   | master      |
-data/xonotic-nexcompat.pk3dir |                                                   | master      |
-mediasource                   |                                                   | master      |
+data/xonotic-nexcompat.pk3dir |                                                   | master      | no
+mediasource                   |                                                   | master      | no
 darkplaces                    |                                                   | div0-stable | svn
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
-div0-gittools                 |                                                   | master      |
+div0-gittools                 |                                                   | master      | no
 netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
@@ -171,12 +171,47 @@ repoflags()
        echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
 }
 
-repos=`for d in $repos; do
-       p="${d%dir}"
-       if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
+listrepos()
+{
+       for d in $repos; do
+               p="${d%dir}"
+               f="`repoflags "$d"`"
+               # if we have the dir, always keep it
+               if [ -d "$d" ]; then
+                       msg "Repository $d enabled because it already exists"
+                       echo "$d"
+                       continue
+               fi
+               # if .yes file exists, always keep it
+               if [ -f "$d.yes" ]; then
+                       msg "Repository $d enabled by a .yes file"
+                       echo "$d"
+                       continue
+               fi
+               # if we have .no file, skip
+               if [ -f "$d.no" ]; then
+                       msg "Repository $d disabled by a .no file, delete $p.no to enable"
+                       continue
+               fi
+               # if we have matching pk3, skip
+               if [ x"$p" != x"$d" ] && [ -f "$p" ]; then
+                       msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable"
+                       continue
+               fi
+               # if "no" flag is set, skip
+               case ",$f," in
+                       *,no,*)
+                               msg "Repository $d disabled by default, create $d.yes to enable"
+                               continue
+                               ;;
+               esac
+               # default: enable
+               msg "Repository $d enabled by default"
                echo "$d"
-       fi
-done`
+       done
+}
+
+repos=`listrepos`
 
 if [ "$#" = 0 ]; then
        set -- help
@@ -229,6 +264,14 @@ fix_upstream_rebase_mergefail()
        fix_upstream_rebase
 }
 
+fix_git_config()
+{
+       verbose git config core.autocrlf input
+       if [ -z "`git config push.default`" ]; then
+               verbose git config push.default current # or is tracking better?
+       fi
+}
+
 case "$cmd" in
        fix_upstream_rebase)
                for d in $repos; do
@@ -247,11 +290,9 @@ case "$cmd" in
                        if [ -d "$d0/$d" ]; then
                                if $allow_pull; then
                                        enter "$d0/$d" verbose
+                                       fix_git_config
                                        verbose git config remote.origin.url "$url"
                                        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-
-                                       verbose git config core.autocrlf input
-
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
@@ -274,6 +315,7 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
+                               fix_git_config
                                if [ "$branch" != "master" ]; then
                                        verbose git checkout --track -b "$branch" origin/"$branch"
                                fi
@@ -862,9 +904,10 @@ case "$cmd" in
                        force=true
                fi
                for d in $repos; do
-                       enter "$d0/$d" verbose
+                       verbose cd "$d0/$d"
                        if $force; then
-                               verbose git checkout-index -fa
+                               verbose git reset --hard
+                               #redundant# verbose git checkout-index -fa
                        fi
                        case "$d" in
                                .)
@@ -992,7 +1035,7 @@ case "$cmd" in
                verbose "$SELF" release-compile osx \
                        'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
                        '' '' \
-                       'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+                       'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
                ;;
        release-engine-osx)
                verbose "$SELF" release-engine-osx-sv-sdl

diff --git a/misc/logos/icons_icns/Xonotic.icns b/misc/logos/icons_icns/Xonotic.icns
index 4129b9fc3259307633ca2d2ca48d65ece3af267b..7fda030563b3149b0f41785726af95f6edb18c9b 100644 (file)
Binary files a/misc/logos/icons_icns/Xonotic.icns and b/misc/logos/icons_icns/Xonotic.icns differ

diff --git a/misc/logos/icons_ico/xonotic.ico b/misc/logos/icons_ico/xonotic.ico
new file mode 100644 (file)
index 0000000..c6f1714
Binary files /dev/null and b/misc/logos/icons_ico/xonotic.ico differ

diff --git a/misc/logos/icons_ico/xonotic_128.ico b/misc/logos/icons_ico/xonotic_128.ico
deleted file mode 100644 (file)
index 7b64c4d..0000000
Binary files a/misc/logos/icons_ico/xonotic_128.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_16.ico b/misc/logos/icons_ico/xonotic_16.ico
deleted file mode 100644 (file)
index 77fd48f..0000000
Binary files a/misc/logos/icons_ico/xonotic_16.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_24.ico b/misc/logos/icons_ico/xonotic_24.ico
deleted file mode 100644 (file)
index 2b3d8d5..0000000
Binary files a/misc/logos/icons_ico/xonotic_24.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_256.ico b/misc/logos/icons_ico/xonotic_256.ico
deleted file mode 100644 (file)
index 632d5a9..0000000
Binary files a/misc/logos/icons_ico/xonotic_256.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_32.ico b/misc/logos/icons_ico/xonotic_32.ico
deleted file mode 100644 (file)
index bd5407e..0000000
Binary files a/misc/logos/icons_ico/xonotic_32.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_48.ico b/misc/logos/icons_ico/xonotic_48.ico
deleted file mode 100644 (file)
index 9f82051..0000000
Binary files a/misc/logos/icons_ico/xonotic_48.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_512.ico b/misc/logos/icons_ico/xonotic_512.ico
deleted file mode 100644 (file)
index 3e13491..0000000
Binary files a/misc/logos/icons_ico/xonotic_512.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_64.ico b/misc/logos/icons_ico/xonotic_64.ico
deleted file mode 100644 (file)
index f911347..0000000
Binary files a/misc/logos/icons_ico/xonotic_64.ico and /dev/null differ

diff --git a/misc/logos/icons_png/xonotic_128.png b/misc/logos/icons_png/xonotic_128.png
index 0d3847cb50bcce3b558decfd7cf32ff41292fe78..231b398eda35e2bfb3625960f48dd6056da01f2a 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_128.png and b/misc/logos/icons_png/xonotic_128.png differ

diff --git a/misc/logos/icons_png/xonotic_16.png b/misc/logos/icons_png/xonotic_16.png
index 6521710b808ac3367fe6d2a7fe798eb960117493..da27c138253bfe93c6aa1c4faecac5cc625891f7 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_16.png and b/misc/logos/icons_png/xonotic_16.png differ

diff --git a/misc/logos/icons_png/xonotic_22.png b/misc/logos/icons_png/xonotic_22.png
index 3037e3cb335f765a048a000a62e706e95815cfe1..f237f1bdac8a586a1d7f4046170966bd5a865e1c 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_22.png and b/misc/logos/icons_png/xonotic_22.png differ

diff --git a/misc/logos/icons_png/xonotic_24.png b/misc/logos/icons_png/xonotic_24.png
index 1b07ffc90044ad6f40b74ec65127bb45efc5a3df..5d71d8d4f2243f90be911849060a5c906e2d68c0 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_24.png and b/misc/logos/icons_png/xonotic_24.png differ

diff --git a/misc/logos/icons_png/xonotic_256.png b/misc/logos/icons_png/xonotic_256.png
index 699cf502d8f70fa2d5ac83456f2f671fe4864991..3581eaf32f33c224cb2157f72565afafbf4fa237 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_256.png and b/misc/logos/icons_png/xonotic_256.png differ

diff --git a/misc/logos/icons_png/xonotic_32.png b/misc/logos/icons_png/xonotic_32.png
index a5df3839d51281e8baa4a35969c9908f191f5709..a62affb49058740006200ef622f07773022fcd84 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_32.png and b/misc/logos/icons_png/xonotic_32.png differ

diff --git a/misc/logos/icons_png/xonotic_48.png b/misc/logos/icons_png/xonotic_48.png
index 70677c323b90510a1fb6d6e7cc668f6a55b5e876..244ead9f35cb3a0a848ea95fef374f1c98b177d4 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_48.png and b/misc/logos/icons_png/xonotic_48.png differ

diff --git a/misc/logos/icons_png/xonotic_512.png b/misc/logos/icons_png/xonotic_512.png
index 7e3d6367beb3896ef28ec5929a3fa7eafcb2c816..43ca8fba7ee0b92cfbc6e350b40f7e07a032c3de 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_512.png and b/misc/logos/icons_png/xonotic_512.png differ

diff --git a/misc/logos/icons_png/xonotic_64.png b/misc/logos/icons_png/xonotic_64.png
index 48381cb99c9cd90632dfce2a7cde16cdab12c9d9..198651a404c162fa6c7b1977171dcbc3aa713087 100644 (file)
Binary files a/misc/logos/icons_png/xonotic_64.png and b/misc/logos/icons_png/xonotic_64.png differ

diff --git a/misc/logos/icons_xpm/xonotic_32.xpm b/misc/logos/icons_xpm/xonotic_32.xpm
index 0903e1092133d5b005bbbd56b122fbed5ebadb1a..cdd7f4414705de7118e57d9980ae6edc9d1e6736 100644 (file)
--- a/misc/logos/icons_xpm/xonotic_32.xpm
+++ b/misc/logos/icons_xpm/xonotic_32.xpm
@@ -2,126 +2,126 @@
 static char * xonotic_32_xpm[] = {
 "32 32 92 1",
 "      c None",
-".     c #01070B",
-"+     c #150400",
-"@     c #000A12",
-"#     c #0E0805",
-"$     c #1B0500",
-"%     c #000D19",
-"&     c #250700",
-"*     c #220800",
-"=     c #00101F",
-"-     c #2C0900",
-";     c #0C1118",
-">     c #14100D",
-",     c #101114",
-"'     c #021528",
-")     c #320B00",
-"!     c #1D120D",
-"~     c #390B03",
-"{     c #400A01",
-"]     c #3B0D00",
-"^     c #0A172F",
-"/     c #440D00",
-"(     c #231713",
-"_     c #091D34",
-":     c #051F3F",
-"<     c #2B190D",
-"[     c #30180D",
-"}     c #38160B",
-"|     c #141E29",
-"1     c #201D22",
-"2     c #0A2544",
-"3     c #332018",
-"4     c #551804",
-"5     c #461D0A",
-"6     c #0A284F",
-"7     c #052956",
-"8     c #3A2113",
-"9     c #501E05",
-"0     c #142A40",
-"a     c #452115",
-"b     c #0E2F4F",
-"c     c #442717",
-"d     c #10325A",
-"e     c #602309",
-"f     c #093467",
-"g     c #00376F",
-"h     c #003A66",
-"i     c #5A2912",
-"j     c #482D29",
-"k     c #113B75",
-"l     c #163C6A",
-"m     c #443436",
-"n     c #643013",
-"o     c #5B321C",
-"p     c #712D10",
-"q     c #6C2F0F",
-"r     c #2C3F53",
-"s     c #1B4573",
-"t     c #174983",
-"u     c #244A73",
-"v     c #7A3C1A",
-"w     c #5E4140",
-"x     c #6A402B",
-"y     c #863F1B",
-"z     c #235394",
-"A     c #265482",
-"B     c #285489",
-"C     c #8E461E",
-"D     c #994619",
-"E     c #914826",
-"F     c #53556B",
-"G     c #8C4C28",
-"H     c #2F5D99",
-"I     c #2462A6",
-"J     c #475E79",
-"K     c #316295",
-"L     c #3F6892",
-"M     c #A65524",
-"N     c #2A6DB7",
-"O     c #4D6B91",
-"P     c #3373B4",
-"Q     c #3C72AD",
-"R     c #4673AA",
-"S     c #337AC8",
-"T     c #397AC2",
-"U     c #417EC0",
-"V     c #4A81BD",
-"W     c #6386AF",
-"X     c #5C89BB",
-"Y     c #7396C1",
-"Z     c #87AACF",
-"`     c #91BBE2",
+".     c #000509",
+"+     c #0F0303",
+"@     c #150400",
+"#     c #1B0400",
+"$     c #010C14",
+"%     c #220700",
+"&     c #010F1A",
+"*     c #250700",
+"=     c #2B0900",
+"-     c #011321",
+";     c #310A03",
+">     c #001628",
+",     c #330B00",
+"'     c #390B03",
+")     c #400A01",
+"!     c #3C0E00",
+"~     c #051A31",
+"{     c #331103",
+"]     c #430D00",
+"^     c #4D1002",
+"/     c #0A1F36",
+"(     c #141E29",
+"_     c #451A07",
+":     c #082743",
+"<     c #0A273F",
+"[     c #4F1D08",
+"}     c #5B1B07",
+"|     c #182C3F",
+"1     c #0C2F51",
+"2     c #5D2409",
+"3     c #65240A",
+"4     c #562812",
+"5     c #4D2C1B",
+"6     c #0D3A65",
+"7     c #662A06",
+"8     c #722D0F",
+"9     c #743101",
+"0     c #2C3F53",
+"a     c #77310A",
+"b     c #1A4673",
+"c     c #7C3908",
+"d     c #683D29",
+"e     c #733B1E",
+"f     c #823A03",
+"g     c #214C76",
+"h     c #8B3E18",
+"i     c #8F410D",
+"j     c #963F11",
+"k     c #604D4A",
+"l     c #255A88",
+"m     c #255A9B",
+"n     c #295B8F",
+"o     c #9F4610",
+"p     c #984A17",
+"q     c #255EA5",
+"r     c #1761B1",
+"s     c #9A4A21",
+"t     c #A54C15",
+"u     c #475E79",
+"v     c #346399",
+"w     c #A2511E",
+"x     c #3E6792",
+"y     c #5C6272",
+"z     c #266BBB",
+"A     c #2271BD",
+"B     c #4D6C8F",
+"C     c #3C6FA5",
+"D     c #B15A26",
+"E     c #3472BA",
+"F     c #3373B4",
+"G     c #3479C1",
+"H     c #4178AE",
+"I     c #287ED1",
+"J     c #347CCA",
+"K     c #387FC7",
+"L     c #4380C1",
+"M     c #3A84D2",
+"N     c #5489C0",
+"O     c #488CD4",
+"P     c #648AB7",
+"Q     c #628DB2",
+"R     c #678DBA",
+"S     c #5691CC",
+"T     c #748CA8",
+"U     c #5F9AD7",
+"V     c #6D99CC",
+"W     c #74A4DA",
+"X     c #81A4C9",
+"Y     c #7AACDC",
+"Z     c #8DBCE9",
+"`     c #98C2EA",
 "                                ",
-"           ==========           ",
-"        :0'==%%%%%%=='0:        ",
-"       dOb'%%%%%%%%%%'bOd       ",
-"      LW:^=%%%@@@@%%%=^:WL      ",
-"     LY6'%%@@@@@@@@@@@%'6YL     ",
-"    AZ6^%@@@@@@@@.,,,,,%'6ZA    ",
-"   s`s^=@@@@@...>(8Gcxx31_s`s   ",
-"  fYY:=%@@@...>(oGy4ye4Ex12YYf  ",
-"  BZB^%@@@...!<GpyMp/pCGG(_BZB  ",
-" gXW7=%@@..#!oC4/py4pvc8(;=7WXg ",
-" kLV:%@@..><vp//////MCCG8,%:VLk ",
-" IAU:%@..>[C4{{{{{{{{4yv3,%:UAI ",
-" NAN:%@.!aD/]]]]]]]]pv[!>@%:NAN ",
-" SsN:@,(oy4D]~~~~~~pn*#..@%:NsS ",
-"fTlS:;(nDyMe))))))]v*#...@%:SlTf",
-"gTlT21vDnvpe))))))p[##...@%:TlTg",
-" ThPd183nDvq------q<#....@=7PhT ",
-" SdBz_;>[8n]------n[#....@^zBdS ",
-" IsbT6=.><n&&&&&&&9a!#..@=6TbsI ",
-" gKbsI_;!59********n8!>,;_IsbKg ",
-" gT22Pd1ci*********&ii831dP22Tg ",
-"  zu2bTw5$$$$$$$$$$$$*5ixUb2uz  ",
-"  gT__0Vw)$$$$$$$$$$$$}wV0__Tg  ",
-"   tK___QFa*++++++++*aFQ___Kt   ",
-"    Iu'''uQOj}++++}jOQu'''uI    ",
-"    kNu====0KRa##aRK0====uNk    ",
-"     kIL%%%%%0O**O0%%%%%LIk     ",
-"       tVr@@@@OmmO@@@@rVt       ",
-"        gHXJ|.;YY;.|JXHg        ",
-"          ggRXWYYWXRgg          ",
-"               ff               "}
+"                                ",
+"         E            E         ",
+"       AUG            EUA       ",
+"      SW                WS      ",
+"     SY                  YS     ",
+"    LZr                  rZL    ",
+"   E`E            cwcppc  E`E   ",
+"   YW           pwh}h3}sp  WY   ",
+"  GXL          w8hD8^3swD  LXG  ",
+"  VR         is^]8h^ai9     RV  ",
+" zxS        p8]]]]]]Dpptf   Sxz ",
+" JlO       t}))))))))}io    OlJ ",
+" MgJ     fo]!!!!!!!!8o      JgM ",
+" MbI    ih}t!''''''8i       IbM ",
+" K6M   ijht3,,,,,,!i        M6K ",
+" K6K  otffa3;;;;;;a9        K6K ",
+" K6Fq f ftia======a        rF6K ",
+" M1nz     f!======a        An1M ",
+" Ib1K     a*******29       K1bI ",
+" rv1bJ   c[%%%%%%%%a9     Jb1vr ",
+"  K::Fq c7%%%%%%%%%*2a9  mF::K  ",
+"  Ag:1Le_############%_2eH1:gA  ",
+"   K//:Hd{############{dH://K   ",
+"   zv~~/Ck[%@@@@@@@@%[kC/~~vz   ",
+"    Jg>>>gCy4!@++@!4yCg>>>gJ    ",
+"     Jg----<lB[++[Bl<----gJ     ",
+"      Jx&&&&&|y==y|&&&&&xJ      ",
+"       AN0$$$$B55B$$$$0NA       ",
+"         KPu(.$TT$.(uPK         ",
+"           rSVQXXQVSr           ",
+"                                "};

diff --git a/misc/logos/xonotic_icon.svg b/misc/logos/xonotic_icon.svg
index 7e9fe9b1b6d2e98734790156bcc4e63515fd8c26..9deb624116fe185d31bb42cbce73d225db43bc9b 100644 (file)
--- a/misc/logos/xonotic_icon.svg
+++ b/misc/logos/xonotic_icon.svg
@@ -16,31 +16,12 @@
    sodipodi:version="0.32"
    inkscape:version="0.47 r22583"
    version="1.0"
-   sodipodi:docname="xonotic_icon.svg"
+   sodipodi:docname="xonotic_icon_nobg.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-xdpi="120"
-   inkscape:export-ydpi="120">
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs4">
-    <linearGradient
-       id="linearGradient3663">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3667" />
-      <stop
-         id="stop3629"
-         offset="0.25"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3659"
-         offset="0.94"
-         style="stop-color:#000f1f;stop-opacity:1;" />
-      <stop
-         id="stop3690"
-         offset="1"
-         style="stop-color:#000f1f;stop-opacity:0;" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3698">
       <stop
@@ -141,16 +122,6 @@
        y1="1664"
        x2="1024"
        y2="1480" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3663"
-       id="radialGradient3688"
-       cx="24"
-       cy="24"
-       fx="24"
-       fy="24"
-       r="24"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3606"
@@ -162,13 +133,21 @@
        gradientUnits="userSpaceOnUse" />
     <filter
        inkscape:collect="always"
-       id="filter3625"
-       inkscape:label="BlurGlow"
+       id="filter3634"
        color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
-         stdDeviation="1.2883372"
-         id="feGaussianBlur3627" />
+         stdDeviation="0.79447464"
+         id="feGaussianBlur3636" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3621"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.80539653"
+         id="feGaussianBlur3623" />
     </filter>
   </defs>
   <sodipodi:namedview
@@ -179,8 +158,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="4"
-     inkscape:cx="77.720373"
-     inkscape:cy="24.156634"
+     inkscape:cx="57.624372"
+     inkscape:cy="0.156634"
      inkscape:document-units="px"
      inkscape:current-layer="XonoticIcon"
      showgrid="false"
@@ -207,7 +186,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Xonotic Icon</dc:title>
+        <dc:title />
         <dc:date>2010</dc:date>
         <dc:rights>
           <cc:Agent>
@@ -241,19 +220,15 @@
   <g
      inkscape:groupmode="layer"
      id="XonoticIcon">
-    <path
-       style="fill:url(#radialGradient3688);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="M 24,0 C 10.745169,0 0,10.745167 0,24.000001 0,37.254834 10.745169,48 24,48 37.254832,48 48,37.254834 48,24.000001 48,10.745167 37.254832,0 24,0 z"
-       id="BackgroundCircle" />
     <path
        id="RingGlow"
        d="M 14.59521,4.1108501 C 7.1529823,7.6393737 2,15.221066 2,24.000008 2,36.144003 11.855996,46 24.00001,46 36.144004,46 46,36.144003 46,24.000008 46,15.221066 40.847035,7.6393737 33.404798,4.1108501 39.278676,7.4083408 43.250001,13.695036 43.250001,20.90626 43.250001,30.281336 36.536033,38.096723 27.657713,39.807112 26.473118,40.035362 25.031258,45.3125 24.00001,45.3125 22.96876,45.3125 21.526865,40.035362 20.34227,39.807112 11.463975,38.096723 4.7499989,30.281336 4.7499989,20.90626 4.7499989,13.695036 8.7213239,7.4083408 14.59521,4.1108501 z"
-       style="fill:#1f7fff;fill-opacity:1;stroke:#1f7fff;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3625)" />
+       style="fill:#174f8f;fill-opacity:1;stroke:#175faf;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3634)" />
     <path
-       sodipodi:nodetypes="cccccccsccccccccccc"
        id="PhoenixHeadGlow"
        d="M 29.687991,11.576669 C 23.844,12.519302 16.365576,19.817205 9.0791026,25.681248 L 18.038082,21.545414 12.860351,27.050857 17.334467,24.956018 C 15.865814,27.850997 16.023069,32.858195 11.189936,33.845114 13.706493,36.335733 16.940546,38.104313 20.557136,38.797312 22.281242,39.125003 23.484367,43.9375 23.999992,43.9375 24.515616,43.9375 25.718741,39.125003 27.442847,38.797312 31.198015,38.077803 34.539671,36.198563 37.094717,33.555155 24.308519,33.714985 25.116458,20.742195 36.412596,17.903821 35.541363,17.092044 32.641742,17.244152 30.268064,17.619153 30.681719,14.852918 34.604229,13.528101 37.502915,13.886238 35.846316,12.205626 33.829346,10.991435 30.482905,12.387709 L 29.687991,11.576669 z M 28.082024,13.907732 28.952134,14.767107 C 27.816077,15.729188 26.806674,15.793142 25.847649,14.933602 L 28.082024,13.907732 z"
-       style="fill:none;stroke:#ff7f2f;stroke-width:2.20000004999999987;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.37254903;stroke-dasharray:none;filter:url(#filter3625)" />
+       style="fill:#5f1f00;fill-opacity:1;stroke:#6f2f00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3621)"
+       sodipodi:nodetypes="cccccccsccccccccccc" />
     <path
        style="fill:url(#linearGradient4196);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4204);stroke-width:0.54999977;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 29.687991,11.576669 C 23.844,12.519302 16.365576,19.817205 9.0791026,25.681248 L 18.038082,21.545414 12.860351,27.050857 17.334467,24.956018 C 15.865814,27.850997 16.023069,32.858195 11.189936,33.845114 13.706493,36.335733 16.940546,38.104313 20.557136,38.797312 22.281242,39.125003 23.484367,43.9375 23.999992,43.9375 24.515616,43.9375 25.718741,39.125003 27.442847,38.797312 31.198015,38.077803 34.539671,36.198563 37.094717,33.555155 24.308519,33.714985 25.116458,20.742195 36.412596,17.903821 35.541363,17.092044 32.641742,17.244152 30.268064,17.619153 30.681719,14.852918 34.604229,13.528101 37.502915,13.886238 35.846316,12.205626 33.829346,10.991435 30.482905,12.387709 L 29.687991,11.576669 z M 28.082024,13.907732 28.952134,14.767107 C 27.816077,15.729188 26.806674,15.793142 25.847649,14.933602 L 28.082024,13.907732 z"

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 72f427c71d89bf150ac23dd4a4a40ba36431c74f..361265881865430d5b4ccaa09924d7bca6709003 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -179,6 +179,7 @@ for F in "$@"; do
        case "$f" in
                *_bump) will_dds=false ;;
                ./models/player/*) will_dds=false ;;
+               ./models/sprites/*) will_dds=false ;;
                ./textures/*) ;;
                ./models/*) ;;
                ./particles/*) ;;

diff --git a/misc/tools/fft-normalmap-to-heightmap.c b/misc/tools/fft-normalmap-to-heightmap.c
index 1db9eba757026ab5a113ea28e6079f1f253a06b2..8d95d5c6f5f4325d13e8746c0a1cadc61c3318d0 100644 (file)
--- a/misc/tools/fft-normalmap-to-heightmap.c
+++ b/misc/tools/fft-normalmap-to-heightmap.c
@@ -38,6 +38,8 @@
 void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h, double scale, double offset)
 {
        int x, y;
+       int fx, fy;
+       double ffx, ffy;
        double nx, ny, nz;
        double v, vmin, vmax;
 #ifndef C99
@@ -48,9 +50,9 @@ void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h,
        fftw_complex *imgspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
-       fftw_plan i12f1 = fftw_plan_dft_2d(w, h, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
-       fftw_plan i22f2 = fftw_plan_dft_2d(w, h, imgspace2, freqspace2, FFTW_FORWARD, FFTW_ESTIMATE);
-       fftw_plan f12i1 = fftw_plan_dft_2d(w, h, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
+       fftw_plan i12f1 = fftw_plan_dft_2d(h, w, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
+       fftw_plan i22f2 = fftw_plan_dft_2d(h, w, imgspace2, freqspace2, FFTW_FORWARD, FFTW_ESTIMATE);
+       fftw_plan f12i1 = fftw_plan_dft_2d(h, w, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
 
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
@@ -86,23 +88,27 @@ void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h,
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
        {
-               int fx = x;
-               int fy = y;
+               fx = x;
+               fy = y;
                if(fx > w/2)
                        fx -= w;
                if(fy > h/2)
                        fy -= h;
+               /* these must have the same sign as fx and fy (so ffx*fx + ffy*fy is nonzero), otherwise do not matter */
+               /* it basically decides how artifacts are distributed */
+               ffx = fx;
+               ffy = fy;
 #ifdef C99
                if(fx||fy)
-                       freqspace1[(w*y+x)] = _Complex_I * (fx * freqspace1[(w*y+x)] + fy * freqspace2[(w*y+x)]) / (fx*fx + fy*fy) / TWO_PI;
+                       freqspace1[(w*y+x)] = _Complex_I * (ffx * freqspace1[(w*y+x)] + ffy * freqspace2[(w*y+x)]) / (ffx*fx + ffy*fy) / TWO_PI;
                else
                        freqspace1[(w*y+x)] = 0;
 #else
                if(fx||fy)
                {
                        save = freqspace1[(w*y+x)][0];
-                       freqspace1[(w*y+x)][0] = -(fx * freqspace1[(w*y+x)][1] + fy * freqspace2[(w*y+x)][1]) / (fx*fx + fy*fy) / TWO_PI;
-                       freqspace1[(w*y+x)][1] =  (fx * save + fy * freqspace2[(w*y+x)][0]) / (fx*fx + fy*fy) / TWO_PI;
+                       freqspace1[(w*y+x)][0] = -(ffx * freqspace1[(w*y+x)][1] + ffy * freqspace2[(w*y+x)][1]) / (ffx*fx + ffy*fy) / TWO_PI;
+                       freqspace1[(w*y+x)][1] =  (ffx * save + ffy * freqspace2[(w*y+x)][0]) / (ffx*fx + ffy*fy) / TWO_PI;
                }
                else
                {
@@ -235,9 +241,9 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale)
        fftw_complex *imgspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
        fftw_complex *freqspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
-       fftw_plan i12f1 = fftw_plan_dft_2d(w, h, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
-       fftw_plan f12i1 = fftw_plan_dft_2d(w, h, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
-       fftw_plan f22i2 = fftw_plan_dft_2d(w, h, freqspace2, imgspace2, FFTW_BACKWARD, FFTW_ESTIMATE);
+       fftw_plan i12f1 = fftw_plan_dft_2d(h, w, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
+       fftw_plan f12i1 = fftw_plan_dft_2d(h, w, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
+       fftw_plan f22i2 = fftw_plan_dft_2d(h, w, freqspace2, imgspace2, FFTW_BACKWARD, FFTW_ESTIMATE);
 
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
@@ -264,6 +270,8 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale)
                imgspace1[(w*y+x)][0] = (v - 128.0) / 127.0;
                imgspace1[(w*y+x)][1] = 0;
 #endif
+               if(v < 1)
+                       v = 1; /* do not write alpha zero */
                map[(w*y+x)*4+3] = floor(v + 0.5);
        }
 
@@ -348,11 +356,11 @@ void hmap_to_nmap_local(unsigned char *map, int w, int h, int src_chan, double s
        int i, j;
        double *img_reduced = malloc(w*h * sizeof(double));
        static const double filter[3][3] = { /* filter to derive one component */
-               { -1, 0, 1 },
-               { -2, 0, 2 },
-               { -1, 0, 1 }
+               {  -3, 0,  3 },
+               { -10, 0, 10 },
+               {  -3, 0,  3 }
        };
-       static const double filter_mult = 0.125;
+       static const double filter_mult = 0.03125;
 
        for(y = 0; y < h; ++y)
        for(x = 0; x < w; ++x)
@@ -374,6 +382,8 @@ void hmap_to_nmap_local(unsigned char *map, int w, int h, int src_chan, double s
                                break;
                }
                img_reduced[(w*y+x)] = (v - 128.0) / 127.0;
+               if(v < 1)
+                       v = 1; /* do not write alpha zero */
                map[(w*y+x)*4+3] = floor(v + 0.5);
        }
 

diff --git a/misc/tools/rebrand-darkplaces-engine.sh b/misc/tools/rebrand-darkplaces-engine.sh
index 9c785ff432001827f0963752dc9424f42d87401e..0e911bb37ecf750b2f0160e9d8c0faf854827bc4 100755 (executable)
--- a/misc/tools/rebrand-darkplaces-engine.sh
+++ b/misc/tools/rebrand-darkplaces-engine.sh
@@ -10,6 +10,7 @@ userdirname=darkplaces
 icon_icns=Darkplaces.app/Contents/Resources/Darkplaces.icns
 icon_ico=darkplaces.ico
 icon_xpm=darkplaces.xpm
+icons_tga=
 
 if [ -z "$1" ] || [ x"$1" = x"--help" ]; then
        echo "Usage: $0 brandfile binaries..."
@@ -64,8 +65,17 @@ for EXECUTABLE in "$@"; do
 
        if $uses_xpm; then
                cp "$icon_xpm" "$t/darkplaces-icon.xpm"
+               cnt=
+               for i in $icons_tga; do
+                       convert "$i" "$t/darkplaces-icon$cnt.tga"
+                       if [ -z "$cnt" ]; then
+                               cnt=2
+                       else
+                               cnt=$(($cnt+1))
+                       fi
+               done
                cd "$t"
-               zip -9r darkplaces-this.zip darkplaces-icon.xpm
+               zip -9r darkplaces-this.zip darkplaces-icon*
                cd "$d"
        fi
 

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 58e1e75fcc3edf0c1b560f8b22234454a2811caf..e48194f3863c290d77fb29c6cd69f1e30d81c754 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -25,7 +25,7 @@ use File::Temp;
        our $VISFLAGS    = '';
 
        # Default flags for the -light stage
-       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid';
+       our $LIGHTFLAGS  = '-lightmapsearchpower 3 -deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid';
 
        # Default flags for the -minimap stage
        our $MINIMAPFLAGS = '';

diff --git a/misc/tools/xonotic.brand b/misc/tools/xonotic.brand
index 14ac4fc2fa69a6fff9cedad8dc8c823d6fdc6dba..8d9be8db3b920d0865900e27c78344bc5a98b5ca 100644 (file)
--- a/misc/tools/xonotic.brand
+++ b/misc/tools/xonotic.brand
@@ -5,5 +5,6 @@ dirname2=
 screenshotname=xonotic
 userdirname=xonotic
 icon_icns="$d0/misc/logos/icons_icns/xonotic.icns"
-icon_ico="$d0/misc/logos/icons_ico/xonotic_64.ico"
+icon_ico="$d0/misc/logos/icons_ico/xonotic.ico"
 icon_xpm="$d0/misc/logos/icons_xpm/xonotic_32.xpm"
+icons_tga="$d0/misc/logos/icons_png/xonotic_64.png $d0/misc/logos/icons_png/xonotic_16.png $d0/misc/logos/icons_png/xonotic_22.png $d0/misc/logos/icons_png/xonotic_24.png $d0/misc/logos/icons_png/xonotic_32.png $d0/misc/logos/icons_png/xonotic_48.png $d0/misc/logos/icons_png/xonotic_128.png $d0/misc/logos/icons_png/xonotic_256.png $d0/misc/logos/icons_png/xonotic_512.png"