Commit Graph

18 Commits

Author SHA1 Message Date
Stijn Buys
2f72e166b2 Fix an invalid pointer reference in the alphahack image loader, print filename on LoadJPGBuff error messages. 2013-07-02 19:23:35 +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
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
e4287c28bb my own uncrustify run 2012-03-27 12:03:21 +02: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
7bd87de737 fix deprecation with libpng 1.4 2012-01-23 17:25:22 +01:00
Rudolf Polzer
7db8ac9952 more warnings be gone 2011-06-05 19:43:21 +02:00
Rudolf Polzer
f43d2c575d Revert "also load DDS files the way DarkPlaces stores them (does DDS loading even work?)" because Radiant does not support this yet, and it won't be easy to do the same hack in Radiant.
This reverts commit 8850310690.
2011-02-23 13:25:27 +01:00
Rudolf Polzer
8850310690 also load DDS files the way DarkPlaces stores them (does DDS loading even work?) 2011-02-23 13:24:47 +01:00
Rudolf Polzer
4d276901a6 also support the alpha channel hack for JPEG that DarkPlaces supports (foo.jpg + foo_alpha.jpg) 2011-02-23 13:22:07 +01:00
rpolzer
5ec3a47e10 q3map2 is now waring free 2010-10-05 10:57:07 +02: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
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
9998050654 set eol-style
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@183 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-11-04 03:34:51 +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