quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,324 Commits 1 Branch 0 Tags 32 MiB
Commit Graph

415 Commits

Author SHA1 Message Date
Rudolf Polzer dac8329952 Merge branch 'master' into divVerent/farplanedist-sky-fix 
Conflicts:
	tools/quake3/q3map2/prtfile.c
	tools/quake3/q3map2/vis.c
	tools/quake3/q3map2/visflow.c
 2012-05-15 11:58:06 +02:00
Rudolf Polzer 7fc621fc78 Merge remote-tracking branch 'ttimo/master' 
Conflicts:
	config.py
	libs/missing.h
	plugins/model/cpicosurface.cpp
	plugins/vfspk3/unzip.cpp
	radiant/main.cpp
	radiant/mainframe.cpp
	radiant/mainframe.h
	radiant/missing.cpp
	radiant/pluginmanager.cpp
	radiant/preferences.cpp
	radiant/preferences.h
	tools/quake3/common/cmdlib.c
	tools/quake3/common/unzip.c
	tools/quake3/q3map2/image.c
 2012-05-07 12:32:31 +02:00
Timothee 'TTimo' Besset 6476802ae8 dunno what happened there, someone brain farted hard 2012-05-06 15:55:10 -05:00
Timothee 'TTimo' Besset c40e0b3e57 unused 2012-04-15 11:24:38 -05:00
Timothee 'TTimo' Besset 943424faa1 fix q3map2 2012-04-14 17:31:10 -05:00
Timothee 'TTimo' Besset 85a66c9519 fix unzip code 2012-04-14 17:15:55 -05:00
Rudolf Polzer d005d46d64 oops, this was broken 2012-04-12 17:14:40 +02:00
Rudolf Polzer 62d99f889c Merge remote-tracking branch 'ttimo/master' 
Conflicts:
	plugins/imagepng/plugin.cpp
	radiant/gtkdlgs.cpp
	radiant/radiant.ico
	tools/quake3/q3map2/image.c
 2012-04-12 15:32:57 +02:00
michaelb 1f0271a988 fix invalid use of <glib/...> headers 2012-04-09 09:44:35 +02:00
Timothee TTimo Besset c64cd0cd05 Q2Tools source - didn't import this in initially 2012-04-07 18:53:01 -05:00
alex8664 67411cb18e This is fix for failure of compilation on new libpng 2012-03-31 17:31:50 +04:00
Rudolf Polzer b7e36c120e Merge remote-tracking branch 'github/master' 
Conflicts:
	.gitignore
	config.py
	libs/synapse/synapse.cpp
	plugins/imagehl/lbmlib.cpp
	plugins/surface_heretic2/surfacedialog.cpp
	plugins/surface_ufoai/surfacedialog.cpp
	radiant/brushscript.cpp
	radiant/main.cpp
	radiant/preferences.cpp
	tools/quake3/common/cmdlib.c
	tools/quake3/common/cmdlib.h
	tools/quake3/q3map2/path_init.c
	windows_compile_guide/index.html
 2012-03-27 12:11:37 +02:00
Rudolf Polzer e4287c28bb my own uncrustify run 2012-03-27 12:03:21 +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
Timothee TTimo Besset 6ac1b9cfd3 Merge branch 'master' of github.com:TTimo/GtkRadiant 2012-03-22 22:59:40 -05:00
Timothee TTimo Besset a5a1d8287b new version of glib is touchy 2012-03-22 22:57:36 -05:00
Ben Noordhuis f961a547ff q3map2: bump MAX_OS_PATH to 4096 
Fixes a "buffer overflow detected" abort when compiled with _FORTIFY_SOURCE=1.

The realpath(3) function in glibc checks if the destination buffer is large
enough to hold up to PATH_MAX characters and aborts if that is not the case.
PATH_MAX doesn't have to be defined so assume that it's equal to 4096.

We should really be using pathconf(_PC_PATH_MAX) instead of a hard-coded value
but that means we can no longer use static buffers to hold paths.
 2012-03-18 02:17:09 +01:00
Ben Noordhuis 3a959349ac q3map2: harden UNIX path sniffer against buffer overflows 2012-03-18 02:17:09 +01:00
Ben Noordhuis 808e1c9f6f q3map2: fix dangling pointer dereference 
`last` was used but not initialized.

Also fixes a segmentation fault if PATH is not in the environment.
 2012-03-18 02:17:09 +01:00
Ben Noordhuis d7e9dab03d q3map2: getpwent() result may not be persistent 
Use getpwuid_r() instead and store the path in a static buffer.
 2012-03-18 02:17:09 +01:00
Ben Noordhuis c2be26a9bd q3map2: add safe string copy functions 
* Q_strncpyz()
* Q_strncat()
* Q_strcat()

