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
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
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
ca8d032cfb
fix warning: unused variable 'foo'
2012-03-18 02:17:09 +01:00
Timothee TTimo Besset
830125fad0
uncrustify! now the code is only ugly on the *inside*
2012-03-17 15:01:54 -05: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
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
Rudolf Polzer
2b560b8348
sRGB convert all shader specified colors
2011-12-14 09:51:15 +01:00
Rudolf Polzer
084d085966
support -sRGBcolor for all _color keys
2011-12-14 09:51:15 +01:00
Rudolf Polzer
870333585c
support -sRGBcolor for flares
2011-12-14 09:51:15 +01:00
Rudolf Polzer
f4e45cb897
option: -sRGBcolor (unused yet)
2011-12-14 09:51:15 +01:00
Rudolf Polzer
48a8cb1d67
mark two shader checks nullable
2011-12-09 17:24:33 +01:00
Rudolf Polzer
b104009ba6
no, we do NOT want to ignore caulk
2011-12-09 17:17:31 +01:00
Rudolf Polzer
35162b6b63
properly ignore caulk
2011-12-09 17:15:51 +01:00
Rudolf Polzer
aef478a99a
PROPERLY ignore sky brushes for minimap
2011-12-09 16:36:07 +01:00
Rudolf Polzer
c3a3978aea
-autolevel for minimap
2011-12-09 16:18:17 +01:00
Rudolf Polzer
a75d633c49
fix lightstyle compare (SIGBUS on SPARC)
2011-12-08 14:11:06 +01:00
Rudolf Polzer
76dd045925
properly support -keeplights option. Current implementation never worked.
2011-12-01 16:47:35 +01:00
Rudolf Polzer
6b01d68ba6
audit all uses of ClipWindingEpsilon and choose the strict variant or not, and explain why
2011-11-23 09:44:05 +01:00
Rudolf Polzer
323c01a983
try to fix the "-np surfaces disappear" bug
2011-11-22 12:10:26 +01:00
Rudolf Polzer
8bff7284c3
fix an obvious q3map2 bug that causes BSP leafs to be too big sometimes. Maybe improves fps. No other change.
2011-11-20 21:37:55 +01:00
Rudolf Polzer
e8f27310d6
also new option: -sRGBtex, and renamed -sRGB to -sRGBlight
2011-10-29 16:33:46 +02:00