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

1294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rudolf Polzer
54a0010018 Merge branch 'master' of /var/cache/git/xonotic/netradiant 2012-04-09 09:44:44 +02:00
michaelb
1f0271a988 fix invalid use of <glib/...> headers 2012-04-09 09:44:35 +02:00
Timothee TTimo Besset
ea08af07fe moved to the web repository. online at http://icculus.org/gtkradiant/documentation/windows_compile_guide/ 2012-04-08 18:45:33 -05:00
Timothee TTimo Besset
0280c898c6 Merge branch 'master' of github.com:TTimo/GtkRadiant 2012-04-07 18:53:20 -05:00
Timothee TTimo Besset
c64cd0cd05 Q2Tools source - didn't import this in initially 2012-04-07 18:53:01 -05:00
Rudolf Polzer
4324a899fd simplify map file 2012-04-02 11:46:02 +02:00
Timothee "TTimo" Besset
961fb5bd5f Merge pull request #27 from freemancw/master 
Issue #15 - fixed about dialog / Updated 1.5.0 icon
 2012-04-01 18:42:22 -07:00
Clinton Freeman
6a2288bb90 centered about on parent window 2012-04-01 21:01:18 -04:00
Clinton Freeman
5a4c0cc6bc reorganized about dialog code, added updated 1.5.0 .ico 2012-04-01 20:37:53 -04:00
Clinton Freeman
adeab050ef reorganized about dialog and updated logo. fixed 
broken links
 2012-04-01 16:54:44 -04:00
alex8664
b6d70499bf This is fix for failure of compilation on new libpng 2012-03-31 17:33:33 +04: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
3c73487420 Merge commit '830125fad042fad35dc029b6eb57c8156ad7e176' 2012-03-27 12:03:28 +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
TTimo
3b33d2f868 uncrustify config - not applying until more sync with internal versions are done 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@212 8a3a26a2-13c4-0310-b231-cf6edde360e5
 2012-03-27 11:45:20 +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
bfc8a12a6b Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12' 2012-03-27 11:33:51 +02:00
Timothee "TTimo" Besset
686a211fc3 Merge pull request #21 from merlin1991/Q3-gamepack-fix 
copy shaderlist for Q3 if missing and make sure the config folder for *.game files exists
 2012-03-26 06:56:22 -07:00
Christian Ratzenhofer
075e39d582 Check if games folder exists, and copy shaderlist for Q3 if missing 2012-03-26 13:57:19 +02:00
Timothee "TTimo" Besset
f3eedecd09 Merge pull request #19 from merlin1991/scons-update 
Scons update
 2012-03-25 16:33:16 -07:00
Christian Ratzenhofer
5b54de9bf2 updated Windows compile guide to include git 
and the newest changes to the scons script (no more full blown msys)
 2012-03-26 01:13:24 +02:00
Christian Ratzenhofer
d4f7c67be1 Remove calls to wget unzip and cp in the setup target of scons 
This allows to build on windows without msys
 2012-03-26 01:12:56 +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
Timothee "TTimo" Besset
02e6ff2dcb Merge pull request #6 from bnoordhuis/cleanup 
cleanup + q3map2 crash fix
 2012-03-18 06:52:13 -07:00
Ben Noordhuis
d3e3a8e063 build: re-enable optimizations in release builds 
Commit f961a54 fixes the q3map2 crash at startup so it's safe to enable
optimizations again.
 2012-03-18 02:18:26 +01: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
cd725d680a fix warning: array subscript is above array bounds 
Simplify and flatten the code while we're at it.
 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
Ben Noordhuis
7c4e1f1fcb .gitignore build artifacts 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
Timothee TTimo Besset
515673c08f trash a bunch of outdated and confusing things 2012-03-17 14:07:19 -05:00
git-svn-migrate
31c68a8299 Convert svn:ignore properties to .gitignore. 2012-03-16 22:20:47 -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
Lauri Kasanen
f02a56a694 Add gitignore 
Signed-off-by: Lauri Kasanen <curaga@operamail.com>
 2012-03-03 17:28:34 +01:00
Rudolf Polzer
0d10413fe0 fix how glib is included 2012-03-01 14:43:00 +01:00
Rudolf Polzer
6bc28ad466 Merge remote-tracking branch 'origin/ailmanki/et-engineaftercompile' 2012-03-01 12:15:33 +01:00
Rudolf Polzer
aa9e315624 also include libjpeg8 here 2012-03-01 11:25:48 +01:00
Rudolf Polzer
ed96b4352a no longer use an included libjpeg copy. Use the system one. 2012-03-01 10:35:32 +01:00