Commit Graph

662 Commits

Author SHA1 Message Date
divverent 5ad75e84a3 16x MAX_EDGE_LINES, MAX_ORIGINAL_EDGES
git-svn-id: svn://svn.icculus.org/netradiant/trunk@186 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-10 18:53:04 +00:00
divverent 36240b8016 Some limits removed by dynamically expanding the arrays using realloc:
-#define        MAX_MAP_MODELS                  0x400
-#define        MAX_MAP_BRUSHES                 0x10000
-#define        MAX_MAP_SHADERS                 0x800           //%     0x400   /* ydnar */
-#define        MAX_MAP_NODES                   0x20000
-#define        MAX_MAP_BRUSHSIDES              0x100000        //%     0x20000 /* ydnar */
-#define        MAX_MAP_LEAFFACES               0x100000        //%     0x20000 /* ydnar */
-#define        MAX_MAP_LEAFBRUSHES             0x40000



git-svn-id: svn://svn.icculus.org/netradiant/trunk@185 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-10 18:37:56 +00:00
divverent 6e3846c8c3 retain _q3map2_version worldspawn tag when using -onlyents
git-svn-id: svn://svn.icculus.org/netradiant/trunk@184 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-10 06:30:50 +00:00
divverent 3aca84b7e5 q3map2: inject the invocation commandline into keys of the worldspawn entity (to allow easier recompiling of the map)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@181 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-02-08 19:35:57 +00:00
divverent e467f40d4a it now compiles on OS X, but does it work?
git-svn-id: svn://svn.icculus.org/netradiant/trunk@169 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-09 22:44:43 +00:00
divverent 11323f121c remove two debug prints
git-svn-id: svn://svn.icculus.org/netradiant/trunk@151 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-06 06:57:49 +00:00
divverent 64d4a06eba new command: regroup entities.
Moves all selected brushes into the selected entity.
Usage:

- Select brush from entity
- Hit Ctrl-Alt-E
- Select some other brush
- Regroup

The other brush will get added to the entity.

- Select brush from entity
- Regroup

The brush will get removed from the entity, and moved to worldspawn.



git-svn-id: svn://svn.icculus.org/netradiant/trunk@147 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-02 08:40:46 +00:00
divverent c75784be71 if an origin brush exists, ALSO take into account the "origin" key (add the two)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@143 61c419a2-8eb2-4b30-bcec-8cead039b335
2009-01-01 12:14:01 +00:00
divverent 17a441b49d bug fix, sorry, mikeeusa... but make dotproduct*scale actually behave the intended way.
In existing shaders, replace

dotProduct2scale ( x y z min max )

by

dotProduct2scale ( x y z max 0 )

because that's what the old code actually caused


