779fdd62bd
Revert "Include miniupnpc headers as C."
...
Didn't work.
This reverts commit 954b5ad05b
2011-04-25 23:49:02 +02:00
954b5ad05b
Include miniupnpc headers as C.
...
Should fix cross-compilation.
2011-04-25 22:55:53 +02:00
7bf96b20de
Merge branch 'master' of github.com:Warzone2100/warzone2100
2011-04-25 22:22:06 +02:00
380123f97c
Removes some includes from netplay.cpp as they are now in netsocket.h.
2011-04-25 22:10:49 +02:00
4c68d121d6
Don't uselessly include static libraries in other static libraries.
...
Saves ~40 MB of diskspace when building.
2011-04-25 21:33:53 +02:00
8c57afedd2
Bumps MaxGames to 18 as 18 will shown fine on two columns in GAMEFIND.
2011-04-25 20:40:09 +02:00
4feac21ecb
Moves per platform includes from netsocket.cpp to netsocket.h.
2011-04-25 20:39:11 +02:00
5eac7e75e6
Changes the way connections between clients and hosts are established, thereby removes the "GAMEFIND" screen from IP connections.
...
This is required for the later removeal of GAMESTRUCT and generaly cleansup code.
Before:
Client -> "list"
Server <- "1<GAMESTRUCT>
Client -> "join"
Client -> VERSION_MAJOR/MINOR
SERVER <- OK/WRONG/KICKED
After:
Client -> VERSION_MAJOR/MINOR
SERVER <- OK/WRONG/KICKED
2011-04-25 20:37:20 +02:00
b3106415ba
Replaces NETgameIsCorrectVersion with NETisCorrectVersion, removes NETgameIsCorrectVersion.
2011-04-25 20:35:05 +02:00
15b5b6a48f
Drops an incoming connection correct when the host is full, resolves a FIXME.
2011-04-25 20:33:27 +02:00
027229f5c9
Fixes client ip handling for the banlist.
2011-04-25 20:32:03 +02:00
86a92ed314
Rendering cleanup, by Safety0ff. Closes ticket 2664.
2011-04-25 12:30:30 +02:00
6adf3a7f70
Use -fno-strict-aliasing instead of -Wno-strict-aliasing for miniupnpc.
...
Fixes ticket:2666.
2011-04-25 11:46:19 +02:00
3f8cecb841
Merge branch 'master' into qt
...
Conflicts:
configure.ac
lib/ivis_opengl/Makefile.am
lib/ivis_opengl/glew/glew.vcxproj
lib/ivis_opengl/glew/glew.vcxproj.filters
lib/ivis_opengl/piedraw.cpp
lib/ivis_opengl/piemode.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/tex.cpp
lib/sequence/Makefile.am
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Glew-All.xcconfig
macosx/configs/QuesoGLC-All.xcconfig
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
src/texture.cpp
win32/libs/Makefile
win32/libs/glew/Makefile
win32/libs/glew/patches/glew_pkgconfig.diff
2011-04-25 00:51:13 +02:00
0fc0eeeb86
Fix optimized compile warnings. Remove unused GLee remains.
2011-04-25 00:32:57 +02:00
89063105fa
Actually start UPnP thread.
...
Closes #2631 .
2011-04-24 13:57:11 +02:00
657bb2d31b
Fix crash in MSVC when using QVariantList. Fix crash with effects with null IMDs. Patch by Buginator.
2011-04-24 10:08:30 +02:00
4e865bcb3c
Remove hack to circumvent physfs for writing ini files. Require physfs 2 or greater to circumvent
...
write corruption bug in physfs. Use utf-8 in file names in virtual filesystem.
2011-04-24 01:03:25 +02:00
8be8d0949f
Fix bugs in wzfs implementation.
2011-04-24 00:10:02 +02:00
768fbe40e4
Fix compile warning. This closes ticket:2659
2011-04-23 23:24:41 +02:00
65e2000db0
Remove unused variable gcc 4.6 doesn't like.
...
Closes #2659 .
2011-04-23 21:52:25 +02:00
25c2e2f540
Fix lib/netplay/miniupnpc/Makefile.am for renamed file.
2011-04-23 20:56:19 +02:00
845d628a4b
Add missing miniupnpc files.
2011-04-23 19:04:21 +02:00
d85bc38f5f
Reapply miniupnpc segfault fix.
...
Is included upstream for newer versions.
2011-04-23 15:41:29 +02:00
d180026116
Update miniupnpc to version 1.5.
...
Thanks to pabs for the needed changes to netplay.cpp (refs #2513 ).
2011-04-23 15:36:30 +02:00
583c318c2e
Remove unused files from lib/netplay/miniupnpc.
2011-04-23 15:32:01 +02:00
bbf4cb0587
qt branch: Rewrite config file handling to use WzConfig. Also removes unused option to disable
...
coloured mouse cursors, and the old "registry" code. Qt virtual physfs filesytem initialization
move to the main function, since it is now needed earlier.
2011-04-21 12:58:51 +02:00
fec754abd7
Reapply 635643e101 which got lost in the mix...
...
Add openal cflags to sequence lib build, fixes linking with static openal-soft.
2011-04-21 01:33:28 +00:00
45c61b0b54
Only check for OpenGL 4 support if GLEW supports it.
2011-04-21 00:56:08 +00:00
4f0296e801
Remove redundant info from the crashdumps.
2011-04-20 17:15:40 +02:00
bd28224a27
Partial revert of 1fe2cc8f4d
...
Use Glew's macros to check if the function is supported or not.
(cherry picked from commit 3f96f2e323
2011-04-20 17:11:20 +02:00
f312fd3e7d
Demote GLEW version message to LOG_3D/crashdumps.
...
Also remove a few spaces before colons.
2011-04-20 17:11:04 +02:00
777d50cd59
Remove more GLee related files
2011-04-20 16:44:10 +02:00
720caa8c31
Add omitted word to comment about inclusion order of glew.h.
2011-04-20 16:28:42 +02:00
be2feff7aa
Remove redundant glu.h inclusions (taken care of by framework/opengl.h -> GL/glew.h -> glu.h).
2011-04-20 16:28:41 +02:00
2cb9d1e737
Fix glew cross compilation.
2011-04-20 16:28:41 +02:00
c80e14ca35
Use glew instead of GLee.
...
Not sure if 1.5.4 is actually the minimal version we need.
Conflicts:
configure.ac
lib/ivis_common/tex.h
lib/ivis_opengl/pieblitfunc.c
lib/ivis_opengl/piefunc.c
lib/ivis_opengl/piematrix.c
lib/ivis_opengl/screen.c
2011-04-20 16:28:41 +02:00
3481d2e0f6
Rip out our integrated GLee copy.
...
Conflicts:
po/update-po.sh
src/display3d.c
2011-04-20 16:28:41 +02:00
5867fea746
Fix header define for some Windows thing to match how it is done in master.
2011-04-18 22:53:06 +02:00
c32d791ae0
qt: Add some more vector types to WzConfig
2011-04-18 11:08:27 +02:00
dda501bf13
Merge remote branch 'origin/master' into qt
...
Conflicts:
data/base/script/text/cam1a.slo
lib/exceptionhandler/exceptionhandler.vcxproj
lib/exceptionhandler/exchndl.h
lib/framework/framework.vcxproj
lib/gamelib/gamelib.vcxproj
lib/iniparser/iniparser.vcxproj
lib/ivis_opengl/ivis_common.vcproj
lib/ivis_opengl/ivis_opengl.vcxproj
lib/netplay/netplay.vcxproj
lib/script/script.vcxproj
lib/sequence/sequence.vcxproj
lib/sound/sound.vcxproj
lib/widget/widget.vcxproj
macosx/README.BUILD.txt
macosx/Warzone.xcodeproj/project.pbxproj
src/Warzone2100.vcxproj
src/main.cpp
2011-04-17 23:17:24 +02:00
68b940da82
A bit early to check for OpenGL 4.x already, don't you think? Breaks with earlier versions of GLEW.
2011-04-17 22:10:42 +02:00
3f96f2e323
Partial revert of 1fe2cc8f4d
...
Use Glew's macros to check if the function is supported or not.
2011-04-17 15:45:44 -04:00
0af6d3fcef
Fix VS2k10 files for Qt
2011-04-17 15:42:14 -04:00
8f2ac8e0c8
Demote GLEW version message to LOG_3D/crashdumps.
...
Also remove a few spaces before colons.
2011-04-10 22:56:11 +02:00
df4e48ec16
qt branch: Kill off the over-engineered tagfile format. Replacing it with the more retro ini file format.
2011-04-06 22:06:17 +02:00
455553a54b
Fix misusing utf8 encoded string as local codepage encoded string in exception handler.
...
Closes #2607 .
2011-04-03 22:23:04 -04:00
49b78c1f80
Fix exchndl.cpp to work with recent versions of BFD.
...
Hopefully fixes #343 .
2011-04-03 22:23:04 -04:00
38088f37bc
Add Catalan translation by mecatxis.
...
Closes #2616 .
2011-04-03 21:44:57 +02:00
0372b01b80
House cleaning in campaign resource files. Removing unused directories. Adding an assert for them.
2011-04-03 13:57:48 +02:00
09c023a2d0
Actually remove GLee files.
2011-04-03 12:39:44 +02:00
8bc7aa208c
Add Hungarian translation by Mészáros Tamás.
...
Also sort the LANG_NAMEs.
2011-04-03 01:56:08 +02:00
de3be04ac5
Fix flickering due to face culling not being properly enabled.
2011-04-02 10:54:47 +02:00
71ad7a8742
Various cross-compile and win32 stuff needed for glew. From patches by Safety0ff and cybersphinx. Untested.
2011-04-02 10:19:08 +02:00
1fe2cc8f4d
Use GLEW instead of GLee. Based on patch by cybersphinx.
2011-04-02 10:08:26 +02:00
d78a8eb8ad
Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load.
2011-04-01 20:31:15 +02:00
84e4bf40cf
Cleanup VS2k10 project files
2011-03-31 19:14:18 -04:00
0ee8b860f8
Merge remote branch 'origin/qt' into qtscript
2011-03-30 18:05:40 +02:00
f431fc08c7
Remove a file that wasn't in the project's frustum.
2011-03-26 00:48:32 -04:00
60099b70d6
Revert "Fix MMB use."
...
open ticket:2578
This reverts commit b3dcccba1d
2011-03-24 22:36:01 -04:00
1f5d94a564
Fix VS2k10 for Qt.
...
NOTE: All Qt headers *MUST* be before of the other headers, or else we get tons of conflicts
***
DO NOT CHANGE HEADER ORDER, unless you know what you are doing, it will fubar
other build systems!
****
close ticket:2570
2011-03-24 20:06:59 -04:00
b3dcccba1d
Fix MMB use.
...
fixes ticket:2578
Also add mouse button state to LOG_INPUT
2011-03-24 19:47:28 -04:00
23f318fe39
Merge branch 'master' into qt
...
Conflicts:
lib/exceptionhandler/exceptionhandler.vcproj
lib/framework/frame.h
lib/framework/framework.vcproj
lib/framework/input.h
lib/gamelib/gamelib.vcproj
lib/iniparser/iniparser.vcproj
lib/ivis_opengl/ivis_opengl.vcproj
lib/netplay/netplay.vcproj
lib/script/script.vcproj
lib/sequence/sequence.vcproj
lib/sound/sound.vcproj
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
src/Makefile.am
win32/Warzone2100.vcproj
2011-03-22 00:01:28 +01:00
fe4d13f335
Add Meta as alternative to Alt when giving scout orders.
2011-03-21 23:56:08 +01:00
e5a4039e8f
Fix Shift+Tab and ` keys.
...
Fixes ticket:2561.
2011-03-21 23:13:41 +01:00
12e1d13c6c
Part 2:
...
Fix overzealous BOOL->bool conversion
Structures *must* remain the same size, BOOL was initially cast as a int, and we would read/write values expecting 32bit values, needless to say, this caused issues. The same applies to varaiables that pretend to be a BOOL, and may indeed have been used as a bool, but again, the size is 32bits, not 1 byte.
Revert "fix [s]BOOLs bool by 4B0/\/\1|\|4710|\|" This reverts parts of commit a72c41aeec
2011-03-19 21:52:25 -04:00
405d03224c
Fix overzealous BOOL->bool conversion
...
Structures *must* remain the same size, BOOL was initially cast as a int,
and we would read/write values expecting 32bit values, needless to say,
this caused issues.
The same applies to varaiables that pretend to be a BOOL, and may indeed have
been used as a bool, but again, the size is 32bits, not 1 byte.
Revert "fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|"
This reverts parts of commit a72c41aeec
2011-03-19 18:40:25 -04:00
ccab8415fa
Add team-coloured blitting functions.
2011-03-18 19:18:48 +01:00
31502ccdce
Let us try this again, leave the never-interactive option for the lexers.
...
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in 2f780609c046bb88e5
2011-03-17 21:35:07 -04:00
ab118527f0
add guards
2011-03-17 21:35:06 -04:00
466374d15d
Populate some defines for MSVC (which we do nothing with anyway)
2011-03-17 21:35:03 -04:00
0d4378c96f
Add MSVC version guard, since this function is now included.
2011-03-17 21:35:02 -04:00
5cfd2e9dbe
Initial VS2k10 changes.
...
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
2011-03-17 21:35:00 -04:00
59309f5e59
Set a more sane FPS default limit of 60, rather than 30.
2011-03-15 21:17:21 +01:00
8c69f5dc19
Clean up jump propulsion code. Fix warning in audio test code. Ref warnings from ticket:2531
2011-03-15 18:50:03 +01:00
8ba7c625f0
Fix "bool|bool" instead of "bool|BOOL" in script lexer.
...
(Broke in a72c41aeec0136c86007739a97ccc9ed508c0283.)
2011-03-15 15:29:34 +01:00
e689ad51d5
Merge remote branch 'origin/master' into qt
...
Conflicts:
configure.ac
lib/exceptionhandler/exceptionhandler.h
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.cpp
lib/framework/input.h
lib/ivis_opengl/pieclip.h
lib/ivis_opengl/screen.cpp
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/console.cpp
src/console.h
src/frontend.cpp
win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
2011-03-13 22:31:19 +01:00
a72c41aeec
fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
...
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
2011-03-13 12:32:24 +01:00
ad1fcb0c99
Remove some surviving “extern "C"”.
2011-03-13 10:30:13 +01:00
5ac26462f1
Fix use of uninitialized variable in exception handler.
2011-03-12 12:23:56 -05:00
ad4a33a789
Fix capitalization of winsock2.h, not sure if this include is still needed (not present in master).
2011-03-12 10:19:04 -05:00
c7d206b6e9
Now run save/load of script state
2011-03-12 14:47:45 +01:00
635643e101
Add openal cflags to sequence lib build, fixes linking with static openal-soft.
2011-03-02 22:36:11 -05:00
f1495ac6ef
Convert command line options to utf-8 and use unicode directory routines (Windows).
...
Closes #1066 .
2011-03-01 20:48:33 -05:00
676f453332
Do memset of NetPlay.games array, not MAX_PLAYERS elements of NetPlay.games.
...
MAX_PLAYERS was less than MaxGames, so it wouldn't memset too much, at least.
2011-02-28 20:06:30 +01:00
239eebec00
Remove GAME_SECONDARY in favour of GAME_DROIDINFO, which is sent more efficiently for multiple droids.
...
Instead of one message per droid, it sends one message for all droids, with the list of droids encoded as droid ID deltas.
2011-02-27 20:20:43 +01:00
cc150fc2f7
Exit if shaders are not supported, and revert "Hack in the team colour when shaders aren't supported."
...
This reverts commit e0617af5e6
2011-02-25 23:01:03 +01:00
a7730ccd15
Change "typedef struct {...} Blah;" into "struct Blah {...};".
...
Removed a few structs due to disuse.
2011-02-25 21:30:13 +01:00
dc4cf90ce5
Merge branch 'master' into qt
...
Conflicts:
lib/framework/input.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
lib/widget/scrap.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.cpp
2011-02-25 18:59:41 +01:00
4a1b5fb543
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:50:54 +01:00
ae2ce18314
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
e0617af5e6
Hack in the team colour when shaders aren't supported.
...
Ugly, but better than nothing.
2011-02-20 22:10:12 +01:00
48ff5e55d2
Fix 2 cpp check warnings reported by pabs3.
2011-02-18 15:54:39 +01:00
733ab6e911
Fix compilation with C++0x compilers.
...
Can't use nullptr, until switching to C++0x.
2011-02-15 14:28:08 +01:00
577cbbf874
Fix weird logfile date due to Jan..Dec = 0..11 in struct tm.
2011-02-14 22:08:11 +01:00
5ea9d75ab2
qt branch: Soften font colours a bit to make them look more like master.
2011-02-06 22:41:27 +01:00
dc2385368c
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.cpp
lib/framework/frame.h
2011-02-05 18:44:00 +01:00
a236387ad1
Add missing include.
2011-02-05 18:35:56 +01:00
1db938cd0b
Set a window icon.
...
lib/framework/wz2100icon.h created from the 32x32 icon from
icons/warzone2100.ico by the Gimp's C code export.
Closes #2465 .
2011-02-05 18:23:00 +01:00
7b0316696e
Add cast to fix compilation with -Werror.
2011-02-05 18:00:39 +01:00
cybersphinx
Rene Jochum
Per Inge Mathisen
Cyp
safety0ff
Buginator
abomination