079b8766a6
Add missing cursors (to prevent crashes), and rearrange them to match what is in intfac.img for easier referencing.
...
FIX ME: Some cursors are using the wrong names / not defined ?
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10852 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:49 +02:00
6ed22b4d3c
Frontport the changes for the logging & exception handler (for mingw) & adding mod info into the crash reports from 2.3
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10849 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:49 +02:00
a272af39bf
Fix mac keymap display.
...
Mac's normally use symbols, and not text, for modifier keys, and Qt doesn't have "text" names for the symbols.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10848 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:49 +02:00
5b390693db
Add a routine to ignore -psn_* (ProcessSerialNumber) for macs.
...
Unsure if we will ever use this for anything, so, for now, we just ignore it.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10847 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:49 +02:00
c238cb89ea
remove the temp mac hack r10815
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10846 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:48 +02:00
a9d8c1ee98
Update the build mac build doc for Qt.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10838 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:48 +02:00
048f1a8e3c
Update the xcode project into a working state.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10837 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:48 +02:00
25b94eac78
add filter for hg
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10836 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:48 +02:00
70f136a1a4
make -Cpo update-po
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10835 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:48 +02:00
0064e7151b
Get rid of scrap.c/h, no longer needed.
...
Noticed by dak180
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10834 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
0d46316a63
qt branch: Add rudimentary Qt crash handler dialog for non-mac, non-windows builds.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10832 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
dddb958e3f
qt branch: Fix fatal dialog multiplication due to multiple invokations of paintGL while dialog is open.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10831 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
1a5df98e9f
Fix clobbered merging in wzapp_c.h, and add Qt function to throw up a fatal warning dialog.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10830 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
0b2b4f70af
Add svn properties for line style.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10829 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
9b131541e1
Fix configure.ac again.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10828 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
95a1d29993
fix another file that was clobbered by the svn merge
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10827 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
e84631aa80
Add another missed file.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10826 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
9094f32914
Update a missing file
...
Try to fix configure.ac
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10825 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
0cf96267e6
MSVC fixes.
...
*NOTE* You *must* get the Qt: Framework, or Qt SDK, and set it up correctly!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10824 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
b003b2d669
Apply r10807
...
"qt branch: Merge in r10381 from trunk to improve state machinery handling in terrain drawing code."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10823 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:45 +02:00
1316841b9f
Apply r10806
...
"qt branch: Fix conflicts between Qt text drawing and our internal state machinery. Menus should work now."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10820 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:45 +02:00
732e212cfb
Apply r10805
...
"qt branch: Remove superfluous pie_SetTranslucencyMode()"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10819 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:45 +02:00
7f5030dcc3
Apply r10804
...
"qt branch: Move pie_SetRendMode() around. Make pie_SetTranslucencyMode() static."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10818 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:45 +02:00
285552f969
Apply r10803
...
"qt branch: Fix wrong include form for GLee.h, and remove only src/ use of pie_SetTranslucencyMode"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10817 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:45 +02:00
d9b06f4546
Apply r10801
...
"qt branch: Fix handling of custom textures for backdrops without our internal state machine getting all confused."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10816 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:44 +02:00
10c42fbef0
For macs, make it so ctrl = ctrl and not ctrl = cmd to match other platforms, and to keep keymap sane.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10815 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:44 +02:00
60da45798d
Fix wzapp.cpp correctly (svn did a double merge on a new file)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10814 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:44 +02:00
e65f2688e7
Stage two merge.
...
Add new files for Qt.
Remove old files
Update build system (linux).
Remove SDL.
Remove QuesoGLC.
Remove Fontconfig & other all dependencies it had.
CC & mingw (windows) & MSVC build systems are *NOT* updated / working yet.
**NOTE** MSVC people check types.h, "bool" != "BOOL" ! "bool" is a byte, "BOOL" is a int.
r8503 - r10787 (from Qt branch)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10813 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:44 +02:00
a78f262ffa
Stage one merge.
...
Adding __cplusplus header guards that were missing
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10811 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:43 +02:00
1f11fbaad1
Replace branch 'qt' with qt-trunk
...
Merge was done outside git, doing at least this "merge" commit, to keep some kind of record of history...
2010-07-10 21:07:27 +02:00
d52028a7ca
Qt dies on this date, Tuesday, June 22, 2010.
...
R.I.P
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@11022 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-23 14:34:32 +02:00
7ccb7d9ab0
A better url for downloading Qt.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10809 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:42 +02:00
cad5d8da11
qt branch: Merge in r10381 from trunk to improve state machinery handling in terrain drawing code.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10807 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:42 +02:00
5160c62b2f
qt branch: Fix conflicts between Qt text drawing and our internal state machinery. Menus should work now.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10806 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:41 +02:00
ed352d74bd
qt branch: Remove superfluous pie_SetTranslucencyMode()
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10805 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:41 +02:00
da374fda43
qt branch: Move pie_SetRendMode() around. Make pie_SetTranslucencyMode() static.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10804 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:41 +02:00
fa42dd1c2c
qt branch: Fix wrong include form for GLee.h, and remove only src/ use of pie_SetTranslucencyMode
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10803 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:41 +02:00
82b2c82654
A better test for moc since moc cannot be bothered to give a zero exit status when asked its version.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10802 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:41 +02:00
453d96d920
qt branch: Fix handling of custom textures for backdrops without our internal state machine getting all confused.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10801 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-15 22:46:49 +02:00
acc70cb9cc
laser sat graphic fix
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10799 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-15 22:46:28 +02:00
eefa02c199
Better error messages when moc is missing.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10798 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-15 10:27:28 +02:00
752751d4dc
Fix intermittent crash when launching a skirmish game.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10797 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-13 08:03:46 +02:00
227d2c2de4
New cursors by Zerovirus and Zarel - attack-move cursor idea from Olrox.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10796 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-13 08:03:46 +02:00
18d153e4f6
Estonian translation update by Erlando.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10793 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-11 10:45:03 +02:00
b47a15d83d
Fix mac builds broken by r10790.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10791 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-10 15:57:06 +02:00
3626ef502e
partial revert of r10782 to fix broken MSVC builds.
...
QT inlcudes *must* come first, before platform specific ones.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10790 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-10 15:57:06 +02:00
a1a12e1379
qt branch: Fix typo in keymapping that switched comma and colon keys.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10789 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-10 15:57:05 +02:00
43413a202f
Get rid of a spamming warning, since we can have a undefined key in the keymap, and that is a valid definition.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10788 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-10 15:57:05 +02:00
1ce9159ca8
Fixes bool issue for MSVC compilers by using correct defines for the C compiler.
...
bool is now a unsigned char to match the C++ bool which is also a char.
refs ticket:1549
Thanks to Cyp for the tip.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10787 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-10 15:57:05 +02:00
c18f9a2911
Fix a typo in the library search paths and fix the remaining sporadic lex errors.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10783 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-10 15:57:05 +02:00
Buginator
dak180
Per Inge Mathisen
Git SVN Gateway
René Jürgens
Guangcong Luo
Christian Ohm