From 35afb8e83e19ad68aabcbfcf0bbe5cfde1e4881f Mon Sep 17 00:00:00 2001 From: namespace Date: Sat, 3 Mar 2007 18:01:05 +0000 Subject: [PATCH] (THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS) - Fixed weird msvcrt bugs caused by dbghelp.dll - Activated new radiant icon on Linux (Topsun) - First update for installerfiles (Shaderman) - New MODT for q3map2 :) - tiny changes git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@146 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- CHANGES | 9 +++++++++ CONTRIBUTORS | 3 ++- install.py | 3 +-- radiant/GtkRadiant.vcproj | 14 +++++++------- radiant/mainframe.cpp | 2 +- radiant/stacktrace.cpp | 7 ++++++- setup/data/tools/bitmaps/icon.bmp | Bin 630 -> 3126 bytes setup/win32/components/gtk2.xml | 2 +- setup/win32/gtkradiant-1.5.0.xml | 18 +++++++++--------- tools/quake3/q3map2/q3map2.h | 4 ++-- 10 files changed, 38 insertions(+), 24 deletions(-) diff --git a/CHANGES b/CHANGES index ede320a5..4be96159 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,15 @@ This is the changelog for developers, != changelog for the end user that we distribute with the binaries. (see changelog) +03/03/2007 +namespace +(THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS) +- Fixed weird msvcrt bugs caused by dbghelp.dll +- Activated new radiant icon on Linux (Topsun) +- First update for installerfiles (Shaderman) +- New MODT for q3map2 :) +- tiny changes + 28/02/2007 namespace - Radiant is now Vista compatible (Aero must be disabled) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9590febe..664e339d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -8,10 +8,11 @@ Thomas "namespace" Nitschke spam@codecreator.net Stefan "Shaderman" Greven "Topsun" SmallPileofGibs spog@planetquake.com +"Tr3b" Small contributions and improvements for 1.5 -------- -"eb" +Eric "eb" Barth Loki ---- diff --git a/install.py b/install.py index 10960da9..3a2f284f 100644 --- a/install.py +++ b/install.py @@ -111,8 +111,7 @@ copyFileIfExists(libxml2, installRoot) libmhash = os.path.normpath(os.path.join(thisDir, "../mhash-0.9/win32/libmhash/Release/libmhash.dll")) copyFileIfExists(libmhash, installRoot) -msvcr80 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr80.dll")) -copyFileIfExists(msvcr80, installRoot) +copySvn("../msvc_redist", installRoot) dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll")) copyFileIfExists(dbghelp, installRoot) diff --git a/radiant/GtkRadiant.vcproj b/radiant/GtkRadiant.vcproj index 985e6bf3..364fb6b9 100644 --- a/radiant/GtkRadiant.vcproj +++ b/radiant/GtkRadiant.vcproj @@ -70,13 +70,13 @@ /> ContextRecord, outputStream), EXCEPTION_CONTINUE_EXECUTION) {} } +#else +void write_stack_trace(TextOutputStream& outputStream) +{ + outputStream << "\nStacktrace is disabled in release-builds\n"; +} #endif diff --git a/setup/data/tools/bitmaps/icon.bmp b/setup/data/tools/bitmaps/icon.bmp index 4224da83bd4e52d7dbcec18590434482522700b5..e270952b393fa7a60d566fafaea28cba63cdc761 100644 GIT binary patch literal 3126 zcmcJQTS!z<6o$_{*I+O`^k6atnovd$I#^<%RzxusSs57(VsxR4L?}TbK?%_X3CrmE zBvObOb`i_4q%20Jp(3fs5G$z%hp-HKvd>wy+3Xn)XC`KI=FB>4ul=uo{cG=Yiv7On zR&@BdXY=#^{kg1JSPbSp)8r=(%bKtz9A2*Ia2T9KnBa3yVy%-UAXf&qOBN^biN=83 z(R#hGU`dKn0NZ`{_O**mzTDinDdIX+6*6nw)hq^6!QP%Xq5fT!6*&v$^JvWa*Q_?2 zM!-yu=StK0LkIQ;wv}()yh)@`F{}+e?IlGl4pa3<>sFQ&+u#dB0$>>VI`X9Z!Lhnp zq|osJhk!wzC8z3-6EC`{__zkaggw6B`6Dt4+oGj~iV_C;@2ChYT9~6dVcz%XVOK|c zeqNsP#|0NBF$e`8Qc!|gCHT5HcwkOZg9EQIRHO~KNidcqa&X`ef&TnT%@A~ciLKM5O>)y&S8n1mzl|(p@agKMhw3jz<@t$lY&c~ zWrNjJk6_Xxwx3=yjfOlW2sm1ylHg+ykLKA~S?nkbv0>=V$Y9}&v^1S33bPz2?ucBq zcMmNF>gV?ey7G&flOfHaVAK-`sIDq(Z zVi1Ohil9-pu@o8@IKK@I;s;zm_+u+sJG2;eoyHeml?tF`vVB(BTF2?ZIFNUFXj_`wG-8Zvp~@%OKBUginC zdDskaMg+5f0TcaYVE_OC literal 630 zcmbtQK@!3s3=H4{68Hdc^2+c7?|!G}{#-Xem3FKiT!x+OCM3Y^zF2Blz*p=zwxJ86 zGpzK$BJB07 z6Ol&ZV|$oSI-YIv{Tf}1r125l@&eV3!LLV-vVK@QZQm6ngjzy%;1WVnEr?uWC@G>D h*BH7MY5B&Qf1j@fo!|hW_aF6`=hU6B&7Z6mJ^@8kE3g0n diff --git a/setup/win32/components/gtk2.xml b/setup/win32/components/gtk2.xml index 7ffbe5ee..e71720b3 100644 --- a/setup/win32/components/gtk2.xml +++ b/setup/win32/components/gtk2.xml @@ -10,7 +10,7 @@ - + diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml index 941e6d2d..d964a59f 100644 --- a/setup/win32/gtkradiant-1.5.0.xml +++ b/setup/win32/gtkradiant-1.5.0.xml @@ -9,17 +9,17 @@ - - - - - - + + + + + + - + - - + + diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index f91dbaae..9d8dadde 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -35,8 +35,8 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2." /* version */ -#define Q3MAP_VERSION "2.5.16" -#define Q3MAP_MOTD "Voter turnout" +#define Q3MAP_VERSION "2.5.17" +#define Q3MAP_MOTD "Last one turns the lights off" -- 2.39.2