From: namespace <namespace>
Date: Sat, 16 Dec 2006 18:38:08 +0000 (+0000)
Subject: 15/12/2006
X-Git-Tag: xonotic-v0.7.0~16^2~12^2~169
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=4dc06d9733c517bfed7d7630cabb3a77c78b42ef

15/12/2006
namespace
 - Inverted bevel can be used with end caps (Topsun)
 - Removed needless .pdb files from win32 installer (Topsun)
 - Fixed .ase picomodel loader to load shaders again (Shaderman)
 - Removed translucent brushes fix because of wrong rendering behaviour on Linux
 - New cool(!) radiant icon by eb



git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@125 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/CHANGES b/CHANGES
index a20938a1..ac91a100 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,16 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+15/12/2006
+namespace
+ - Inverted bevel can be used with end caps (Topsun)
+ - Removed needless .pdb files from win32 installer (Topsun)
+ - Fixed .ase picomodel loader to load shaders again (Shaderman)
+ - Removed translucent brushes fix because of wrong rendering behaviour on Linux
+ - New cool(!) radiant icon by eb
+
 13/12/2006
+namespace
 - Added tremoulus-support to q3map2
 
 08/12/2006
diff --git a/libs/picomodel/pm_ase.c b/libs/picomodel/pm_ase.c
index 264bd2b9..985ea8a0 100644
--- a/libs/picomodel/pm_ase.c
+++ b/libs/picomodel/pm_ase.c
@@ -1125,33 +1125,11 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD )
             }
           }
 
-          /* find game root */
+          /* find shader path */
           for(; *p != '\0'; ++p)
           {
-            if(_pico_strnicmp(p, "quake", 5) == 0 || _pico_strnicmp(p, "doom", 4) == 0)
+            if(_pico_strnicmp(p, "models/", 7) == 0 || _pico_strnicmp(p, "textures/", 9) == 0)
             {
-              /* root-relative */
-              for(; *p != '\0'; ++p)
-              {
-                if(*p == '/')
-                {
-                  ++p;
-                  /* game-relative */
-                  for(; *p != '\0'; ++p)
-                  {
-                    if(*p == '/')
-                    {
-                      ++p;
-                      break;
-                    }
-                  }
-                }
-              }
-            }
-            /* DoomEdit's ASE loader searches for /base/ */
-            else if(_pico_strnicmp(p, "/base/", 6) == 0)
-            {
-              p += 6;
               break;
             }
           }
diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp
index d30cb568..80292238 100644
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -77,7 +77,7 @@ void Patch_makeCaps(Patch& patch, scene::Instance& instance, EPatchCap type, con
     return;
   }
   if((type == eCapBevel || type == eCapIBevel)
-    && patch.getWidth() != 3)
+    && patch.getWidth() != 3 && patch.getWidth() != 5)
   {
     globalErrorStream() << "cannot create bevel-cap - patch width != 3\n";
     return;
diff --git a/radiant/radiant.ico b/radiant/radiant.ico
index b45ef36a..45e8258e 100644
Binary files a/radiant/radiant.ico and b/radiant/radiant.ico differ
diff --git a/radiant/radiant_old.ico b/radiant/radiant_old.ico
new file mode 100644
index 00000000..b45ef36a
Binary files /dev/null and b/radiant/radiant_old.ico differ
diff --git a/radiant/renderstate.cpp b/radiant/renderstate.cpp
index db71b226..2f5596d1 100644
--- a/radiant/renderstate.cpp
+++ b/radiant/renderstate.cpp
@@ -2387,11 +2387,7 @@ void OpenGLShader::construct(const char* name)
       state.m_colour[2] = 0;
       state.m_colour[3] = 0.3f;
       state.m_state = RENDER_FILL|RENDER_DEPTHTEST|RENDER_CULLFACE|RENDER_BLEND|RENDER_COLOURWRITE|RENDER_DEPTHWRITE;
-
-      // The bug "Selecting translucent brushes, such as clip, cause them to disappear leaving
-      // only the red selection box." seems to be fixed by removing the next line.
-
-      // state.m_sort = OpenGLState::eSortHighlight;
+      state.m_sort = OpenGLState::eSortHighlight;
       state.m_depthfunc = GL_LEQUAL;
     }
     else if(string_equal(name+1, "CAM_OVERLAY"))
