Commit Graph

87 Commits

Author SHA1 Message Date
michaelb 1f0271a988 fix invalid use of <glib/...> headers 2012-04-09 09:44:35 +02:00
Rudolf Polzer e4287c28bb my own uncrustify run 2012-03-27 12:03:21 +02:00
Rudolf Polzer 203343b01a remove an useless vcproj 2012-03-27 11:45:55 +02:00
Rudolf Polzer 231225d6f9 Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'
Conflicts:
	.gitignore
	COMPILING
	CONTRIBUTORS
	ChangeLog
	DoxyConfig
	Doxyfile
	Doxygen_files/Doxyfile
	Doxygen_files/doxy_mainpage.h
	Doxygen_files/doxygen_gtkradiant_foot.html
	Doxygen_files/doxygen_gtkradiant_head.html
	Doxygen_files/doxygen_index.html
	Doxygen_files/doxygen_reference_foot.html
	Doxygen_files/doxygen_reference_head.html
	Doxygen_files/example/annotated.html
	Doxygen_files/example/classIEpair-members.html
	Doxygen_files/example/classIEpair.html
	Doxygen_files/example/classes.html
	Doxygen_files/example/files.html
	Doxygen_files/example/functions.html
	Doxygen_files/example/graph_legend.dot
	Doxygen_files/example/graph_legend.html
	Doxygen_files/example/index.html
	Doxygen_files/example/pages.html
	Doxygen_files/example/test_8c-source.html
	Doxygen_files/example/test_8c.html
	Doxygen_files/example/todo.html
	Doxygen_files/genDoxyfile
	Doxygen_files/gendoxfunctions
	Doxygen_files/reference1.html
	README.doxygen
	SConscript.q3map2
	SConscript.radiant
	TODO
	config.py
	contrib/bkgrnd2d/bkgrnd2d.vcproj
	contrib/bobtoolz/bobtoolz.vcproj
	contrib/camera/camera.vcproj
	contrib/gtkgensurf/gtkgensurf.vcproj
	contrib/hydratoolz/hydratoolz.vcproj
	contrib/prtview/prtview.vcproj
	contrib/ufoai/ufoai.vcproj
	gen.readme
	gendox
	libs/picomodel/picomodules.c
	plugins/eclassfgd/fgd.vcproj
	plugins/entity/entity.vcproj
	plugins/image/image.vcproj
	plugins/imagem8/imagem8.vcproj
	plugins/imagepng/imagepng.vcproj
	plugins/imagewal/imagewal.vcproj
	plugins/map/map.vcproj
	plugins/mapxml/mapxml.vcproj
	plugins/model/model.vcproj
	plugins/shaders/shaders.vcproj
	plugins/spritemodel/spritemodel.vcproj
	plugins/surface/surface.vcproj
	plugins/surface_heretic2/surface_heretic2.vcproj
	plugins/surface_quake2/surface_quake2.vcproj
	plugins/surface_ufoai/surface_ufoai.vcproj
	plugins/textool/textool.vcproj
	plugins/vfspak/vfspak.vcproj
	plugins/vfspk3/vfspk3.vcproj
	plugins/vfswad/vfswad.vcproj
	radiant.sln
	radiant/main.cpp
	radiant/mainframe.cpp
	radiant/preferences.cpp
	radiant/preferences.h
	radiant/radiant.vcproj
	setup/data/tools/plugins/bt/bt-el2.txt
	tools/quake3/q3map2/main.c
	tools/quake3/q3map2/q3map2.vcproj
	windows_compile_guide/index.html
