Commit graph

325 commits

Author SHA1 Message Date
rambetter
7f2f9610ba Backing out r347 and r345. Keeping r346.
So, this branch is now r344 with patch r346.
DO NOT MERGE THIS CHANGE INTO TRUNK!!!!


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@349 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-15 06:56:33 +00:00
rambetter
ab7d2b5680 Creating a temporary branch for Rambetter to use in order to
fix some outstanding issues while the lib-reassembly is taking place.
This branch is starting out as a copy of r347.
I [Rambetter] am not able to work on trunk at the moment because it
is broken on Windows due to the DLL nightmare that is going on.  I would
like to fix some bugs in the meantime.  Commits that should be imported back
into trunk will be clearly marked as such.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@348 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-15 06:42:34 +00:00
TTimo
09337b8992 damn macro is still there
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@347 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-13 05:37:08 +00:00
rambetter
eb77a1bc39 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
2010-12-13 04:50:40 +00:00
TTimo
7c46911658 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
2010-12-13 04:21:05 +00:00
TTimo
fa657d36f6 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
2010-11-29 01:12:35 +00:00
TTimo
dc4e125df2 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
2010-11-26 19:50:08 +00:00
TTimo
0152053e52 fix Linux compile from mhash stuff
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@339 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 06:46:05 +00:00
TTimo
e393e112f4 compiles again on win32, trashed mhash
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@338 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 05:59:17 +00:00
TTimo
449fdbd6b7 revert 335 and 336, breaking the win32 build
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@337 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-26 05:58:34 +00:00
rambetter
1c8129e946 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
2010-11-16 07:07:28 +00:00
rambetter
c1dbb77342 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
2010-11-16 03:42:28 +00:00
rambetter
fdab9dc6e2 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
2010-11-14 01:40:25 +00:00
namespace
11bb5b5720 pthread_join Fix from Nerius Landys
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@333 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-11-13 13:36:27 +00:00
TTimo
514d4d9d10 fix undo bug with entities (lights) - Markus Fischer
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@332 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-01-08 04:01:08 +00:00
TTimo
48d505dff5 textool fix (Markus Fischer)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@331 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-01-02 16:03:41 +00:00
TTimo
c14eb495aa misc
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@330 8a3a26a2-13c4-0310-b231-cf6edde360e5
2009-12-31 18:50:00 +00:00
TTimo
a54ff4a83e apply misc fixes from Markus Fischer and Rambetter
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@329 8a3a26a2-13c4-0310-b231-cf6edde360e5
2009-12-31 18:45:35 +00:00
TTimo
8f437051fa misc
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@328 8a3a26a2-13c4-0310-b231-cf6edde360e5
2009-12-31 18:24:36 +00:00
mattn
370c9bbf37 * patch from Micah Heyer (GtkRadiant Mailinglist)
* fixes a segfault in gtkgensurf bitmap loading


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@326 8a3a26a2-13c4-0310-b231-cf6edde360e5
2009-01-29 21:01:52 +00:00
namespace
890656caab Removed compiled linux executables
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@325 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-12-29 23:05:52 +00:00
mattn
6aa8384add * applied Shamus Jedi Academy patch for Zeroradiant (gamepack will follow soon)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@324 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-12-16 22:33:22 +00:00
Forest Hale
28bbf5a00b remove some FIXME comments about quakelive paths, since they are the
same as quake3 currently


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@323 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-20 11:12:28 +00:00
Forest Hale
f4633277de patch from Rudolf Polzer implementing bsp46 support and adding -game
quakelive and -game nexuiz modes to q3map2


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@322 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-20 11:07:36 +00:00
TTimo
bef8511de0 fix setup target
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@321 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-13 16:12:55 +00:00
mattn
204566e81e * applied patch by StefanV (from mailinglist) that fixes an error in config.py (broke compilation) and some string conversion warnings
* fixes some more string conversions warnings in bobtoolz
* fixed unresolved symbols in bobtoolz and gtkgensurf (due to the above mentioned patch where the prototypes were not updated)


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@320 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-06 08:35:17 +00:00
TTimo
cc4e44e31a merge branch work back into trunk
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@319 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-09-01 17:34:10 +00:00
mattn
2c4c4aead7 * fixed missing string for error output
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@314 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-08-25 12:32:29 +00:00
TTimo
2def0428da ABToSVK commit
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant.ab@308 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-08-24 03:20:51 +00:00
mattn
0e5c89d2c0 * fixed a warning and an error in the overflow check in l_net
* const stuff for GetNextChainItem (bobtoolz)


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@303 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-25 19:14:48 +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
mattn
995f6a1011 * divVerent's patch for the brush primitives surface dialog (fixed segfault due to NULL pointer)
* Quote http://zerowing.idsoftware.com/pipermail/gtkradiant/2008-July/011094.html : Attached to this message is a patch for a "somewhat working" brush
primitives surface dialog. It is an ugly hack, as it converts between
fake texdef notations and brush primitives whenever values are needed.
Had to fix an accuracy bug: the surface dialog rounded all rotation
values to integer angles, which SEVERELY broke things for me (changed
the Gtk spin object to use 4 digits, which is enough for me).

