diff --git a/CHANGES b/CHANGES index a20938a..ac91a10 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 264bd2b..985ea8a 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 d30cb56..8029223 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 b45ef36..45e8258 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 0000000..b45ef36 Binary files /dev/null and b/radiant/radiant_old.ico differ diff --git a/radiant/renderstate.cpp b/radiant/renderstate.cpp index db71b22..2f5596d 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 7dd920e..edaa039 100644 --- a/setup/win32/components/archivepak.xml +++ b/setup/win32/components/archivepak.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/archivewad.xml b/setup/win32/components/archivewad.xml index 349c31e..b9bef74 100644 --- a/setup/win32/components/archivewad.xml +++ b/setup/win32/components/archivewad.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/archivezip.xml b/setup/win32/components/archivezip.xml index 97f5af3..40eb6ee 100644 --- a/setup/win32/components/archivezip.xml +++ b/setup/win32/components/archivezip.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/bobtoolz.xml b/setup/win32/components/bobtoolz.xml index 14889bf..f48ba12 100644 --- a/setup/win32/components/bobtoolz.xml +++ b/setup/win32/components/bobtoolz.xml @@ -1,7 +1,6 @@ - diff --git a/setup/win32/components/brushexport.xml b/setup/win32/components/brushexport.xml index 1e4b48f..5c44e8c 100644 --- a/setup/win32/components/brushexport.xml +++ b/setup/win32/components/brushexport.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/entityq3.xml b/setup/win32/components/entityq3.xml index 7a07d77..903aaca 100644 --- a/setup/win32/components/entityq3.xml +++ b/setup/win32/components/entityq3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/gtkradiant.xml b/setup/win32/components/gtkradiant.xml index 6211160..60d815e 100644 --- a/setup/win32/components/gtkradiant.xml +++ b/setup/win32/components/gtkradiant.xml @@ -1,7 +1,6 @@ - diff --git a/setup/win32/components/imagehl.xml b/setup/win32/components/imagehl.xml index a7d0428..1f8a0ee 100644 --- a/setup/win32/components/imagehl.xml +++ b/setup/win32/components/imagehl.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imagem8.xml b/setup/win32/components/imagem8.xml index bfebe1e..8c55315 100644 --- a/setup/win32/components/imagem8.xml +++ b/setup/win32/components/imagem8.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imagepng.xml b/setup/win32/components/imagepng.xml index 35209b6..b2d318f 100644 --- a/setup/win32/components/imagepng.xml +++ b/setup/win32/components/imagepng.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imageq2.xml b/setup/win32/components/imageq2.xml index 68f2521..f2353b2 100644 --- a/setup/win32/components/imageq2.xml +++ b/setup/win32/components/imageq2.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imageq3.xml b/setup/win32/components/imageq3.xml index 6bf4f6e..9bc54cb 100644 --- a/setup/win32/components/imageq3.xml +++ b/setup/win32/components/imageq3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/mapq3.xml b/setup/win32/components/mapq3.xml index 8f851ad..7a2b421 100644 --- a/setup/win32/components/mapq3.xml +++ b/setup/win32/components/mapq3.xml @@ -2,7 +2,6 @@ - diff --git a/setup/win32/components/mapxml.xml b/setup/win32/components/mapxml.xml index bc98f0d..5f01e25 100644 --- a/setup/win32/components/mapxml.xml +++ b/setup/win32/components/mapxml.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/modelmd3.xml b/setup/win32/components/modelmd3.xml index eaa340e..dad1e37 100644 --- a/setup/win32/components/modelmd3.xml +++ b/setup/win32/components/modelmd3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/modelpico.xml b/setup/win32/components/modelpico.xml index 31ba1d9..67e62c3 100644 --- a/setup/win32/components/modelpico.xml +++ b/setup/win32/components/modelpico.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/prtview.xml b/setup/win32/components/prtview.xml index 47f2c31..40fd2c9 100644 --- a/setup/win32/components/prtview.xml +++ b/setup/win32/components/prtview.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/shaderplug.xml b/setup/win32/components/shaderplug.xml index 152a188..a32d816 100644 --- a/setup/win32/components/shaderplug.xml +++ b/setup/win32/components/shaderplug.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/shadersq3.xml b/setup/win32/components/shadersq3.xml index ddf6da8..114b21b 100644 --- a/setup/win32/components/shadersq3.xml +++ b/setup/win32/components/shadersq3.xml @@ -2,7 +2,6 @@ - diff --git a/setup/win32/components/sunplug.xml b/setup/win32/components/sunplug.xml index 22d76ac..9fd915b 100644 --- a/setup/win32/components/sunplug.xml +++ b/setup/win32/components/sunplug.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/vfsq3.xml b/setup/win32/components/vfsq3.xml index 9310db3..aff6d85 100644 --- a/setup/win32/components/vfsq3.xml +++ b/setup/win32/components/vfsq3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml index e13bdfc..a480e80 100644 --- a/setup/win32/gtkradiant-1.5.0.xml +++ b/setup/win32/gtkradiant-1.5.0.xml @@ -45,7 +45,7 @@ - +