git-svn-id: svn://svn.icculus.org/netradiant/trunk@139 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-12-10 15:21:33 +00:00
divverent 1c46929cfd fix a warning; NULL out the unused faces of misc_models (apparently this changes nothing)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@137 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-12-09 14:57:03 +00:00
divverent de31a1ec98 add forgotten dotProductScale
git-svn-id: svn://svn.icculus.org/netradiant/trunk@135 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-12-09 10:35:40 +00:00
rpolzer aed6728816 dirt: don't treat skybox as solid
git-svn-id: svn://svn.icculus.org/netradiant/trunk@133 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-11-28 10:15:18 +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 e9bdda13d3 trivial patch: remove MAX_MAP_DRAW_VERTS limit completely (the code could already cope with it being dynamic)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@128 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-11-18 09:43:25 +00:00
rpolzer d870b21a3a fix buffer overrun on current gcc; there may be more of these
git-svn-id: svn://svn.icculus.org/netradiant/trunk@125 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-11-07 15:47:15 +00:00
rpolzer 434dc7e85c fix if(...)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@121 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-27 12:42:04 +00:00
rpolzer 699b85f2fc q3map2 -convert -format ase -shadersasbitmap option to write shader names in the *BITMAP, to make prefabs that one can easily import as misc_model
git-svn-id: svn://svn.icculus.org/netradiant/trunk@120 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-27 12:07:39 +00:00
rpolzer 0178f5e7c6 fix crash with non-deluxe
git-svn-id: svn://svn.icculus.org/netradiant/trunk@119 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-16 15:46:12 +00:00
rpolzer 72fc8c39f4 Sorry, have to undo the limits raising patch by mikeeusa: it made q3map2 no longer work for even moderately sized maps on Win32 (or any other system where allocating 2GB of RAM is bad).
git-svn-id: svn://svn.icculus.org/netradiant/trunk@118 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-12 13:52:24 +00:00
rpolzer f6b04e0860 deluxe: always use a MINIMUM light contribution from ambient
git-svn-id: svn://svn.icculus.org/netradiant/trunk@117 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-12 13:44:03 +00:00
rpolzer 1f5a43f75d remove beeps, fix -dirt* options complaining about invalud option "2"
git-svn-id: svn://svn.icculus.org/netradiant/trunk@116 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-11 19:42:15 +00:00
rpolzer c74e0a7d61 2x brushes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@114 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-11 08:06:36 +00:00
rpolzer 57fad3ce80 remove sleeps (problem on win32)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@113 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-10-10 17:26:06 +00:00
rpolzer ef9e16cdb9 fix deluxemap when lit from the wrong side as good as possible (by ignoring the deluxemap contribution). now the invariant "deluxemap vector points away from the surface" should hold.
cull none + deluxemapping still is broken by design, but less broken now.


git-svn-id: svn://svn.icculus.org/netradiant/trunk@111 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-30 13:29:31 +00:00
rpolzer 42d241347b fix two deluxemap bugs
git-svn-id: svn://svn.icculus.org/netradiant/trunk@110 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-30 13:07:10 +00:00
rpolzer 3b3f1bd8d1 remove not-normalized deluxemap support again - it did not look any better, still had enough of the usual deluxe drawbacks
git-svn-id: svn://svn.icculus.org/netradiant/trunk@109 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-30 12:20:22 +00:00
rpolzer 58f895572b add missing dimension to dirSample
git-svn-id: svn://svn.icculus.org/netradiant/trunk@108 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-30 12:13:10 +00:00
rpolzer 1692a98147 unparse entities for the intermediate .bsp when bouncing too, so the map is playable (is otherwise problematic when -light adjusted gridsize)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@107 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-26 14:52:03 +00:00
rpolzer d356f3d8d3 fix -nodeluxenormalize
git-svn-id: svn://svn.icculus.org/netradiant/trunk@106 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-26 08:44:14 +00:00
rpolzer aa4914be0f Turn some UT stuff into options, as it is broken for Nexuiz. Also add -nodeluxenormalize as an experimental second deluxemapping option.
+		else if( !strcmp( argv[ i ], "-nodeluxenormalize" ) )
+		else if( !strcmp( argv[ i ], "-trianglecheck" ) )
+		else if( !strcmp( argv[ i ], "-extravisnudge" ) )


git-svn-id: svn://svn.icculus.org/netradiant/trunk@105 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-26 06:48:14 +00:00
rpolzer 81c10be0f4 complain more loudly about wrong compile flags
git-svn-id: svn://svn.icculus.org/netradiant/trunk@104 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-24 07:04:05 +00:00
rpolzer 006e7c75a5 warn warn warn
git-svn-id: svn://svn.icculus.org/netradiant/trunk@103 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-23 19:38:57 +00:00
rpolzer 39c5cf6b5b samplesize warning
git-svn-id: svn://svn.icculus.org/netradiant/trunk@102 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-23 19:36:35 +00:00
rpolzer cd2e34da46 samplesize warning
git-svn-id: svn://svn.icculus.org/netradiant/trunk@101 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-23 19:31:54 +00:00
rpolzer acd3555cae fix dotproduct2
git-svn-id: svn://svn.icculus.org/netradiant/trunk@100 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-23 14:56:52 +00:00
rpolzer a27eb6c180 -minsamplesize
git-svn-id: svn://svn.icculus.org/netradiant/trunk@99 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-22 11:07:44 +00:00
rpolzer 576b0dd959 dotProduct2scale, dotProductScale shader parameters
(two extra args for the min/max of the range to map 0..1 to)