2012-03-27 11:43:50 +02:00
Rudolf Polzer 747e474c40 remove internal libjpeg6 copy (patch by monad) 2012-03-01 10:24:29 +01:00
Rudolf Polzer 898cef614c fix type cast 2012-01-23 18:18:01 +01:00
Rudolf Polzer 76ed4634ec fix a typo in auto map type detection 2011-11-12 12:31:33 +01:00
Rudolf Polzer db1787bbfa handle forbidden dir exclusions properly now 2011-07-01 12:49:31 +02:00
Rudolf Polzer 636baaba0f more compile fail 2011-07-01 12:18:32 +02:00
Rudolf Polzer c75ae4296b forbidden dirs: allow wildcard patterns 2011-07-01 11:27:15 +02:00
rambetter 88f8603d62 8MB stack size linker options on all VC2008 proj files.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@485 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-06 04:12:34 +00:00
rambetter 33da149be0 Backing out commit 483. Going to set linker flags instead.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@484 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-06 04:08:22 +00:00
rambetter e39f6f4bae Increasing stack size on Windows build.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@483 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-06 03:56:18 +00:00
rambetter 8d530e8707 - Updated Windows build doc, very slight revision. Changed 37 targets to 38.
- Added plugins/imagehl to list of modules built (both	Windows and Linux).
    Not	really sure what this does, but it's the only module (as defined by
    stuff in plugins/ or contrib/) that exists and isn't currently part of the
    build.
- The code to disable desktop composition in Windows has been moved from start
    of main() to an option in Preferences.  The	pref reads as follows:
    "NVIDIA/Aero bug - disable Windows composition".  It is enabled by default.
- Color themes controlled by "Misc" -> "Colors" -> "Themes" options are now
    saved as soon as you select them.  The color theme is no longer clobbered
    when opening Preferences.
