Commit graph

210 commits

Author SHA1 Message Date
Timothee Besset
e08d6b6429 Visual Studio 2017. Fixed q3map2_urt 64 bit compilation also. 2018-01-21 14:47:06 -06:00
Thomas Köppe
ec0907f7ca Use standard "offsetof" facility rather than manual code involving null pointer dereferences. 2018-01-21 01:54:24 +00:00
Timothee "TTimo" Besset
3c49dd161d
Merge pull request #576 from tkoeppe/bugfixes
Bugfixes in sciptlib.c and map.c
2018-01-20 15:35:53 -06:00
Timothee "TTimo" Besset
61d14dfd10
Merge pull request #578 from Pan7/donotalias
Extra donotenterlarge surfaceparm for nonotenterlarge
2018-01-16 08:59:54 -06:00
Pan
911d5562f6 Extra donotenterlarge surfaceparm for nonotenterlarge 2018-01-16 13:12:13 +01:00
Thomas Köppe
760623150e [q3map2] Unwind script stack in case of script loading error.
Also avoid type punning read into char* variable (even though char* and void* happen to be layout-compatible).
2018-01-08 15:18:40 +00:00
Thomas Köppe
606d72adf2 [q3map2] Fix errnoneous plane access if plane was not found 2018-01-08 15:17:58 +00:00
Thomas Debesse
da38f7754c [q3map2] reduce diff noise with netradiant tree 2018-01-07 21:16:53 +01:00
neumond
eee8d14261 q3map2: Add -game unvanquished 2018-01-07 21:16:53 +01:00
Thomas Debesse
c99c1abd9b [q3map2] import pk3dir/dpk/dpkdir support from netradiant
- load every pk3dir/dpkdir as VFS
- increase VFS_MAXDIR
- dpk/dpkdir is not versionned yet
2018-01-07 21:09:52 +01:00
Timothee "TTimo" Besset
94849adc93
Merge pull request #534 from illwieckz/noradiosity
Proper working with noradiosity 1 lights
2018-01-07 13:06:03 -06:00
Timothee "TTimo" Besset
fe4fbe25a8
Merge pull request #568 from rsfbarreira/patch-1
Fix undefined behavior in FreeStackWinding
2018-01-07 13:01:27 -06:00
Ricardo Barreira
5e308f9056
Fix undefined behavior in FreeStackWinding
Fix subtraction of unrelated pointers and integer overflow in FreeStackWinding (both are undefined behavior).

In rare cases "i" would non-deterministically be between 0 and 2 even though the
pointers were in unrelated addresses, which caused a spurious free of one of
the three windings - eventually the real free would happen, be detected as a
double free and an exit(1) would ensue.

Example contents of w and stack->windings that triggered this in a test: 0xa9251c0 0x7f440a924f78

