]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
TTimo [Mon, 13 Dec 2010 05:37:08 +0000 (05:37 +0000)]
damn macro is still there
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@347
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
rambetter [Mon, 13 Dec 2010 04:50:40 +0000 (04:50 +0000)]
ixing a big problem on Windows platforms that has to do with copying over
game packs to the game install directory. Before this patch, users of
Radiant weren't able to start Radiant without doing some manual copying of
game pack files over by hand (and I'm sure nobody figured that out).
The problem is in radiant/missing.cpp. CopyTree() didn't correctly recursively
copy directories because of a problem in FindFiles::FindFiles() on Windows.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@346
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
TTimo [Mon, 13 Dec 2010 04:21:05 +0000 (04:21 +0000)]
rebuilt gtk binary dependencies file
fixed/optimized a number of VC9 project settings
fixed sprintf being hijacked by intl.dll stuff
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@345
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
Rudolf Polzer [Sat, 11 Dec 2010 17:17:42 +0000 (18:17 +0100)]
enable WarsowPack and Quake2WorldPack again as their servers seem up again
Rudolf Polzer [Sat, 11 Dec 2010 16:53:55 +0000 (17:53 +0100)]
more text
Rudolf Polzer [Sat, 11 Dec 2010 16:10:15 +0000 (17:10 +0100)]
update URL to the netradiant dependencies
Rudolf Polzer [Sat, 11 Dec 2010 15:20:42 +0000 (16:20 +0100)]
explain how to deal with missing DLL
Rudolf Polzer [Sat, 11 Dec 2010 15:08:13 +0000 (16:08 +0100)]
fix the start workaround
Rudolf Polzer [Sat, 11 Dec 2010 15:06:07 +0000 (16:06 +0100)]
workaround problems with wget and svn
Rudolf Polzer [Sat, 11 Dec 2010 15:01:20 +0000 (16:01 +0100)]
PATH trick does not work, so let's ignore the problem and use explicit paths
Rudolf Polzer [Sat, 11 Dec 2010 14:54:56 +0000 (15:54 +0100)]
improve instructions
Rudolf Polzer [Sat, 11 Dec 2010 14:44:00 +0000 (15:44 +0100)]
update the radiant deps link
Rudolf Polzer [Sat, 11 Dec 2010 14:27:29 +0000 (15:27 +0100)]
update win32 instructions a bit
Rudolf Polzer [Sat, 11 Dec 2010 14:14:45 +0000 (15:14 +0100)]
on mingw, use the "utils" as path too
Rudolf Polzer [Sat, 11 Dec 2010 13:53:23 +0000 (14:53 +0100)]
default to Arial 9 on Windows (NOT Courier New 8)
Rudolf Polzer [Sat, 11 Dec 2010 13:52:52 +0000 (14:52 +0100)]
Revert "fix some more of the weird workarounds"
This reverts commit
b8ef001e495fea520a2b46add1948f054a3253d3 .
Rudolf Polzer [Thu, 9 Dec 2010 06:08:34 +0000 (07:08 +0100)]
fix some more of the weird workarounds
Rudolf Polzer [Thu, 9 Dec 2010 05:58:33 +0000 (06:58 +0100)]
fix typo
Rudolf Polzer [Thu, 9 Dec 2010 05:57:25 +0000 (06:57 +0100)]
we need a fonts.conf file for fontconfig to work on win32
Rudolf Polzer [Thu, 9 Dec 2010 05:54:14 +0000 (06:54 +0100)]
add an ifdeffed out font size workaround
Rudolf Polzer [Thu, 9 Dec 2010 05:52:52 +0000 (06:52 +0100)]
be a little nicer to switching font system at compile time
Rudolf Polzer [Wed, 8 Dec 2010 18:47:36 +0000 (19:47 +0100)]
fix another dll name typo
Rudolf Polzer [Wed, 8 Dec 2010 18:38:25 +0000 (19:38 +0100)]
one more DLL
Rudolf Polzer [Wed, 8 Dec 2010 18:37:36 +0000 (19:37 +0100)]
Revert "we no longer need fixprefix", because we do need it. On cross compiling. On mingw it is harmless.
This reverts commit
189385d85616163910eac561f0cd4ce453279ca1 .
Rudolf Polzer [Wed, 8 Dec 2010 13:41:47 +0000 (14:41 +0100)]
we no longer need fixprefix
Rudolf Polzer [Wed, 8 Dec 2010 13:41:13 +0000 (14:41 +0100)]
mark the package as outdated
Rudolf Polzer [Wed, 8 Dec 2010 12:31:22 +0000 (13:31 +0100)]
comment out Quake2WorldPack as the server is currently unreachable
Rudolf Polzer [Wed, 8 Dec 2010 12:30:58 +0000 (13:30 +0100)]
updates to make win32 building work again
Rudolf Polzer [Sun, 5 Dec 2010 16:27:36 +0000 (17:27 +0100)]
change UNZIP to UNZIPPER to make OAPack work
Rudolf Polzer [Sun, 5 Dec 2010 16:21:18 +0000 (17:21 +0100)]
don't bail out on unzip fail
Rudolf Polzer [Sun, 5 Dec 2010 15:52:23 +0000 (16:52 +0100)]
Merge remote branch 'origin/divVerent/pangofix'
Rudolf Polzer [Sun, 5 Dec 2010 15:46:09 +0000 (16:46 +0100)]
support "real3" as vector type properly
Rudolf Polzer [Thu, 2 Dec 2010 13:31:53 +0000 (14:31 +0100)]
workaround for loading broken maps written by ZeroRadiant that have a duplicate plane
TTimo [Mon, 29 Nov 2010 01:12:35 +0000 (01:12 +0000)]
updated the setup functionality on windows, new deps file, bumped version up
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@344
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
TTimo [Fri, 26 Nov 2010 19:50:08 +0000 (19:50 +0000)]
apply back 335 and 336, will need to update deps and put a zip out
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@343
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
TTimo [Fri, 26 Nov 2010 06:46:05 +0000 (06:46 +0000)]
fix Linux compile from mhash stuff
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@339
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
TTimo [Fri, 26 Nov 2010 05:59:17 +0000 (05:59 +0000)]
compiles again on win32, trashed mhash
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@338
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
TTimo [Fri, 26 Nov 2010 05:58:34 +0000 (05:58 +0000)]
revert 335 and 336, breaking the win32 build
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@337
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
Rudolf Polzer [Fri, 19 Nov 2010 11:30:39 +0000 (12:30 +0100)]
doc fixes
Rudolf Polzer [Fri, 19 Nov 2010 05:43:29 +0000 (06:43 +0100)]
also fix the unhashed case
Rudolf Polzer [Fri, 19 Nov 2010 05:41:26 +0000 (06:41 +0100)]
minor fix for plane snapping
Rudolf Polzer [Thu, 18 Nov 2010 16:13:08 +0000 (17:13 +0100)]
switch over to pango rendering
Rudolf Polzer [Tue, 16 Nov 2010 18:20:40 +0000 (19:20 +0100)]
fix font display by moving characters more away from the screen edge (fixes a small overlap)
Rudolf Polzer [Tue, 16 Nov 2010 17:51:28 +0000 (18:51 +0100)]
remove some redundant data members
Rudolf Polzer [Thu, 18 Nov 2010 15:52:51 +0000 (16:52 +0100)]
refactoring font code to hopefully be closer to be able to exchange the font system by something not call list based
Rudolf Polzer [Thu, 18 Nov 2010 15:29:54 +0000 (16:29 +0100)]
Merge branch 'master' into divVerent/pangofix-public
Rudolf Polzer [Thu, 18 Nov 2010 11:56:21 +0000 (12:56 +0100)]
xywindow: draw the x/y/z border properly
Rudolf Polzer [Thu, 18 Nov 2010 11:55:49 +0000 (12:55 +0100)]
pango font stuff: remove reference to a deprectaed pango interface from the new ZeroRadiant code (duh...); make pango a proper dependency now
Rudolf Polzer [Thu, 18 Nov 2010 09:24:21 +0000 (10:24 +0100)]
::zerowing-base=336
merge script from zerowing repos
Rudolf Polzer [Tue, 16 Nov 2010 13:07:06 +0000 (14:07 +0100)]
glfont.cpp: add an internal class that uses Pango
Rudolf Polzer [Tue, 16 Nov 2010 13:06:41 +0000 (14:06 +0100)]
makefile: make verbose dep check more verbose
Rudolf Polzer [Tue, 16 Nov 2010 11:24:06 +0000 (12:24 +0100)]
simplify font drawing a bit so we only have to move one function to pango
rambetter [Tue, 16 Nov 2010 07:07:28 +0000 (07:07 +0000)]
Doing away with the 32 bit per pixel memory buffer. Now passing the returned
pango memory buffer directly to OpenGL. This simplifies the code. Performance
did not seem to be better, but it certainly looks faster in theory.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@336
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
rambetter [Tue, 16 Nov 2010 03:42:28 +0000 (03:42 +0000)]
DONE:
- Removed usage of gdk_gl_font_use_pango_font() which is no longer in
GtkGLExt Git. Radiant now compiles on Linux From Scratch using current
versions of software.
- As a side effect to the above, font inconsistency issues (like really
large intermittent font in GL views) are gone. Font looks better too.
- Changing algorithm for labeling grid view to be more robust. Uses new
functions gtk_glwidget_font_ascent() and gtk_glwidget_font_descent(), and
uses locally defined "cushion" variables.
- In xywindow.cpp, changing stepx and stepy based on 40 pixels, not 32.
When coordinate numbers are very large the labels get too cluttered.
- Added calls to gtk_gl_init() and gdk_gl_init() in main(). This is
recommended according to the GtkGLExt reference manual.
- Tested all changes on Ubuntu 10.10 and Debian 5.0 (Lenny).
TODO:
- In glDrawPixels(), instead of using a 32 bit pixel with
GL_UNSIGNED_INT_8_8_8_8, see if we can use an 8 bit variant where each
byte defines opacity and the GL current color is used. In other words, try
to use the FT_Bitmap directly without conversion.
- Examine every other use of gtk_glwidget_print_string() and
gtk_glwidget_print_char() to make sure the positions are determined
accurately.
NOT TODO:
- Decided not to use glBitmap() with display lists because it would
disallow pretty antialiased fonts.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@335
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
Rudolf Polzer [Mon, 15 Nov 2010 06:21:12 +0000 (07:21 +0100)]
bobtools patch width/height fix from OSXNetRadiant. Now we seem to be mostly in sync with OSXNetRadiant rev 94.
rambetter [Sun, 14 Nov 2010 01:40:25 +0000 (01:40 +0000)]
In Radiant main() method, add putenv("LC_NUMERIC=C").
sscanf() and *printf() calls are all over the code, which are
locale-sensitive. gtk_init() sets all locales. So if you're in
Germany, your printf()'s will output e.g. "10,5" for ten and
a half. Reading floating points with sscanf() is also totally broken
in locales such as Germany. So, we can't really get rid of all the
*scanf()'s and the *printf()'s. Instead, set LC_NUMERIC to "C".
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@334
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
namespace [Sat, 13 Nov 2010 13:36:27 +0000 (13:36 +0000)]
pthread_join Fix from Nerius Landys
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@333
8a3a26a2 -13c4-0310-b231-
cf6edde360e5
Rudolf Polzer [Sat, 13 Nov 2010 07:10:27 +0000 (08:10 +0100)]
new args -meta and -patchmeta to -convert with .map file argument
Rudolf Polzer [Sat, 13 Nov 2010 07:03:39 +0000 (08:03 +0100)]
option -forcereadbsp for -convert to allow forcing the BSP reading code in the radiant build menu
Rudolf Polzer [Thu, 4 Nov 2010 13:55:43 +0000 (14:55 +0100)]
change texture lock default to true; remove weird user pref munging
Rudolf Polzer [Mon, 1 Nov 2010 06:43:42 +0000 (07:43 +0100)]
apparently calling FindOrInsertWorldspawn during tree traversing is bad, so let's not do that
Rudolf Polzer [Sun, 31 Oct 2010 15:33:04 +0000 (16:33 +0100)]
WarsowPack download URL doesn't respond... so I have to comment it out to make the compile work again
Rudolf Polzer [Sun, 31 Oct 2010 11:38:58 +0000 (12:38 +0100)]
new light option -fill to improve lossy compression of lightmaps (should have no other impact)
Rudolf Polzer [Sat, 30 Oct 2010 16:10:23 +0000 (18:10 +0200)]
local variables ALSO work better when declared
Rudolf Polzer [Sat, 30 Oct 2010 16:07:37 +0000 (18:07 +0200)]
add a floodlightDirectionScale value to the _floodlight key too (whatever it does)
Rudolf Polzer [Sat, 30 Oct 2010 16:00:09 +0000 (18:00 +0200)]
no half lambert for xonotic please, it sucks ;)
Rudolf Polzer [Sat, 30 Oct 2010 14:37:04 +0000 (16:37 +0200)]
no need to artificially limit lightmap position for random supersampling
Rudolf Polzer [Sat, 30 Oct 2010 14:36:53 +0000 (16:36 +0200)]
dirtmapping: PROPERLY prevent hitting sky
Rudolf Polzer [Fri, 22 Oct 2010 07:41:48 +0000 (09:41 +0200)]
better override lightSamplesInsist (-samples +1, +2, +3, +4 skip the samples preset loading)
Rudolf Polzer [Fri, 22 Oct 2010 07:36:40 +0000 (09:36 +0200)]
be more verbose about randomsamples presets
Rudolf Polzer [Fri, 22 Oct 2010 07:35:41 +0000 (09:35 +0200)]
support search box size in randomsamples too (although useless)
Rudolf Polzer [Thu, 21 Oct 2010 18:35:35 +0000 (20:35 +0200)]
-randomsamples: special handling of -samples 1, 2, 3, 4 as quality presets (to be more consistent with typical -samples use)
Rudolf Polzer [Thu, 21 Oct 2010 16:12:15 +0000 (18:12 +0200)]
new .gitattributes file, remove comments from a .map file
Rudolf Polzer [Thu, 14 Oct 2010 08:07:39 +0000 (10:07 +0200)]
Merge branch 'master' of ssh://icculus.org/netradiant
jal [Wed, 13 Oct 2010 14:26:28 +0000 (16:26 +0200)]
Ignore transparent surfaces when floodlighting
Rudolf Polzer [Mon, 11 Oct 2010 18:26:55 +0000 (20:26 +0200)]
last workaround did not work. Try a really simple one then.
Rudolf Polzer [Mon, 11 Oct 2010 18:19:52 +0000 (20:19 +0200)]
reinit OpenGL state on redraw properly
Rudolf Polzer [Sun, 10 Oct 2010 14:53:39 +0000 (16:53 +0200)]
Merge remote branch 'origin/divVerent/convert-from-map-to-map'
Rudolf Polzer [Sun, 10 Oct 2010 14:44:27 +0000 (16:44 +0200)]
update surface dialog when moving a brush
Rudolf Polzer [Sun, 10 Oct 2010 14:04:41 +0000 (16:04 +0200)]
automatically run the decompiler when specifying a BSP file in Import...
Rudolf Polzer [Sun, 10 Oct 2010 12:35:18 +0000 (14:35 +0200)]
allow different file type selections for open/import/save
Rudolf Polzer [Sun, 10 Oct 2010 12:10:10 +0000 (14:10 +0200)]
clean up the reload-if-failed code
Rudolf Polzer [Sun, 10 Oct 2010 11:54:01 +0000 (13:54 +0200)]
rename to toggleFormat
Rudolf Polzer [Sun, 10 Oct 2010 11:53:40 +0000 (13:53 +0200)]
clean up toggleProjection code
Rudolf Polzer [Sun, 10 Oct 2010 08:47:16 +0000 (10:47 +0200)]
somewhat unclean code, sorry... but it allows opening brushPrimitives maps in nonBrushPrimitives mode (experimental) by temp toggling to the correct mode
Rudolf Polzer [Sun, 10 Oct 2010 08:26:46 +0000 (10:26 +0200)]
allow changing the "Alternate texture projection" mode at runtime (requires Map_New currently though)
Rudolf Polzer [Sun, 10 Oct 2010 08:05:03 +0000 (10:05 +0200)]
detect the wrong type Q3 format by a different error message when loading
Rudolf Polzer [Sat, 9 Oct 2010 19:54:55 +0000 (21:54 +0200)]
warn on wrong -convert use, always allow .map input
Rudolf Polzer [Sat, 9 Oct 2010 19:29:15 +0000 (21:29 +0200)]
don't write the bsp twice when pseudo compiling
Rudolf Polzer [Sat, 9 Oct 2010 19:22:22 +0000 (21:22 +0200)]
EXPERIMENTAL: make the pseudo compiler able to output a .bsp file:
q3map2 -game xonotic -convert -format xonotic filename.map
note that this is a quite bad compile (no tjunctions, no models, nothing, but lightning fast)
Rudolf Polzer [Sat, 9 Oct 2010 17:47:13 +0000 (19:47 +0200)]
add missing EndBSPFile() call
Rudolf Polzer [Sat, 9 Oct 2010 17:37:43 +0000 (19:37 +0200)]
.ase also works from .map!
Rudolf Polzer [Sat, 9 Oct 2010 17:28:19 +0000 (19:28 +0200)]
the decompiler now can convert .map files too
Rudolf Polzer [Sat, 9 Oct 2010 16:25:19 +0000 (18:25 +0200)]
initial code for converting .map to .map
Rudolf Polzer [Fri, 8 Oct 2010 18:38:30 +0000 (20:38 +0200)]
fix issues with embedded models
Rudolf Polzer [Fri, 8 Oct 2010 04:30:36 +0000 (06:30 +0200)]
properly export texdef origin brushes
Rudolf Polzer [Fri, 8 Oct 2010 04:22:47 +0000 (06:22 +0200)]
fix "bad texdef"
Rudolf Polzer [Thu, 7 Oct 2010 19:04:54 +0000 (21:04 +0200)]
decompiler now outputs somewhat correct texdef
Rudolf Polzer [Thu, 7 Oct 2010 15:56:41 +0000 (17:56 +0200)]
break break break ;)
Rudolf Polzer [Thu, 7 Oct 2010 15:43:05 +0000 (17:43 +0200)]
fix compile errors