git-svn-id: svn://svn.icculus.org/netradiant/trunk@98 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-22 05:46:42 +00:00
rpolzer e31dd65a78 limits raising patch from mikeeusa
git-svn-id: svn://svn.icculus.org/netradiant/trunk@97 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-21 19:10:39 +00:00
Forest Hale 28bbf5a00b remove some FIXME comments about quakelive paths, since they are the
same as quake3 currently


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@323 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-20 11:12:28 +00:00
Forest Hale f4633277de patch from Rudolf Polzer implementing bsp46 support and adding -game
quakelive and -game nexuiz modes to q3map2


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@322 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-20 11:07:36 +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 4eeb89d4b2 s/GtkRadiant/NetRadiant/
git-svn-id: svn://svn.icculus.org/netradiant/trunk@81 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-17 13:32:43 +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
rpolzer bd60cad453 fix a typo (why hasn't it surfaced before?)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@22 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-15 08:42:11 +00:00
rpolzer 1832b7e473 got rid of libmhash dependency
git-svn-id: svn://svn.icculus.org/netradiant/trunk@21 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-15 08:41:19 +00:00
rpolzer 2fbe76a4a5 add a ChangeLog; remove some Urban Terror debug code
git-svn-id: svn://svn.icculus.org/netradiant/trunk@8 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-14 16:38:35 +00:00
rpolzer f8fd046355 add the branch-manager for q3map2 too
git-svn-id: svn://svn.icculus.org/netradiant/trunk@7 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-14 15:48:21 +00:00
rpolzer 0adc046b42 update version strings
git-svn-id: svn://svn.icculus.org/netradiant/trunk@6 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-13 19:12:02 +00:00
rpolzer 107765f0e4 initial
git-svn-id: svn://svn.icculus.org/netradiant/trunk@1 61c419a2-8eb2-4b30-bcec-8cead039b335
2008-09-13 18:28:57 +00:00
TTimo cc4e44e31a merge branch work back into trunk
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@319 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-01 17:34:10 +00:00
mattn 2c4c4aead7 * fixed missing string for error output
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@314 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-08-25 12:32:29 +00:00
TTimo 2def0428da ABToSVK commit
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant.ab@308 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-08-24 03:20:51 +00:00
Forest Hale 88cea027e6 ported over the 1.5 branch version of q3map2 which is newer
made Visual Studio files work in VS2005 Express
fixed a ton of warnings in VS2005 Express
fixed some compile problems on OpenSUSE 11.0


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@302 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-25 07:31:37 +00:00
TTimo 11f8765db7 MSVC8: change output dir rules to put binaries into install/
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@252 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-04-25 02:17:12 +00:00
TTimo 94199c49dc fix windows compile, it's possible the linux build broke and will need misc tweaks. you need a new GtkR-1.6-deps.zip
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@227 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-03-18 17:47:38 +00:00
TTimo c5ff0803df towards compiling on windows again
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@198 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-02-28 16:47:26 +00:00
TTimo 7a51df0e11 add q3map2 build to scons
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@193 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-01-02 04:47:59 +00:00
TTimo d77fee7551 ...
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant.ab@189 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-11-04 04:08:17 +00:00
TTimo beb511aadb from nxn
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant.ab@188 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-11-04 03:59:18 +00:00
TTimo 2b5ef55c7c more eol-style
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant.ab@187 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-11-04 03:57:33 +00:00
TTimo ab3a99dbbe eol style
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant.ab@184 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-11-04 03:47:06 +00:00
TTimo 8037810110 transfer from internal tree r5311 branches/1.4-gpl
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@177 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-09-12 18:54:28 +00:00