diff --git a/setup/win32/components/archivepak.xml b/setup/win32/components/archivepak.xml
index 7dd920e1..edaa0399 100644
--- a/setup/win32/components/archivepak.xml
+++ b/setup/win32/components/archivepak.xml
@@ -2,6 +2,5 @@
 <component name="archivepak">
   <dir name="modules">
     <file name="archivepak.dll"/>
-    <file name="archivepak.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/archivewad.xml b/setup/win32/components/archivewad.xml
index 349c31e3..b9bef749 100644
--- a/setup/win32/components/archivewad.xml
+++ b/setup/win32/components/archivewad.xml
@@ -2,6 +2,5 @@
 <component name="archivewad">
   <dir name="modules">
     <file name="archivewad.dll"/>
-    <file name="archivewad.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/archivezip.xml b/setup/win32/components/archivezip.xml
index 97f5af33..40eb6ee7 100644
--- a/setup/win32/components/archivezip.xml
+++ b/setup/win32/components/archivezip.xml
@@ -2,6 +2,5 @@
 <component name="archivezip">
   <dir name="modules">
     <file name="archivezip.dll"/>
-    <file name="archivezip.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/bobtoolz.xml b/setup/win32/components/bobtoolz.xml
index 14889bf2..f48ba12b 100644
--- a/setup/win32/components/bobtoolz.xml
+++ b/setup/win32/components/bobtoolz.xml
@@ -1,7 +1,6 @@
 <component name="bobtoolz">
   <dir name="plugins">
     <file name="bobtoolz.dll"/>
-    <file name="bobtoolz.pdb"/>
       <dir name="bitmaps">
         <file name="bobtoolz_caulk.bmp"/>
         <file name="bobtoolz_cleanup.bmp"/>
diff --git a/setup/win32/components/brushexport.xml b/setup/win32/components/brushexport.xml
index 1e4b48f1..5c44e8c2 100644
--- a/setup/win32/components/brushexport.xml
+++ b/setup/win32/components/brushexport.xml
@@ -1,6 +1,5 @@
 <component name="brushexport">
   <dir name="plugins">
     <file name="brushexport.dll"/>
-    <file name="brushexport.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/entityq3.xml b/setup/win32/components/entityq3.xml
index 7a07d774..903aaca4 100644
--- a/setup/win32/components/entityq3.xml
+++ b/setup/win32/components/entityq3.xml
@@ -2,6 +2,5 @@
 <component name="entityq3">
   <dir name="modules">
     <file name="entityq3.dll"/>
-    <file name="entityq3.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/gtkradiant.xml b/setup/win32/components/gtkradiant.xml
index 62111604..60d815ec 100644
--- a/setup/win32/components/gtkradiant.xml
+++ b/setup/win32/components/gtkradiant.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <component shortcut="GtkRadiant" icon="radiant.ico">
   <file name="GtkRadiant.exe"/>
-  <file name="GtkRadiant.pdb"/>
   <file name="RADIANT_MAJOR"/>
   <file name="RADIANT_MINOR"/>
 </component>
diff --git a/setup/win32/components/imagehl.xml b/setup/win32/components/imagehl.xml
index a7d0428c..1f8a0ee0 100644
--- a/setup/win32/components/imagehl.xml
+++ b/setup/win32/components/imagehl.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imagehl.dll"/>
-    <file name="imagehl.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/imagem8.xml b/setup/win32/components/imagem8.xml
index bfebe1e8..8c55315e 100644
--- a/setup/win32/components/imagem8.xml
+++ b/setup/win32/components/imagem8.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imagem8.dll"/>
-    <file name="imagem8.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/imagepng.xml b/setup/win32/components/imagepng.xml
index 35209b68..b2d318f3 100644
--- a/setup/win32/components/imagepng.xml
+++ b/setup/win32/components/imagepng.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imagepng.dll"/>
-    <file name="imagepng.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/imageq2.xml b/setup/win32/components/imageq2.xml
index 68f25217..f2353b2f 100644
--- a/setup/win32/components/imageq2.xml
+++ b/setup/win32/components/imageq2.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imageq2.dll"/>
-    <file name="imageq2.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/imageq3.xml b/setup/win32/components/imageq3.xml
index 6bf4f6ed..9bc54cb8 100644
--- a/setup/win32/components/imageq3.xml
+++ b/setup/win32/components/imageq3.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imageq3.dll"/>
-    <file name="imageq3.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/mapq3.xml b/setup/win32/components/mapq3.xml
index 8f851ad4..7a2b4214 100644
--- a/setup/win32/components/mapq3.xml
+++ b/setup/win32/components/mapq3.xml
@@ -2,7 +2,6 @@
 <component>
   <dir name="modules">
     <file name="mapq3.dll"/>