- The ATI broken driver (bug #802) pref has been reworded since it applies to
    Intel cards as well.  Before:
    "ATI cards with broken drivers - bug #802".  After:
    "ATI and Intel cards w/ buggy drivers (disappearing polygons)".


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@479 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-03-03 15:51:44 +00:00
rambetter 48410b113d Fixing Linux SCons build.
Fixing plugins on both Linux and Windows.  It's consistent now.
Fixing gl font on Windows.
Mostly, added lots of plugins.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@474 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-22 04:48:05 +00:00
rambetter 561e062c87 This is a major change that updates the 3rd party libs on Windows builds.
A couple of things are broken right now:
- OpenGL font in Windows not appearing (expected to be broken, will fix)
- Linux build broken because it loads some .vcproj files that are removed
- 3rd party libs are downloaded from porky.nerius.com, not id Software


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@473 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-21 14:37:49 +00:00
TTimo a6e2bf8e2d misc project file fixes from trunk (e.g. rev 345). fixes the 'missing MSVCR90.DLL' absurdity
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@357 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-24 19:04:32 +00:00
rambetter 7f2f9610ba Backing out r347 and r345. Keeping r346.
So, this branch is now r344 with patch r346.
DO NOT MERGE THIS CHANGE INTO TRUNK!!!!


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@349 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-15 06:56:33 +00:00
TTimo 7c46911658 rebuilt gtk binary dependencies file
fixed/optimized a number of VC9 project settings
fixed sprintf being hijacked by intl.dll stuff


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@345 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-13 04:21:05 +00:00
Rudolf Polzer 7a0665f156 automatically run the decompiler when specifying a BSP file in Import... 2010-10-10 16:04:41 +02:00
Rudolf Polzer 2b0a97c814 somewhat unclean code, sorry... but it allows opening brushPrimitives maps in nonBrushPrimitives mode (experimental) by temp toggling to the correct mode 2010-10-10 10:47:16 +02:00
Rudolf Polzer 551d4434f8 detect the wrong type Q3 format by a different error message when loading 2010-10-10 10:05:17 +02:00
rpolzer c34227108a make radiant compile again 2010-10-05 11:05:24 +02:00
Rudolf Polzer 0a784ea439 remove some stupid debug prints 2010-08-11 07:58:19 +02:00
Rudolf Polzer 9ca6835a26 vfspk3 in q3map2: also support -fs_forbiddenpath 2010-08-07 17:32:57 +02:00
Rudolf Polzer 51728689fe support "forbidden directories" (i.e. dirs excluded from radiant) 2010-08-07 17:19:47 +02:00
Rudolf Polzer 062ff7a05f Merge remote branch 'refs/remotes/origin/parasti/fix-grayscale-png' 2010-08-04 14:01:54 +02:00
Rudolf Polzer 6d93f0d7d9 fix path trimming involving pk3dirs 2010-08-02 14:41:22 +02:00
Jānis Rūcis 048cdb6eb2 Fix/add grayscale-to-RGB in PNG loader 2010-07-31 00:27:43 +03:00
Rudolf Polzer 49908637c3 turn lights by 45 degrees to make them look the same in all 3 2D views 2010-07-30 16:02:23 +02:00
Jānis Rūcis 5dafde957a When connecting entities, don't reuse the target field to name the entity
If an entity already has a target field, chances are that the targeted
entity still exists and the mapper will just get a naming collision.
2010-07-14 04:41:03 +03:00
Rudolf Polzer 0138fccfb8 allow 64 directories, no longer 8 2010-06-24 12:27:26 +02:00
Rudolf Polzer 93f9dc354f support misc_*model as misc_model in the radiant editor (way more convenient) 2010-06-04 20:57:00 +02:00
Jānis Rūcis f86f8d9e29 Concat all found shaderlist.txt files to build the shader list 2010-05-30 00:09:35 +03:00
Rudolf Polzer e40ea7c332 vfs: support .pk3dir like in darkplaces engine - directories auto-added to the search path 2010-03-19 14:55:47 +01:00
Rudolf Polzer 6255d00622 support "angles" key in generic entities 2010-02-11 10:33:37 +01:00
Rudolf Polzer c6252fe3fc add a feature shift-k to assign killtarget, not target like ctrl-k 2010-02-08 16:41:55 +01:00
Rudolf Polzer c1b0348878 try making it work with newer libpng 2010-02-05 12:34:56 +01:00
TTimo 48d505dff5 textool fix (Markus Fischer)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@331 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-01-02 16:03:41 +00:00
TTimo c14eb495aa misc
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@330 8a3a26a2-13c4-0310-b231-cf6edde360e5
2009-12-31 18:50:00 +00:00
TTimo a54ff4a83e apply misc fixes from Markus Fischer and Rambetter
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@329 8a3a26a2-13c4-0310-b231-cf6edde360e5
2009-12-31 18:45:35 +00:00
divverent bc68966c60 fix zip file warnings
git-svn-id: svn://svn.icculus.org/netradiant/trunk@393 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-07-26 15:51:46 +00:00
divverent 469e4fc146 fix MD3 model entities crash on OS X (by renaming a class; apparently something weird happens when a class name is used twice)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@201 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-03-04 07:06:05 +00:00
divverent f85ed10a52 use "%f" format for angles, prevents weird exponential stuff
git-svn-id: svn://svn.icculus.org/netradiant/trunk@172 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-14 08:06:09 +00:00
divverent a79c1a21aa support the "origin" key for display in radiant too
git-svn-id: svn://svn.icculus.org/netradiant/trunk@144 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-01 13:05:17 +00:00
rpolzer 7077b12d7d Some not THAT memory demanding limits extension;
use right file name when looking for .mtl


git-svn-id: svn://svn.icculus.org/netradiant/trunk@129 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-11-20 14:25:50 +00:00
rpolzer df486c66bb support "target2" etc. name keys for Q3A maps too
git-svn-id: svn://svn.icculus.org/netradiant/trunk@127 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-11-10 15:54:59 +00:00
rpolzer 3c8d97704b fix OpenGL erorr bug on XP software renderer; use svn:ignore
git-svn-id: svn://svn.icculus.org/netradiant/trunk@85 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-18 06:57:13 +00:00
rpolzer 2978848a28 remove two more unnecessary project files
git-svn-id: svn://svn.icculus.org/netradiant/trunk@84 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 14:06:28 +00:00
rpolzer 5ad1e19406 the historic move: getting rid of all visual studio project stuff, now that the mingw build works
git-svn-id: svn://svn.icculus.org/netradiant/trunk@56 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-16 08:15:52 +00:00