Checking for pointer equality makes the behavior defined and correct: http://port70.net/~nsz/c/c99/n1256.html#6.5.9
2017-10-31 13:05:32 +00:00
Thomas Debesse
9f595b664b preproc: FreeBSD also provides pthread 2017-08-31 00:45:24 +02:00
Thomas Debesse
a3773852a4 preproc: add a FreeBSD condition everytime there is Linux or MacOS 2017-08-30 14:20:01 +00:00
Timothee Besset
3a6c9d30ed fix compile warning 2017-08-20 15:46:40 -05:00
Timothee Besset
156fc19c13 fix warning 2017-08-20 15:04:49 -05:00
Pan7
b2c2c8d378 Q3data: Fix warning format %d expects argument of type int 2017-08-19 03:21:29 +02:00
Pan7
d1c1de1253 Q3data: Fix warning passing unsigned short * to parameter of type short * 2017-08-18 20:00:41 +02:00
Pan7
16d42f3e64 Merge pull request #551 from Pan7/fixq3data2
Q3data: Fix warning variable shortestSide is used uninitialized
2017-08-18 12:08:02 +02:00
Pan7
91f2e55b1a Merge pull request #553 from Pan7/fixq3data4
Q3data: Fix warning variable psets is used uninitialized
2017-08-18 12:07:31 +02:00
Pan7
93ec80ed9a Merge pull request #554 from Pan7/fixq3data5
Q3data: Fix warning incompatible pointer types passing
2017-08-18 12:07:06 +02:00
Pan7
e40228629e Merge pull request #552 from Pan7/fixq3data3
Q3data: Fix warning format specifies type int but the argument has ty…
2017-08-18 12:06:12 +02:00
Pan7
a9e28b5507 Fix warning variable bcHeight is used uninitialized 2017-08-18 02:18:31 +02:00
Pan7
af45a9d65c Q3data: Fix warning incompatible pointer types passing 2017-08-16 16:29:45 +02:00
Pan7
465cb3ce3f Q3data: Fix warning variable psets is used uninitialized 2017-08-15 22:21:05 +02:00
Pan7
614f97d425 Q3data: Fix warning format specifies type int but the argument has type long 2017-08-15 22:04:30 +02:00
Pan7
fc7e215e80 Q3data: Fix warning variable shortestSide is used uninitialized 2017-08-15 22:02:16 +02:00
Pan7
7a936d6832 Fix g_ascii_strdown usage 2017-08-08 01:24:41 +02:00
neumond
89c8c7355d Proper working with noradiosity 1 lights 2017-08-06 02:31:22 +02:00
Timothee "TTimo" Besset
4d2404df86 Merge pull request #529 from Pan7/fixStrdownWarn
Fix warning g_strdown is deprecated
2017-08-05 11:34:51 -05:00
Pan7
6acfd910ae Fix warning g_strdown is deprecated 2017-07-11 23:08:05 +02:00
Pan7
2398bd71a2 Fix warning implicit declaration of function 2017-07-11 22:24:07 +02:00
Timothee "TTimo" Besset
578fd09625 Merge pull request #526 from Pan7/fixAddWarn
Fix warning variable add is used uninitialized
2017-07-11 10:35:16 +02:00
Pan7
714cc90ce7 Fix warning variable add is used uninitialized 2017-07-10 15:30:04 +02:00
Pan7
a8925cbedb Fix xml passing to parameter warnings 2017-07-10 01:04:28 +02:00
Pan7
cc8cbd8a72 Fix uninitialized use of ext warning 2017-04-27 18:12:09 +02:00
Matthias Krüger
1498ce667d q3map2: don't store lightmap if the last bounce computation ran empty. 2017-03-13 10:58:35 +01:00
TTimo
a26c818a1e remove the old .vcproj 2017-01-01 09:08:37 -06:00
Jay Dolan
5938d4e49f Fix a handful of compiler warnings. 2016-12-31 16:02:08 -05:00
Timothee "TTimo" Besset
e933f41d07 Merge pull request #385 from illwieckz/importfixes
import a q3map2 fix from netradiant
2016-10-15 20:34:13 -05:00
Thomas Debesse
75e2a70823 More: Using Sys_FPrintf with SYS_WRN and SYS_ERR
This commit do the same as “Using Sys_FPrintf with SYS_WRN and SYS_ERR” commit by @Pan7 (5105fc5) for occurrences that were left untouched (tools/ subtree only).
2016-10-15 20:16:14 +02:00
Rudolf Polzer
1342e8ae5f fix two obvious typos 2016-10-14 02:10:02 +02:00
Timothee Besset
5432b04490 update git ignores 2016-09-30 10:24:25 -05:00
TTimo
8557f1820f more cleanups 2016-08-20 17:50:23 -06:00
TTimo
de8105beb4 readability 2016-08-20 16:06:09 -06:00
Timothee "TTimo" Besset
28e9b8ec59 Merge pull request #364 from tkoeppe/memsize
[tools/quake3/q3map2] Fix memset size bugs
2016-08-20 16:03:57 -06:00
Timothee "TTimo" Besset
cee35a43d7 Merge pull request #367 from tkoeppe/nan
[tools/quake3/q3map2/light{,maps}_ydnar.c] Fix float-to-int conversion
2016-08-20 15:56:26 -06:00
Thomas Köppe
7ea2c399ad [tools/quake3/q3map2] Fix memset size bugs 2016-08-16 23:41:29 +01:00
Thomas Köppe
87002dc31a [quake3/q3map2/brush.c] Fix misnamed variable 2016-08-16 22:50:14 +01:00
Timothee "TTimo" Besset
d1109f70e5 Merge pull request #363 from tkoeppe/zipbrace
[quake3/common/unzip.c] Add braces to make nested if/else less brittle
2016-08-16 06:21:24 -06:00
Timothee "TTimo" Besset
c49832c272 Merge pull request #365 from tkoeppe/abs
[quake3/q3map2/brush.c] Fix arithmetic bug
2016-08-16 06:18:15 -06:00
Thomas Köppe
f463907e46 [tools/quake3/q3map2/light{,maps}_ydnar.c] Fix float-to-int conversion by preventing NaN values 2016-08-14 12:16:13 +01:00
Thomas Köppe
683e9415f7 [quake3/common/aselib.c] Remove unused local variables 2016-08-14 01:22:03 +01:00
Thomas Köppe
d18d90278e [quake3/q3map2/brush.c] Fix arithmetic bug 2016-08-14 01:14:17 +01:00
Thomas Köppe
df3ebf5173 [quake3/common/unzip.c] Add braces to make nested if/else less brittle; attempt to make whitespace a bit more uniform 2016-08-14 01:01:05 +01:00
Thomas Köppe
3b2fb7f27e [unzip.c{,pp}] Change zc{alloc,free} to internal linkage 2016-08-03 15:53:59 +01:00
Timothee "TTimo" Besset
c918a29cd0 Merge pull request #352 from Pan7/Sys_FPrintf
Using Sys_FPrintf with SYS_WRN and SYS_ERR
2016-06-11 13:01:13 -05:00
Pan7
5105fc5db8 Using Sys_FPrintf with SYS_WRN and SYS_ERR 2016-05-16 21:20:20 +02:00
Timothee Besset
cc68a76900 phrasing.. 2016-04-24 15:05:09 -05:00
Timothee Besset
a88ef20680 fix short alloc and heap corruption for winding_accu_t and brush_t - brought about by https://github.com/TTimo/bspc/pull/4 2016-04-24 15:02:50 -05:00
Timothee Besset
b36b3ba4b6 Visual Studio 2015 on debug configs too 2016-04-24 14:52:52 -05:00
Thomas Debesse
d58490f20b split fixaas stuff from q3map2 2016-02-13 04:54:26 +01:00
Thomas Debesse
cd07f71691 split bsp analyze/info/scale stuff from q3map2 2016-02-13 04:54:26 +01:00
Thomas Debesse
cd5ff8d96c split bsp conversion stuff from q3map2 2016-02-12 20:02:35 +01:00
Timothee "TTimo" Besset
8428b75fcb Merge pull request #273 from QBall147/master
Increase MAX_MAP_VISIBILITY as certain QuakeLive maps are starting to hi...
2016-01-10 11:31:47 -06:00
Timothee Besset
4e08b4bd49 compile x64 q3map2 against new libxml2 x64 lib folder 2015-12-24 22:31:49 -06:00
Timothee Besset
5ed4d02c78 more Visual Studio 2015 conversion 2015-12-24 19:21:23 -06:00
TTimo
48369d78f9 - Convert to Visual Studio 2015
- Drop STLPort
- Rebuild libxml2 binaries, update project files accordingly
- Rebuild jpeg-9 binaries
2015-11-07 23:44:49 -06:00
QBall147
17349a28db Increase MAX_MAP_VISIBILITY as certain QuakeLive maps are starting to hit the limit 2014-08-14 19:05:13 +01:00
Alex Lo
76ea7385dd Fixed a number of out of bounds accesses.
Visual Studio's static code analyser found a number of out of bounds array
accesses. This commit fixes a number of them as well as a few other problems
the analyser brought up.

