15/12/2006
authornamespace <namespace>
Sat, 16 Dec 2006 18:38:08 +0000 (18:38 +0000)
committernamespace <namespace>
Sat, 16 Dec 2006 18:38:08 +0000 (18:38 +0000)
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

28 files changed:
CHANGES
libs/picomodel/pm_ase.c
radiant/patchmanip.cpp
radiant/radiant.ico
radiant/radiant_old.ico [new file with mode: 0644]
radiant/renderstate.cpp
setup/win32/components/archivepak.xml
setup/win32/components/archivewad.xml
setup/win32/components/archivezip.xml
setup/win32/components/bobtoolz.xml
setup/win32/components/brushexport.xml
setup/win32/components/entityq3.xml
setup/win32/components/gtkradiant.xml
setup/win32/components/imagehl.xml
setup/win32/components/imagem8.xml
setup/win32/components/imagepng.xml
setup/win32/components/imageq2.xml
setup/win32/components/imageq3.xml
setup/win32/components/mapq3.xml
setup/win32/components/mapxml.xml
setup/win32/components/modelmd3.xml
setup/win32/components/modelpico.xml
setup/win32/components/prtview.xml
setup/win32/components/shaderplug.xml
setup/win32/components/shadersq3.xml
setup/win32/components/sunplug.xml
setup/win32/components/vfsq3.xml
setup/win32/gtkradiant-1.5.0.xml

diff --git a/CHANGES b/CHANGES
index a20938a16994a33c7cf909401cd1caf354aa0a46..ac91a100b47f2572a41b5e4379822cf23f042234 100644 (file)
--- 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
index 264bd2b90c7fe88e5cacb7980bcfe892fde7f0d5..985ea8a0fa0e2241191d6c144e78af2ebae79eca 100644 (file)
@@ -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;
             }
           }
index d30cb5682903fede323843d84830142d543ab062..80292238c4290cf38e35cc26277f2ad38f27079e 100644 (file)
@@ -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;
index b45ef36ace4af290cc1bf043fb406fee57614ee1..45e8258ee5d5404cd07ffafbb32e08e36b765e3b 100644 (file)
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 (file)
index 0000000..b45ef36
Binary files /dev/null and b/radiant/radiant_old.ico differ
index db71b2263ada0dcc11ec2c2ac443adb7bb92a330..2f5596d13f23ba14d20860bc0d9d0845b6d61ef5 100644 (file)
@@ -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"))
index 7dd920e1d46a7052237c3506330b971a58ae57cf..edaa0399159190dd15f81cace006683a68fd8acb 100644 (file)
@@ -2,6 +2,5 @@
 <component name="archivepak">
   <dir name="modules">
     <file name="archivepak.dll"/>
-    <file name="archivepak.pdb"/>
   </dir>
 </component>
index 349c31e3253347fad9f8c7619044c31ffbf0ecc4..b9bef749c70e3ee6da9bc4769db06f21665cdd78 100644 (file)
@@ -2,6 +2,5 @@
 <component name="archivewad">
   <dir name="modules">
     <file name="archivewad.dll"/>
-    <file name="archivewad.pdb"/>
   </dir>
 </component>
index 97f5af3382a1271c6e0b46c863a09a0852eabde2..40eb6ee78a975128c2da77713696414a5c9e52ea 100644 (file)
@@ -2,6 +2,5 @@
 <component name="archivezip">
   <dir name="modules">
     <file name="archivezip.dll"/>
-    <file name="archivezip.pdb"/>
   </dir>
 </component>
index 14889bf2fcf767a6f1801ae4130a93865a0e92ef..f48ba12b4c800c8246356d206f604b559ff69aeb 100644 (file)
@@ -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"/>
index 1e4b48f1196a68a4177195802fb141eec36a918a..5c44e8c263fe07a4693a94f4bd7ac117cfbe4afd 100644 (file)
@@ -1,6 +1,5 @@
 <component name="brushexport">
   <dir name="plugins">
     <file name="brushexport.dll"/>
-    <file name="brushexport.pdb"/>
   </dir>
 </component>
index 7a07d774fd566d3605d81a7d709a9973c8a0bcca..903aaca4b88b45c57668baf9d1bc1a2eeb00fcea 100644 (file)
@@ -2,6 +2,5 @@
 <component name="entityq3">
   <dir name="modules">
     <file name="entityq3.dll"/>
-    <file name="entityq3.pdb"/>
   </dir>
 </component>