-    <file name="mapq3.pdb"/>
   </dir>
 </component>
 
diff --git a/setup/win32/components/mapxml.xml b/setup/win32/components/mapxml.xml
index bc98f0d0..5f01e251 100644
--- a/setup/win32/components/mapxml.xml
+++ b/setup/win32/components/mapxml.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="mapxml.dll"/>
-    <file name="mapxml.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/modelmd3.xml b/setup/win32/components/modelmd3.xml
index eaa340eb..dad1e37e 100644
--- a/setup/win32/components/modelmd3.xml
+++ b/setup/win32/components/modelmd3.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="modelmd3.dll"/>
-    <file name="modelmd3.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/modelpico.xml b/setup/win32/components/modelpico.xml
index 31ba1d9c..67e62c32 100644
--- a/setup/win32/components/modelpico.xml
+++ b/setup/win32/components/modelpico.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="modelpico.dll"/>
-    <file name="modelpico.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/prtview.xml b/setup/win32/components/prtview.xml
index 47f2c318..40fd2c93 100644
--- a/setup/win32/components/prtview.xml
+++ b/setup/win32/components/prtview.xml
@@ -1,6 +1,5 @@
 <component name="prtview">
   <dir name="plugins">
     <file name="prtview.dll"/>
-    <file name="prtview.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/shaderplug.xml b/setup/win32/components/shaderplug.xml
index 152a188e..a32d816c 100644
--- a/setup/win32/components/shaderplug.xml
+++ b/setup/win32/components/shaderplug.xml
@@ -1,6 +1,5 @@
 <component name="shaderplug">
   <dir name="plugins">
     <file name="shaderplug.dll"/>
-    <file name="shaderplug.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/shadersq3.xml b/setup/win32/components/shadersq3.xml
index ddf6da8e..114b21bb 100644
--- a/setup/win32/components/shadersq3.xml
+++ b/setup/win32/components/shadersq3.xml
@@ -2,7 +2,6 @@
 <component>
   <dir name="modules">
     <file name="shadersq3.dll"/>
-    <file name="shadersq3.pdb"/>
   </dir>
   <dir name="bitmaps">
     <file name="notex.bmp"/>
diff --git a/setup/win32/components/sunplug.xml b/setup/win32/components/sunplug.xml
index 22d76ac3..9fd915b6 100644
--- a/setup/win32/components/sunplug.xml
+++ b/setup/win32/components/sunplug.xml
@@ -1,6 +1,5 @@
 <component name="sunplug">
   <dir name="plugins">
     <file name="sunplug.dll"/>
-    <file name="sunplug.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/components/vfsq3.xml b/setup/win32/components/vfsq3.xml
index 9310db34..aff6d851 100644
--- a/setup/win32/components/vfsq3.xml
+++ b/setup/win32/components/vfsq3.xml
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="vfsq3.dll"/>
-    <file name="vfsq3.pdb"/>
   </dir>
 </component>
diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml
index e13bdfcc..a480e802 100644
--- a/setup/win32/gtkradiant-1.5.0.xml
+++ b/setup/win32/gtkradiant-1.5.0.xml
@@ -45,7 +45,7 @@
     <feature name="Brush Export Plugin" desc="namespace's Wavefront Brush Export">
       <component name=".\components\brushexport.xml" root="..\..\install"/>
     </feature>
-    <feature name="Sunplug Plugin" desc="Topsun's Sunplug for Enemy Territory">
+    <feature name="Sunplug Plugin" desc="Toolkit for Enemy Territory by Topsun">
       <component name=".\components\sunplug.xml" root="..\..\install"/>
     </feature>
     <feature name="Shaderplug Plugin" desc="Shaderman's plugin for creating shader tag files">