Commit graph

123 commits

Author SHA1 Message Date
Timothee 'TTimo' Besset
c22d17a379 Merge remote-tracking branch 'freemancw/dfix' 2012-05-19 15:35:34 -05:00
Willi Schinmeyer
2d902e10da Fixed encoding & locale problems in radiant.vcproj 2012-05-17 14:19:22 +02:00
Willi Schinmeyer
561bf99a84 Removed vastly inferior variant of accessing argc/argv in WinMain() 2012-05-17 14:14:34 +02:00
Willi Schinmeyer
54238f9bf1 Suppressing the console window by using WinMain - two variants 2012-05-17 14:11:03 +02:00
Clinton Freeman
f9464688fe reset groupdialog 2012-05-10 08:17:04 -04:00
Clinton Freeman
7b95e1bd6f minor changes 2012-05-10 07:46:20 -04:00
Clinton Freeman
9a8d530b09 Added convenience fcn to cut down on repeated code 2012-05-10 03:50:05 -04:00
Clinton Freeman
a590514178 Added saving to quit dialog prompt 2012-05-09 21:36:03 -04:00
Clinton Freeman
24b3efb6ec Reworked gtk_MessageDialog to have icons, center
the window, etc.
2012-05-09 20:51:27 -04:00
Clinton Freeman
a9142e69d2 Merge remote branch 'upstream/master' 2012-05-07 23:22:54 -04:00
Timothee 'TTimo' Besset
9b5ba1fe10 error check and bail if permission denied during gamepack install 2012-05-06 16:59:07 -05:00
Timothee "TTimo" Besset
377547668d Merge pull request #50 from merlin1991/ETPack
Add support for W:ET to the game setup dialog
2012-05-06 11:23:11 -07:00
Timothee "TTimo" Besset
fd89b34bbb Merge pull request #47 from mrwonko/MapLoading
Ability to open .map files with Radiant
2012-05-06 11:21:44 -07:00
Timothee "TTimo" Besset
ef66faa7fe Merge pull request #49 from mrwonko/FloatingWindowWorkaround
Workaround for broken floating windows
2012-05-06 11:20:31 -07:00
Christian Ratzenhofer
f0cb191f52 Add support for W:ET to the game setup dialog 2012-05-06 17:24:12 +02:00
Timothee 'TTimo' Besset
57376baa40 typo fix 2012-05-05 08:46:41 -05:00
Willi Schinmeyer
e35aa24c74 Workaround for broken floating windows (XY Window etc. always in front of e.g. surface inspector, properties) 2012-05-04 10:45:49 +02:00
Willi Schinmeyer
ead68d8884 Fixed spelling in a comment 2012-05-04 10:07:28 +02:00
Willi Schinmeyer
22de3606a6 If the first argument ends in .map, try to load it as a map (instead of as a project) 2012-05-04 10:02:31 +02:00
Christian Ratzenhofer
5ed7a304a7 Properly name game configuration files, fixes #43 and other issues related to stringcompares against config filename 2012-05-04 00:18:30 +02:00
Clinton Freeman
7afc1ea8ec pulled in updates from ttimo branch 2012-04-26 13:40:42 -04:00
Timothee 'TTimo' Besset
a2a93d30df fix bobtoolz patch caulk crash 2012-04-22 19:43:26 -05:00
Clinton Freeman
6a00062843 If user cancels model selection, I trigger
a selectiondelete call. Fixes the problem
but I'm a little bit sketchy on how I'm
handling the Undo stack...
2012-04-02 00:31:26 -04:00
Clinton Freeman
e99c0e5370 added a "all types" file filter when loading
misc_models... works for win32 native dialog
but i need to make sure it works for the gtk
file chooser
2012-04-02 00:08:43 -04: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
Christian Ratzenhofer
075e39d582 Check if games folder exists, and copy shaderlist for Q3 if missing 2012-03-26 13:57:19 +02: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
Timothee TTimo Besset
830125fad0 uncrustify! now the code is only ugly on the *inside* 2012-03-17 15:01:54 -05:00
rambetter
88f8603d62 8MB stack size linker options on all VC2008 proj files.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@485 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-06 04:12:34 +00:00
rambetter
33da149be0 Backing out commit 483. Going to set linker flags instead.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@484 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-06 04:08:22 +00:00
rambetter
e39f6f4bae Increasing stack size on Windows build.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@483 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-04-06 03:56:18 +00:00
rambetter
8d530e8707 - Updated Windows build doc, very slight revision. Changed 37 targets to 38.
- Added plugins/imagehl to list of modules built (both	Windows and Linux).
    Not	really sure what this does, but it's the only module (as defined by
    stuff in plugins/ or contrib/) that exists and isn't currently part of the
    build.