index 621116041f607a6ca0ec689594f3dcab5c12d31c..60d815ec0a41fc5d049738931e57d11c51e1b833 100644 (file)
@@ -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>
index a7d0428c4cd4d9ad255707657c858dc698943731..1f8a0ee059cd7a37744e9b8285870632fff11e78 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imagehl.dll"/>
-    <file name="imagehl.pdb"/>
   </dir>
 </component>
index bfebe1e80a0c6d6d827e6646a031e7f2990edb94..8c55315ef795e2cab6a495b2b824bed49eaba42f 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imagem8.dll"/>
-    <file name="imagem8.pdb"/>
   </dir>
 </component>
index 35209b68904e0bffdaa515629708dcb1d17ca875..b2d318f3394d062ed7a53d95ce35d92dbf907831 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imagepng.dll"/>
-    <file name="imagepng.pdb"/>
   </dir>
 </component>
index 68f252172e661654ed4b386eaef7d7e89d1d5495..f2353b2fa17f4ee5e09310ee55b300b2e0c5e52b 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imageq2.dll"/>
-    <file name="imageq2.pdb"/>
   </dir>
 </component>
index 6bf4f6edcc365b409412bacba7ecbacf7806e650..9bc54cb8389da8d6a8efd0ce810acbcf0677f009 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="imageq3.dll"/>
-    <file name="imageq3.pdb"/>
   </dir>
 </component>
index 8f851ad4f1b1cd5f2f3455b3f1a80a81a80dcbe7..7a2b42146b405e4ed154b732441de967f8b2779a 100644 (file)
@@ -2,7 +2,6 @@
 <component>
   <dir name="modules">
     <file name="mapq3.dll"/>
-    <file name="mapq3.pdb"/>
   </dir>
 </component>
 
index bc98f0d0c523919963dd3d210a0e656b2414bcc9..5f01e2512c2c76c2880ce0b10f8830087f9caffa 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="mapxml.dll"/>
-    <file name="mapxml.pdb"/>
   </dir>
 </component>
index eaa340eb06aa2c0bf0121482fb0d3e76efd4a041..dad1e37e0a360d10c1137b4829e403d39ad687bd 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="modelmd3.dll"/>
-    <file name="modelmd3.pdb"/>
   </dir>
 </component>
index 31ba1d9cdfa3287d85e68d938c0af3e0df26df25..67e62c323e95010ccd1e5c6d694b132520569c7b 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="modelpico.dll"/>
-    <file name="modelpico.pdb"/>
   </dir>
 </component>
index 47f2c3186d3b7bdcedef14fb71056c6e7b526f1a..40fd2c9303757eaf154d006b6cb48b5dd259889c 100644 (file)
@@ -1,6 +1,5 @@
 <component name="prtview">
   <dir name="plugins">
     <file name="prtview.dll"/>
-    <file name="prtview.pdb"/>
   </dir>
 </component>
index 152a188ed8e9a5ccbfe82b89f901de978efcb12b..a32d816c545e3a1d20ec4ebb68e4c0767d320124 100644 (file)
@@ -1,6 +1,5 @@
 <component name="shaderplug">
   <dir name="plugins">
     <file name="shaderplug.dll"/>
-    <file name="shaderplug.pdb"/>
   </dir>
 </component>
index ddf6da8e12e44d567abb939b8cc2da9f5a033d75..114b21bbb95778444eee1d8021311fd0d1706bf2 100644 (file)
@@ -2,7 +2,6 @@
 <component>
   <dir name="modules">
     <file name="shadersq3.dll"/>
-    <file name="shadersq3.pdb"/>
   </dir>
   <dir name="bitmaps">
     <file name="notex.bmp"/>
index 22d76ac39f383bf1110080c9d6cbbb7720978ea6..9fd915b62a68f8bb4cab16aa77c1323d581e0564 100644 (file)
@@ -1,6 +1,5 @@
 <component name="sunplug">
   <dir name="plugins">
     <file name="sunplug.dll"/>
-    <file name="sunplug.pdb"/>
   </dir>
 </component>
index 9310db34d3e9b43fc025be6b55e184f6f2907c9a..aff6d851b99f1905a77011ce1923532de826f28b 100644 (file)
@@ -2,6 +2,5 @@
 <component>
   <dir name="modules">
     <file name="vfsq3.dll"/>
-    <file name="vfsq3.pdb"/>
   </dir>
 </component>
index e13bdfcc8f89db764ca61eeeede68f57f2ee5833..a480e80208264d57eb59915544b3eb19f3bf0f63 100644 (file)
@@ -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">