diff --git a/config.py b/config.py index 0d6f9c04..23ee047d 100644 --- a/config.py +++ b/config.py @@ -285,12 +285,6 @@ class Config: if ( self.platform == 'Windows' ): backup_cwd = os.getcwd() for lib_archive in [ -# 'STLport-5.2.1-GtkRadiant.zip', -# 'gtk-bundle-2.24.10-GtkRadiant.zip', -# 'gtk-bundle-2.22.1-win64-GtkRadiant.zip', -# 'jpeg-9-GtkRadiant.zip', -# 'libxml2-2.9.1-GtkRadiant.zip', -# 'gtkglext-1.2.0-3-win32.zip', 'GtkRadiant-libs-vs10.zip' ]: if ( not os.path.exists( lib_archive ) ): @@ -382,6 +376,18 @@ class Config: # ]: # shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' ) + self.CloneBSPC() + + def CloneBSPC( self ): + if ( os.path.exists( 'bspc' ) ): + cmd = [ 'git', 'pull' ] + print( repr( cmd ) ) + subprocess.check_call( cmd, cwd = 'bspc' ) + else: + cmd = [ 'git', 'clone', 'https://github.com/TTimo/bspc.git' ] + print( repr( cmd ) ) + subprocess.check_call( cmd ) + def FinishBuild( self, target, source, env ): print( 'Lookup and bundle the PNG and JPEG libraries' ) # radiant.bin doesn't link to jpeg lib directly, grab that from a module @@ -399,6 +405,10 @@ class Config: jpeg_path = find_library( module_ldd, 'libjpeg' ) print( 'JPEG library: %s' % repr( jpeg_path ) ) + + p = subprocess.Popen( 'ldd -r install/modules/imagepng.so', shell = True, stdout = subprocess.PIPE ) + module_ldd = p.communicate()[0] + png_path = find_library( module_ldd, 'libpng' ) print( 'PNG library: %s' % repr( png_path ) ) diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcxproj b/contrib/bkgrnd2d/bkgrnd2d.vcxproj index 1e6c886f..fa0f5a3d 100644 --- a/contrib/bkgrnd2d/bkgrnd2d.vcxproj +++ b/contrib/bkgrnd2d/bkgrnd2d.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/contrib/bobtoolz/bobtoolz.vcxproj b/contrib/bobtoolz/bobtoolz.vcxproj index 16b51796..99e195e5 100644 --- a/contrib/bobtoolz/bobtoolz.vcxproj +++ b/contrib/bobtoolz/bobtoolz.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {302086A7-5C73-42A4-8591-F5C9336EC911} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/contrib/camera/camera.vcxproj b/contrib/camera/camera.vcxproj index 598e5773..fbd05c26 100644 --- a/contrib/camera/camera.vcxproj +++ b/contrib/camera/camera.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/contrib/gtkgensurf/gtkgensurf.vcxproj b/contrib/gtkgensurf/gtkgensurf.vcxproj index 42edda48..d354492d 100644 --- a/contrib/gtkgensurf/gtkgensurf.vcxproj +++ b/contrib/gtkgensurf/gtkgensurf.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {E37A9846-84FC-48F8-9880-954C5D9F8ED0} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/contrib/hydratoolz/hydratoolz.vcxproj b/contrib/hydratoolz/hydratoolz.vcxproj index 6c925704..1e566afc 100644 --- a/contrib/hydratoolz/hydratoolz.vcxproj +++ b/contrib/hydratoolz/hydratoolz.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {4E63003A-6B5D-4076-8ADF-D5A94809CE32} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/contrib/prtview/prtview.vcxproj b/contrib/prtview/prtview.vcxproj index 968750ca..0f73b0bc 100644 --- a/contrib/prtview/prtview.vcxproj +++ b/contrib/prtview/prtview.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/include/stl_check.h b/include/stl_check.h index 89660091..b08142bd 100644 --- a/include/stl_check.h +++ b/include/stl_check.h @@ -24,6 +24,11 @@ this allows to catch some weird errors early at compile time */ +// TODO: finish complete cleanup and removal of STLPort usage traces +#ifndef Q_NO_STLPORT +#define Q_NO_STLPORT +#endif + #ifdef Q_NO_STLPORT // not using STLPort (gcc 3.x build) diff --git a/include/version.default b/include/version.default index 4bffc9ea..42025646 100644 --- a/include/version.default +++ b/include/version.default @@ -1 +1 @@ -1.6.2 +1.6.5 diff --git a/include/version.h b/include/version.h index 1d6a99cd..85372497 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ // generated header, see makeversion.py -#define RADIANT_VERSION "1.6.4" -#define RADIANT_MINOR_VERSION "4" +#define RADIANT_VERSION "1.6.5" +#define RADIANT_MINOR_VERSION "5" #define RADIANT_MAJOR_VERSION "6" diff --git a/libs/cmdlib/cmdlib.vcxproj b/libs/cmdlib/cmdlib.vcxproj index 22180949..f1e4baf2 100644 --- a/libs/cmdlib/cmdlib.vcxproj +++ b/libs/cmdlib/cmdlib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {0B522841-BDCC-493A-BA5C-604AE2CD5756} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/ddslib/ddslib.vcxproj b/libs/ddslib/ddslib.vcxproj index f485e09d..29bda7f9 100644 --- a/libs/ddslib/ddslib.vcxproj +++ b/libs/ddslib/ddslib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {DDE81BE7-D457-47F3-9762-A838EFA2672E} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/l_net/l_net.vcxproj b/libs/l_net/l_net.vcxproj index 72a0f16f..8f92688a 100644 --- a/libs/l_net/l_net.vcxproj +++ b/libs/l_net/l_net.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {B957BA35-F807-4C84-85A2-C1F9AC56713B} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/mathlib/mathlib.vcxproj b/libs/mathlib/mathlib.vcxproj index 168cd080..c755fc44 100644 --- a/libs/mathlib/mathlib.vcxproj +++ b/libs/mathlib/mathlib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {14734EBB-B167-48D9-9B93-2277F645925F} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/md5lib/md5lib.vcxproj b/libs/md5lib/md5lib.vcxproj index fefcd5ef..6d7e0e46 100644 --- a/libs/md5lib/md5lib.vcxproj +++ b/libs/md5lib/md5lib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {12E69671-B980-4BFF-BC1A-6D9A3C158D16} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj index 31a659a9..f8cb317a 100644 --- a/libs/picomodel/picomodel.vcxproj +++ b/libs/picomodel/picomodel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {818BAC3D-0399-4416-930D-0AA28D55F798} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/splines/splines.vcxproj b/libs/splines/splines.vcxproj index bcd6e0ad..3eda1c0d 100644 --- a/libs/splines/splines.vcxproj +++ b/libs/splines/splines.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {6C1116CE-D99E-4629-9E69-A9329335D706} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/libs/synapse/synapse.vcxproj b/libs/synapse/synapse.vcxproj index 30aed9e3..a9d69bbc 100644 --- a/libs/synapse/synapse.vcxproj +++ b/libs/synapse/synapse.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/plugins/eclassfgd/fgd.vcxproj b/plugins/eclassfgd/fgd.vcxproj index dcd29441..ea2c9620 100644 --- a/plugins/eclassfgd/fgd.vcxproj +++ b/plugins/eclassfgd/fgd.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {04213509-5ED3-4C74-B8A2-480BE6F48363} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/entity/entity.vcxproj b/plugins/entity/entity.vcxproj index 471f88eb..51213a9a 100644 --- a/plugins/entity/entity.vcxproj +++ b/plugins/entity/entity.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {17DD38AA-4842-45BC-9304-2ADC1A12B4F4} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/image/image.vcxproj b/plugins/image/image.vcxproj index 57b17056..e1531f38 100644 --- a/plugins/image/image.vcxproj +++ b/plugins/image/image.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {1F9977F6-216F-4AE1-9928-59B72CF31C46} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/imagehl/imagehl.vcxproj b/plugins/imagehl/imagehl.vcxproj index aa1ee4f8..a91361ef 100644 --- a/plugins/imagehl/imagehl.vcxproj +++ b/plugins/imagehl/imagehl.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {BA1BC409-744B-4270-8E47-BA10872313AD} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/imagem8/imagem8.vcxproj b/plugins/imagem8/imagem8.vcxproj index e69338b1..cc9ac3a2 100644 --- a/plugins/imagem8/imagem8.vcxproj +++ b/plugins/imagem8/imagem8.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/imagepng/imagepng.vcxproj b/plugins/imagepng/imagepng.vcxproj index ce22a1b0..cbbe83dd 100644 --- a/plugins/imagepng/imagepng.vcxproj +++ b/plugins/imagepng/imagepng.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {43C01E60-21CC-49F5-8A11-F460BC866A31} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/imagewal/imagewal.vcxproj b/plugins/imagewal/imagewal.vcxproj index 6e17d69f..2ee7eb51 100644 --- a/plugins/imagewal/imagewal.vcxproj +++ b/plugins/imagewal/imagewal.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {8D3160AB-B386-4970-8146-826BC293CCB1} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/map/map.vcxproj b/plugins/map/map.vcxproj index 479a7b6e..89d36103 100644 --- a/plugins/map/map.vcxproj +++ b/plugins/map/map.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/mapxml/mapxml.vcxproj b/plugins/mapxml/mapxml.vcxproj index b5366e54..00277d10 100644 --- a/plugins/mapxml/mapxml.vcxproj +++ b/plugins/mapxml/mapxml.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {DDBF170A-42DF-4836-9006-816422E08493} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/model/model.vcxproj b/plugins/model/model.vcxproj index a4269b57..85362010 100644 --- a/plugins/model/model.vcxproj +++ b/plugins/model/model.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {83C877DA-17B2-4863-B085-06AE9A8D68F3} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/shaders/shaders.vcxproj b/plugins/shaders/shaders.vcxproj index ccf46301..6a0fa605 100644 --- a/plugins/shaders/shaders.vcxproj +++ b/plugins/shaders/shaders.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {AEBCB950-AB67-48BB-9AF5-FCFB042824E8} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/spritemodel/spritemodel.vcxproj b/plugins/spritemodel/spritemodel.vcxproj index c8c88f3f..d9e31ac5 100644 --- a/plugins/spritemodel/spritemodel.vcxproj +++ b/plugins/spritemodel/spritemodel.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {F291A09D-73BC-48FF-98EE-D672BBDE5C16} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/surface/surface.vcxproj b/plugins/surface/surface.vcxproj index a69e4e1e..1c26c699 100644 --- a/plugins/surface/surface.vcxproj +++ b/plugins/surface/surface.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/surface_idtech2/surface_idtech2.vcxproj b/plugins/surface_idtech2/surface_idtech2.vcxproj index b73a5b43..402289b8 100644 --- a/plugins/surface_idtech2/surface_idtech2.vcxproj +++ b/plugins/surface_idtech2/surface_idtech2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {F400371F-455F-4B6C-9F13-A2E57110E725} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/textool/textool.vcxproj b/plugins/textool/textool.vcxproj index ff6c6450..003aeef1 100644 --- a/plugins/textool/textool.vcxproj +++ b/plugins/textool/textool.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {4F52DED4-285A-4E99-9C78-734D59E8ACD6} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/vfspak/vfspak.vcxproj b/plugins/vfspak/vfspak.vcxproj index 4cea4926..c75caeae 100644 --- a/plugins/vfspak/vfspak.vcxproj +++ b/plugins/vfspak/vfspak.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {8BE599BF-6318-4B0C-AC3E-DE811676C63B} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp index 72ba0b00..df1549e8 100644 --- a/plugins/vfspk3/vfs.cpp +++ b/plugins/vfspk3/vfs.cpp @@ -43,6 +43,7 @@ #include #include +#include #if defined ( __linux__ ) || defined ( __APPLE__ ) #include diff --git a/plugins/vfspk3/vfspk3.vcxproj b/plugins/vfspk3/vfspk3.vcxproj index 41891333..2e1064a9 100644 --- a/plugins/vfspk3/vfspk3.vcxproj +++ b/plugins/vfspk3/vfspk3.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {DEFCF433-3A47-40EB-BBF7-861211C3A941} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/vfsqlpk3/vfsqlpk3.vcxproj b/plugins/vfsqlpk3/vfsqlpk3.vcxproj index d4e85287..f68fc9c1 100644 --- a/plugins/vfsqlpk3/vfsqlpk3.vcxproj +++ b/plugins/vfsqlpk3/vfsqlpk3.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,23 +22,24 @@ {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0} vfsqlpk3 Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/plugins/vfswad/vfswad.vcxproj b/plugins/vfswad/vfswad.vcxproj index 390e01de..abe4ee74 100644 --- a/plugins/vfswad/vfswad.vcxproj +++ b/plugins/vfswad/vfswad.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {18116120-2710-4DD8-B1AC-940D0BDB36EF} Win32Proj + 8.1 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 DynamicLibrary - v100 + v140 DynamicLibrary - v110_xp + v140 diff --git a/radiant/eclass_def.cpp b/radiant/eclass_def.cpp index 82926863..052d7cc4 100644 --- a/radiant/eclass_def.cpp +++ b/radiant/eclass_def.cpp @@ -259,6 +259,12 @@ eclass_t *Eclass_InitFromText( char *text ){ ) { e->nShowFlags |= ECLASS_ANGLE; } + for ( i = 0 ; i < MAX_FLAGS ; i++ ) + { + if ( e->flagnames[i] && e->flagnames[i][0] != 0 && strcmpi( e->flagnames[i], "angle" ) && e->fixedsize ) { + e->nShowFlags |= ECLASS_ANGLE; + } + } if ( strcmpi( e->name, "path" ) == 0 ) { e->nShowFlags |= ECLASS_PATH; } diff --git a/radiant/filters.cpp b/radiant/filters.cpp index 7a59b0e4..f9669cff 100644 --- a/radiant/filters.cpp +++ b/radiant/filters.cpp @@ -139,10 +139,7 @@ bfilter_t *FilterAddBase( bfilter_t *pFilter ){ pFilter = FilterAddImpl( pFilter,1,0,"areaportal",EXCLUDE_AREAPORTALS,true ); pFilter = FilterAddImpl( pFilter,2,QER_TRANS,NULL,EXCLUDE_TRANSLUCENT,true ); pFilter = FilterAddImpl( pFilter,3,0,"trigger",EXCLUDE_TRIGGERS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"misc_model",EXCLUDE_MODELS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"misc_gamemodel",EXCLUDE_MODELS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"misc_model_static",EXCLUDE_MODELS,true ); - pFilter = FilterAddImpl( pFilter,3,0,"model_static",EXCLUDE_MODELS,true ); + pFilter = FilterAddImpl( pFilter,4,ECLASS_MISCMODEL,NULL,EXCLUDE_MODELS,true ); pFilter = FilterAddImpl( pFilter,4,ECLASS_LIGHT,NULL,EXCLUDE_LIGHTS,true ); pFilter = FilterAddImpl( pFilter,4,ECLASS_PATH,NULL,EXCLUDE_PATHS,true ); pFilter = FilterAddImpl( pFilter,1,0,"lightgrid",EXCLUDE_LIGHTGRID,true ); diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index a8be6728..02c27ee5 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -20,7 +20,7 @@ */ // -// Main Window for Q3Radiant +// Main Window for GtkRadiant // // Leonardo Zide (leo@lokigames.com) // @@ -44,7 +44,7 @@ extern "C" { #include "patchdialog.h" #include "filters.h" -// use this to verbose what happens with the beyboard +// use this to verbose what happens with the keyboard #ifdef _DEBUG // #define DBG_KBD #endif @@ -162,15 +162,25 @@ SCommandInfo g_Commands[] = {"CameraStrafeRight", GDK_KEY_period, 0, ID_CAMERA_STRAFERIGHT, "menu_camera_straferight"}, {"CameraStrafeLeft", GDK_KEY_comma, 0, ID_CAMERA_STRAFELEFT, "menu_camera_strafeleft"}, {"ToggleGrid", '0', 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, + {"ToggleGrid", GDK_KP_0, 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, {"SetGrid1", '1', 0, ID_GRID_1, "menu_grid_1"}, + {"SetGrid1", GDK_KP_1, 0, ID_GRID_1, "menu_grid_1"}, {"SetGrid2", '2', 0, ID_GRID_2, "menu_grid_2"}, + {"SetGrid2", GDK_KP_2, 0, ID_GRID_2, "menu_grid_2"}, {"SetGrid4", '3', 0, ID_GRID_4, "menu_grid_4"}, + {"SetGrid4", GDK_KP_3, 0, ID_GRID_4, "menu_grid_4"}, {"SetGrid8", '4', 0, ID_GRID_8, "menu_grid_8"}, + {"SetGrid8", GDK_KP_4, 0, ID_GRID_8, "menu_grid_8"}, {"SetGrid16", '5', 0, ID_GRID_16, "menu_grid_16"}, + {"SetGrid16", GDK_KP_5, 0, ID_GRID_16, "menu_grid_16"}, {"SetGrid32", '6', 0, ID_GRID_32, "menu_grid_32"}, + {"SetGrid32", GDK_KP_6, 0, ID_GRID_32, "menu_grid_32"}, {"SetGrid64", '7', 0, ID_GRID_64, "menu_grid_64"}, + {"SetGrid64", GDK_KP_7, 0, ID_GRID_64, "menu_grid_64"}, {"SetGrid128", '8', 0, ID_GRID_128, "menu_grid_128"}, + {"SetGrid128", GDK_KP_8, 0, ID_GRID_128, "menu_grid_128"}, {"SetGrid256", '9', 0, ID_GRID_256, "menu_grid_256"}, + {"SetGrid256", GDK_KP_9, 0, ID_GRID_256, "menu_grid_256"}, {"DragEdges", 'E', 0, ID_SELECTION_DRAGEDGES, "menu_selection_dragedges"}, {"DragVertices", 'V', 0, ID_SELECTION_DRAGVERTECIES, "menu_selection_dragvertecies"}, {"ViewEntityInfo", 'N', 0, ID_VIEW_ENTITY, "menu_view_entity"}, @@ -258,16 +268,26 @@ SCommandInfo g_Commands[] = {"Sleep", 'P', 0x05, ID_FILE_SLEEP, "menu_file_sleep"}, {"SimplePatchMesh", 'P', 0x01, ID_CURVE_SIMPLEPATCHMESH, "menu_simplepatchmesh"}, {"FilterWorldBrushes", '1', RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, + {"FilterWorldBrushes", GDK_KP_1, RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, {"FilterEntities", '2', RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, + {"FilterEntities", GDK_KP_2, RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, {"FilterAreaportals", '3', RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, + {"FilterAreaportals", GDK_KP_3, RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, {"FilterTranslucent", '4', RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, + {"FilterTranslucent", GDK_KP_4, RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, {"FilterLiquids", '5', RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, + {"FilterLiquids", GDK_KP_5, RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, {"FilterCaulk", '6', RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, + {"FilterCaulk", GDK_KP_6, RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, {"FilterClips", '7', RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, + {"FilterClips", GDK_KP_7, RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, {"FilterBotClips", 'M', RAD_ALT, ID_FILTER_BOTCLIPS, "menu_filter_botclips"}, {"FilterPaths", '8', RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, + {"FilterPaths", GDK_KP_8, RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, {"FilterClusterportals", '9', RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, + {"FilterClusterportals", GDK_KP_9, RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, {"FilterLights", '0', RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, + {"FilterLights", GDK_KP_0, RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, {"FilterPatches", 'P', RAD_CONTROL, ID_FILTER_PATCHES, "menu_filter_patches"}, {"FilterDetails", 'D', RAD_CONTROL, ID_FILTER_DETAILS, "menu_filter_details"}, {"FilterStructural", 'D', RAD_CONTROL | RAD_SHIFT, ID_FILTER_STRUCTURAL, "menu_filter_structural"}, @@ -2630,6 +2650,7 @@ void MainFrame::Create(){ MRU_Load(); create_main_toolbar( window, vbox ); create_plugin_toolbar( window,vbox ); + create_main_statusbar( window, vbox ); m_nCurrentStyle = g_PrefsDlg.m_nView; @@ -2760,7 +2781,7 @@ void MainFrame::Create(){ } } - gtk_paned_set_position( GTK_PANED( m_pSplits[0] ), g_PrefsDlg.mWindowInfo.nXYHeight + 28 ); + gtk_paned_set_position( GTK_PANED( m_pSplits[0] ), g_PrefsDlg.mWindowInfo.nXYHeight ); if ( CurrentStyle() == eRegular ) { gtk_paned_set_position( GTK_PANED( m_pSplits[2] ), g_PrefsDlg.mWindowInfo.nZWidth ); @@ -3069,8 +3090,6 @@ void MainFrame::Create(){ g_pParentWnd->OnEntitiesSetViewAs( 0 ); - create_main_statusbar( window, vbox ); - LoadCommandMap(); ShowMenuItemKeyBindings( window ); diff --git a/radiant/radiant.vcxproj b/radiant/radiant.vcxproj index ea4a4b43..16372539 100644 --- a/radiant/radiant.vcxproj +++ b/radiant/radiant.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {65D02375-63EE-4A8A-9F8E-504B1D5A1D02} Win32Proj + 8.1 Application - v100 + v140 Application - v110_xp + v140 Application - v100 + v140 Application - v110_xp + v140 diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj index 0b73dcd6..f1ad5577 100644 --- a/tools/quake3/common/quake3-common.vcxproj +++ b/tools/quake3/common/quake3-common.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} Win32Proj + 8.1 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 StaticLibrary - v100 + v140 StaticLibrary - v110_xp + v140 diff --git a/tools/quake3/q3data/q3data.vcxproj b/tools/quake3/q3data/q3data.vcxproj index 6b5a57fc..788c6bd6 100644 --- a/tools/quake3/q3data/q3data.vcxproj +++ b/tools/quake3/q3data/q3data.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,28 +21,29 @@ {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB} q3data + 8.1 Application - v100 + v140 MultiByte true Application - v110_xp + v140 MultiByte true Application - v100 + v140 MultiByte Application - v110_xp + v140 MultiByte diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 71cce994..087e68eb 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -338,7 +338,11 @@ extern int unz_GAME_QL; #define MAX_MAP_PORTALS 0x20000 #define MAX_MAP_LIGHTING 0x800000 #define MAX_MAP_LIGHTGRID 0x100000 //% 0x800000 /* ydnar: set to points, not bytes */ -#define MAX_MAP_VISIBILITY 0x200000 + +// some recent QL maps have started hitting the limit (old value was 0x200000). QBall +// below has been 'borrowed' from the netradiant fork +#define MAX_MAP_VISCLUSTERS 0x4000 // <= MAX_MAP_LEAFS +#define MAX_MAP_VISIBILITY ( VIS_HEADER_SIZE + MAX_MAP_VISCLUSTERS * ( ( ( MAX_MAP_VISCLUSTERS + 63 ) & ~63 ) >> 3 ) ) #define MAX_MAP_DRAW_SURFS 0x20000 #define MAX_MAP_DRAW_VERTS 0x100000 diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 4a67d83b..434806f5 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,23 +21,24 @@ {CD40B764-1D47-4FAE-8C6A-EF036E478D65} Win32Proj + 8.1 Application - v100 + v140 Application - v110_xp + v140 Application - v100 + v140 Application - v110_xp + v140 diff --git a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj index 466dab83..8e87792e 100644 --- a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj +++ b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,29 +21,30 @@ {7AF7537E-94C3-4680-8F5E-C1CE30DC2041} q3map2 + 8.1 Application - v100 + v140 false MultiByte Application - v110_xp + v140 false MultiByte Application - v100 + v140 false MultiByte Application - v110_xp + v140 false MultiByte