- The code to disable desktop composition in Windows has been moved from start
    of main() to an option in Preferences.  The	pref reads as follows:
    "NVIDIA/Aero bug - disable Windows composition".  It is enabled by default.
- Color themes controlled by "Misc" -> "Colors" -> "Themes" options are now
    saved as soon as you select them.  The color theme is no longer clobbered
    when opening Preferences.
- The ATI broken driver (bug #802) pref has been reworded since it applies to
    Intel cards as well.  Before:
    "ATI cards with broken drivers - bug #802".  After:
    "ATI and Intel cards w/ buggy drivers (disappearing polygons)".


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@479 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-03-03 15:51:44 +00:00
rambetter
48410b113d Fixing Linux SCons build.
Fixing plugins on both Linux and Windows.  It's consistent now.
Fixing gl font on Windows.
Mostly, added lots of plugins.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@474 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-22 04:48:05 +00:00
rambetter
561e062c87 This is a major change that updates the 3rd party libs on Windows builds.
A couple of things are broken right now:
- OpenGL font in Windows not appearing (expected to be broken, will fix)
- Linux build broken because it loads some .vcproj files that are removed
- 3rd party libs are downloaded from porky.nerius.com, not id Software


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@473 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-02-21 14:37:49 +00:00
rambetter
3d4ac1ba23 Fixing filters.
I didn't realize they were so broken.
The fix is safe and should not break plugins or anything else.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@437 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-01-23 09:12:34 +00:00
rambetter
9aa5e96c63 Adding "Preferences" -> "Other" -> "Brush" tab. This now has
"Default texture scale:".  (Preferences are game specific by the way.)
The default value for this preference is specific to a game, but most
of the time it's 0.5.  This field allows the user to override that default.
This is a feature that was specifically requrested by someone who wants to
try using ZeroRadiant (he wants to set it to 0.25 for his "premium" maps).
It's already a feature in NetRadiant.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@436 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-01-23 05:24:30 +00:00
rambetter
1f11459c84 Turn off desktop compositing in Windows ("Aero") for Radiant.
Otherwise, "hall of mirrors" effect takes place in the OpenGL viewports.
This fix is a real hack.  It's actually borrowed from other Radiants such
as NetRadiant.  I'd like to fix the underlying issue someday so that Aero
can be used with Radiant.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@433 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-01-22 03:22:21 +00:00
rambetter
4d362964f7 Adding ReactionPack to Radiant code.
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@430 8a3a26a2-13c4-0310-b231-cf6edde360e5
2011-01-20 05:36:24 +00:00
TTimo
a6e2bf8e2d misc project file fixes from trunk (e.g. rev 345). fixes the 'missing MSVCR90.DLL' absurdity
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@357 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-24 19:04:32 +00:00
rambetter
36a1c4bbad Cleaning up some file dialog tidbits in Rambetter-temp-fixes branch.
Just some code maintenence.  Like removing unused local vars.

PLS MERGE TO TRUNK.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@356 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-19 04:12:29 +00:00
rambetter
b292b8db59 This is a big big GTK file dialog change in Rambetter-temp-fixes branch.
Thank you to Markus Fischer who	provided some example code on how to
use the	"new" method of	GTK file dialogs.  I then did a	lot of research	into
how to shape his code into exactly what	I wanted.

This is	an incomplete change in	that I have not	cleaned	up the code such
as removing unused local variables and unused functions	yet.  However, I
wanted to commit this now because it really works beautifully (the GTK file
dialog that is).

- In CFileType,	m_pstrGTKMasks now contains string like
"quake3 maps (*.map)" instead of like "quake3 maps <*.map>".  Nobody else
is using this code except in gtkmisc.cpp so it's a safe	change.

- Removing all FILEDLG_DBG blocks in gtkmisc.cpp.  It really clutters up the
code and since it's completely overhauled, it's	OK to remove.

- Instead of the "old" way of gtk_file_selection_new(),	now using
gtk_file_chooser_dialog_new() instead. 	Thx to Markus Fischer for examples.

- Actually adding GTK file dialog filters.  It works really nice!  :-)