Guard against buffer overruns, always zero terminate the result.
 2012-03-18 02:17:09 +01:00
Ben Noordhuis 997811d430 q3map2: fix bogus empty string checks 
qdir is an array, not a pointer, so `if (qdir)` is always true.
 2012-03-18 02:17:09 +01:00
Ben Noordhuis ca8d032cfb fix warning: unused variable 'foo' 2012-03-18 02:17:09 +01:00
Ben Noordhuis 3311b00ae6 fix warning: format not a string literal and no format arguments 2012-03-18 02:13:11 +01:00
Timothee TTimo Besset 830125fad0 uncrustify! now the code is only ugly on the *inside* 2012-03-17 15:01:54 -05:00
Rudolf Polzer dba712acf6 query the online, not total, CPUs in case some were shut off 2012-03-03 17:31:03 +01:00
Lauri Kasanen 123f3fd962 q3map2: Small cleanups 
Move one variable to the section it is used in, and remove one unnecessary
NULL check.

If si were NULL at that point, we would have segfaulted ages ago.

Signed-off-by: Lauri Kasanen <curaga@operamail.com>
 2012-03-03 17:28:34 +01:00
Lauri Kasanen 053ca4041b Automatically determine the number of threads on linux 
Signed-off-by: Lauri Kasanen <curaga@operamail.com>
 2012-03-03 17:28:34 +01:00
Rudolf Polzer 747e474c40 remove internal libjpeg6 copy (patch by monad) 2012-03-01 10:24:29 +01:00
Rudolf Polzer e8f94f12dd Merge remote-tracking branch 'origin/divVerent/leak-fix' 2012-02-19 18:40:59 +01:00
Rudolf Polzer 312f954913 also select the best entity when a leak was found 2012-02-14 13:24:05 +01:00
Rudolf Polzer 11fdc6f6d0 .lin files: find optimal path from leak entity 2012-02-14 13:19:44 +01:00
Rudolf Polzer bca4840507 another experimental change: better handle leaky maps 2012-02-14 11:35:59 +01:00
Rudolf Polzer 917677bab9 fix drawindexes crash when loading BSP files 2012-02-13 21:09:11 +01:00
Rudolf Polzer f8bfc8d1df fix crash in -bsp 2012-02-13 11:22:07 +01:00
Rudolf Polzer 3a7c77d720 unlimit MAX_MAP_DRAW_INDEXES 2012-02-12 19:00:55 +01:00
Rudolf Polzer d5d6e98191 add option -nofastpoint; make old buggy behaviour default as it is typically a lot faster. To not use fast point lights, pass -nofastpoint but not -fast. 2012-02-09 11:28:49 +01:00
Rudolf Polzer 8dcd2d22e6 slow down non-fast operation but make it more accurate by not using falloff tolerance at all when -fast is not used 2012-02-09 10:51:09 +01:00
Rudolf Polzer c30d367a12 FIXME comment because falloffTolerance is checked in non-fast too for point lights, should we really do that? Maybe add a -slow then... 2012-02-09 10:41:17 +01:00
Rudolf Polzer 0c44cbd7ea fix falloff tolerance for sRGB 2012-02-09 10:41:09 +01:00
Rudolf Polzer c60d22dd26 swap values 0 and 1 for -exposure (now -exposure 0 does nothing, -exposure 1 did what 0 did before) 2012-02-09 10:40:48 +01:00
Rudolf Polzer 7bd87de737 fix deprecation with libpng 1.4 2012-01-23 17:25:22 +01:00
Rudolf Polzer d0df309a98 Xonotic: make sRGB compiles default 2011-12-31 14:37:43 +01:00
Rudolf Polzer a0b68611bc don't care for singular/plural in -shaderasbitmap vs -shadersasbitmap etc. 2011-12-30 20:01:02 +01:00
Rudolf Polzer 2f85cccd8c -onlyents: keep gridsize as stored in the bsp 2011-12-27 19:45:22 +01:00
Rudolf Polzer f536f829e5 add shorthand option -nosRGB to turn off all sRGB modes 2011-12-25 19:45:09 +01:00
Rudolf Polzer 56bbeb0552 Merge branch 'master' of /var/cache/git/xonotic/netradiant 2011-12-21 16:36:07 +01:00
Rudolf Polzer c4ff5f029f 256 surfaceparms 2011-12-21 16:35:44 +01:00
Rudolf Polzer 272a29bdd8 always use color normalization, vector normalization on colors is worng 2011-12-18 22:36:53 +01:00
Rudolf Polzer bb15de2ddc also support -sRGBcolor for floodlight 2011-12-14 09:51:15 +01:00