Also, I changed the fake texdef / brush primitives conversions to use
long double internally, as float's roundoff errors were quite visible to
me when testing.

Hope the remaining roundoff errors from converting back and forth won't
kill me, but it worked for a simple map example.

Also, I had to separate out "Snap to grid" and "Don't clamp" into two
separare options. They now mean:

- Snap to grid: snaps drag/etc. actions to the grid
- Don't clamp: disable brush point snapping during many operations, like
  merely shifting brushes, editing texturing parameters, map loading,
  etc.

The reason is that I do need the grid, but I don't want to get my
objects messed up by the snapping in my map. As I am using free
rotations, this DOES change quite much.

The config.py change is needed for compilation on Debian stable;
Debian's scons does not use the CFLAGS variable, but just CCFLAGS and
CXXFLAGS. In newer scons versions, CFLAGS is _shared_ flags for C and
C++, so if you want to require these, you don't need to include the
CFLAGS in CXXFLAGS too.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@301 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-10 08:30:47 +00:00
mattn
27a3c433bc * fixed spawnflags dialog due to local and global variable mix (thanks divVerent)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@300 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-10 07:41:14 +00:00
mattn
9fa4db610e * brush primitive patch by divVerent
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@299 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-10 07:38:14 +00:00
mattn
28fda9304d * gametools => gametools_win32, gametools_linux, gametools_macos
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@298 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-10 07:24:06 +00:00
mattn
f5b144e467 * removed a lot of HACKs for several games by merging the enginepath_win32, enginepath_linux and enginepath_macos from 1.5
to 1.6 (default for everything is quake3)
* removed the hacks for q2.game and heretic2.game (just check whether the game config value quake2 is set - TODO: game 
dialog needs update - quake2 option should be given)


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@297 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-05 10:21:36 +00:00
mattn
5f6f117633 * reactivated some old quake2 code
* more translateable strings


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@296 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-05 08:53:43 +00:00
mattn
0902485233 * more translateable strings
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@295 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-05 08:37:22 +00:00
mattn
6977eb6647 * synced german translation with latest pot updates
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@294 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-05 07:32:06 +00:00
mattn
46bdd92bb4 * more translateable strings
* fixed warnings about unused variables


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@293 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-05 07:14:52 +00:00
mattn
c974ae628c * more translateable strings
* fixed warning about unused variable


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@292 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-04 22:11:30 +00:00
mattn
f6340d0187 * some new translateable strings
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@291 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-07-04 21:43:45 +00:00
mattn
a5955a4c37 * removed SETUP=0 (only valid for 1.5)
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@290 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-30 18:09:38 +00:00
mattn
04c7eb042d * reactivated WXY_Print function to generate screenshots from the xy window
* removed all the references to the old bugzilla links (deadlinks - no longer useful)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@289 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-27 15:09:36 +00:00
mattn
591626e4d8 * Tremulous patch by Ingar
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@288 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-27 14:30:13 +00:00
mattn
8a48fa56a3 * removed todo entry
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@287 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-26 18:50:38 +00:00
mattn
88d21daa67 * introduced a new config variable to be able to load maps directly from the enginePath/basePath/maps directory
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@286 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-26 18:50:18 +00:00
mattn
3138825cde * more translations
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@285 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-26 17:48:22 +00:00
mattn
f5b6f40bc4 * fixed dir handle leaks for windows
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@284 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-26 15:19:48 +00:00
mattn
d5fc00a4f8 * removed unnecessary gi18n.h inclusions
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@283 8a3a26a2-13c4-0310-b231-cf6edde360e5
2008-06-26 14:30:58 +00:00