This also fixes #1 in the issue tracker.
2013-11-01 00:24:58 +00:00
Timothee "TTimo" Besset
5aa744b026 misc fixes, reviewed the urt q3map2 code 2013-09-07 17:39:31 -05:00
TTimo
666847b0ce switch to xp compatible compiler toolchain, add/fix an archive and upload script for the VM builder 2013-08-24 22:50:12 +00:00
Chris Brooke
65175c80b1 oops forgot q3map2_urt (added -exportents) 2013-07-15 07:16:51 +01:00
Chris Brooke
3e5bc317d0 Added -exportents to q3map2. 2013-07-15 04:58:15 +01:00
Timothee Besset
0241ec6d9b put q3map2.exe x64 in install/x64, and copy the dependent DLLs 2013-06-07 05:13:20 +01:00
Timothee Besset
5d0b2a2b94 fix crashes: libxml2 static linking, turn off libintl stuff 2013-06-03 03:23:11 +01:00
Timothee Besset
7c1f101a29 spitting x64 q3map2 now 2013-06-02 00:56:33 +01:00
Timothee Besset
f397e4a8d6 link libxml2 2013-06-01 23:39:34 +01:00
Timothee Besset
9f425c0c72 add include path for gdk-pixbuf 2013-06-01 23:26:37 +01:00
Timothee Besset
1ec0ec94ba switching to newer gtk and libxml. wip 2013-06-01 23:05:35 +01:00
Timothee "TTimo" Besset
ca29808460 missed those - q3map2 x64 2013-05-30 03:22:29 -05:00
Timothee "TTimo" Besset
2ca658fe9f convert projects to msvc 2012 2013-05-23 20:44:41 -05:00
Timothee 'TTimo' Besset
05e48b2d4e add q3data to the windows project 2012-10-07 14:22:42 -05:00
Timothee 'TTimo' Besset
df729933f8 compile q3data on Linux 2012-10-07 11:52:47 -05:00
Timothee 'TTimo' Besset
2bd4ea84f0 better QL Linux homepath config 2012-08-29 21:43:19 -05:00
Timothee 'TTimo' Besset
c692d7b5c5 point to the right QL homepath 2012-08-29 20:49:09 -05:00
Chris Brooke
9b37f2e205 Ok bspc works now for quakelive 2012-07-31 18:01:54 +01:00
Timothee "TTimo" Besset
06ac3b72a5 Merge pull request #104 from QBall147/bspc
Added bspc to the solution (with initial ql support)
2012-07-30 19:10:32 -07:00
Chris Brooke
bc1f18b574 Added bspc to the solution (with ql support) 2012-07-30 12:23:40 +01:00
Chris Brooke
2101cf6ae7 QuakeLive PK3 support for Q3Map2 2012-07-27 17:46:54 +01:00
Eric Wasylishen
29df45359d Remove includes for glib/gconvert.h and glib/gmem.h, according to http://developer.gnome.org/glib/stable/glib-compiling.html it is an error to include individual hedaers starting with glib 2.32 2012-07-21 12:21:58 -04:00
Timothee 'TTimo' Besset
3311e3a0da renaming q3map2.urt -> q3map2_urt 2012-07-07 17:39:27 -05:00
TTimo
8464aef05e more fixes 2012-07-07 10:35:17 -05:00
TTimo
8cb9ca9031 fix/update the urt q2map2 project 2012-07-07 10:15:37 -05:00
Chris Brooke
26d3246edf Additional Surface parameters for Quake Live -
snowsteps
woodsteps

The below params have been added but have not been implemented yet in ql
(been told it probably will be re-purposed at a later date)

dmgthrough <-- Missile dmg through surface(?)
2012-07-02 05:54:59 +01:00
Timothee 'TTimo' Besset
f3fb7465da propagate png compatibility fix 2012-06-30 17:39:21 -05:00
Timothee 'TTimo' Besset
1e7ca049d6 stripped the common/ and libs/ that are coming from an older release of GtkR, bump version up. building Linux bins for Majki to test with 2012-06-09 14:49:14 -05:00
Timothee 'TTimo' Besset
61a03e2ee7 add license info on a few things 2012-06-04 23:42:31 -05:00
Timothee 'TTimo' Besset
b19c4bc879 this was built on top of 1.5, so it never got properly transformed to a GPL license. took care of that now 2012-05-28 18:29:36 -05:00