- Now using the	same file extension logic on Windows file dialogs and GTK
file dialogs.

- Improved file	extension logic.  "No file extension specified in file to       
be saved.  Attempt to save anyways?"

Tested on Win7 and Linux.
More related changes on the way.

THIS SHOULD BE MERGED INTO TRUNK.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@355 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-19 03:44:26 +00:00
rambetter
2c799718d7 Slight fix to r353 in Rambetter-fixes temp: the file suffix in
save operation is case sensitive now w.r.t. to checking a registered
suffix.  The problem was that saving a file foo.MAP does not work.

PLEASE MERGE THIS TO TRUNK.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@354 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-19 01:31:52 +00:00
rambetter
6412c5ca77 Another Windows file dialog change in Rambetter-temp-fixes branch.
Handling file extensions better	during save operations.	 This is more
Windows-compliant.  For	example, when saving map:
- If ".xmap" filter is selected	and user types "foo.map", map will be
saved as "foo.map" (previous behavior was "foo.xmap").
- If an	unrecognized file extension is typed, GtkRadiant will now honor	that
but issue a warning popup window: "Unknown file extension for this save         
operation.  Attempt to save anyways?". 	All known extensions for the type
are checked.  Previous behavior	was that the extension is always changed
based on selected filter.

I will continue	making lots of incremental fixes to Rambetter-temp-fixes.

THIS PATCH SHOULD BE MERGED INTO TRUNK.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@353 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-19 01:08:29 +00:00
rambetter
b1b208f12e Improving native Windows file dialog in Rambetter-temp-fixes branch some
more.  This adds new code and improves code committed in revision 351.

- Calling GetOpenFileName() and GetSaveFileName() from a new thread, thus
allowing the main thread to continue refreshing GtkRadiant while the native
Windows file dialog is open.  Prevents the ugly "hall of mirrors" effect.
A similar approach is used in the open source Inkscape, so I'm not doing
anything too dangerous here.  However, this _is_ hacky in my opinion.

- Using memset() to zero out the memory of the OPENFILENAME structure.
This is safer than selectively setting fields on this structure.  We no
longer need to explicity set certain field to NULL now.

- "all files" filter now lowercase to be consistent with other code.

These changes have been tested on Windows XP and Windows 7.

THIS COMMIT SHOULD BE MERGED INTO TRUNK AT SOME POINT!!!


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@352 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-18 03:03:55 +00:00
rambetter
f482df40a1 Fixing the native Windows file dialog in Rametter-temp-fixes branch
of GtkRadiant. 	The previous code was Plain Old	Wrong (TM) in the way that
it handled determining which "Save as type" was	selected in the	file save
dialog.  This change affects the function file_dialog() in gtkmisc.cpp.
Fix has	been tested on Windows 7 when the pattern input	parameter is something
such as	"map" and when it's null.  Will	test Windows XP	shortly	and follow
up with	another	commit if it's not working correctly there.

THIS COMMIT SHOULD BE MERGED INTO TRUNK	AT SOME	POINT!!!


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@351 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-16 07:08:00 +00:00
rambetter
1f99ab9e81 Progressing on bringing Radiant 1.6.x to a workable state on Windows.
This commit:
1. Reverts to using GtkR-deps-1.6-3.zip (instead of GtkR-deps-1.6-4.zip).
Some font-related DLLs are therefore no longer used with this patch.
2. Because of the above #1, now using the really old OpenGL font rendering
code on Windows systems.  This is controlled via "#ifdef _WIN32" blocks.
Linux still uses the new and improved OpenGL font rendering.
Note that this old font rendering that Windows now uses (err, has used in the
past too) makes use of gdk_gl_font_use_pango_font(), which is really old
and crufty.

So, with this commit Radiant is fully working (modulo bugs) on Linux and
Windows, and OpenGL fonts work too.

I WOULD NOT SUGGEST MERGING THIS CHANGE INTO TRUNK.  THE CORRECT APPROACH
IS TO INSTEAD FIX THE DLL LIBRARY DEPENDENCIES IN TRUNK.  I AM ONLY COMMITTING
THIS SO THAT I CAN CONTINUE FIXING BUGS IN RADIANT IN THE MEANTIME.

There are still a zillion bugs on Windows.  For example, I can't even save
a .map file at this point.  That is my next task, to fix saving of .map files.


git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@350 8a3a26a2-13c4-0310-b231-cf6edde360e5
2010-12-15 09:52:26 +00:00
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