Commit Graph

3128 Commits (d1e2f1a2cb4ca989956e92d6f6009985773f0997)

Author SHA1 Message Date
Per Inge Mathisen 89a758f280 Fix platform macros for qtgame module. Should now compile on Mac/Windows too. 2011-07-02 01:05:17 +02:00
Per Inge Mathisen 10a78a4a7e Merge in qtgame project and make use of its trap cursor support. 2011-07-02 00:25:14 +02:00
Buginator be2c105b7a Update build for Release builds & using STLport.
Update release builds to SSE2 + STLport.
2011-06-25 19:48:46 -04:00
Buginator b17aa1e7c8 Fix broken compile for MSVC
re: f02f606913
2011-06-20 22:27:41 -04:00
safety0ff c4539a463e Remove now unused functions to prevent future misuse.
Graphics functions should not be used for deterministic code.
2011-06-12 17:33:13 +00:00
safety0ff f02f606913 Make a fixed point 3D affine transformation class and use it to do muzzle calculations.
Fixes #2724.
2011-06-12 17:33:06 +00:00
Per Inge Mathisen 94c94304fb Simple cleanup of actionX|Y droid fields. Patch reviewed by stiv. 2011-06-12 16:24:48 +02:00
Per Inge Mathisen 060345a5e4 Fix pitch and yaw of loaded units, when loading maps. 2011-06-12 13:41:47 +02:00
Per Inge Mathisen 918594f00a Do not assert fail when a value is not present in savegame ini loading vectors. 2011-06-11 19:15:28 +02:00
Buginator 690b2ccfde Fix MSVC project files that were broken after the miniupnc move. 2011-05-27 20:44:58 -04:00
Per Inge Mathisen 10249e5095 Fix int overflow in radar blip drawing. Closes ticket:2731, reviewed by Safety0ff. 2011-05-22 14:37:53 +02:00
Per Inge Mathisen 8aca9437a4 Add support for normal map loading. (Note that normal map rendering is still not supported by shaders.) Patch reviewed by Safety0ff. 2011-05-22 13:59:30 +02:00
Rene Jochum 9930be667e Fix cross compile after the miniupnc move. 2011-05-22 04:32:13 +02:00
Rene Jochum 29bbd8fb3a Move lib/netplay/miniupnpc to 3rdparty/miniupnc on autotools and ...
hopefully MSVC.
2011-05-22 04:10:04 +02:00
dak180 888720d38e Move miniupnpc into 3rdparty and set up the xcode project. 2011-05-21 19:44:55 -04:00
Rene Jochum a17c8a3a19 Final fix for the radix character. 2011-05-18 23:55:09 +02:00
cybersphinx 4d21048973 Merge branch 't/master/sequencestuff' 2011-05-14 18:52:27 +02:00
cybersphinx 2ef1cb2939 Use better (?) locale names.
Hopefully fixes #1778.
2011-05-14 17:05:47 +02:00
cybersphinx b3c2fabf16 Scale the video subtitle font with the resolution used. 2011-05-13 22:55:17 +02:00
Per Inge Mathisen 2d1b6aa05a Remove dead code from fastplay 2011-05-08 14:10:48 +02:00
Rene Jochum e4ff3366fc Moves the Cacert root Cert into data/base.wz 2011-05-07 01:17:38 +02:00
cybersphinx 2a637d009c Make YUV to RGB conversion work on big endian as well.
Refs #816.
2011-05-06 16:10:08 +02:00
cybersphinx 46695905ac Calculate the 50% scanlines with bit-fiddling. 2011-05-06 16:09:43 +02:00
cybersphinx f934b1bfc3 Add an option for scanlines when playing videos.
Shows either no, 50% dimmed or black scanlines. Disabled if the video texture
is too small (needs 2 * video height), or the video is shown so small that the
scanlines can't be noticed.

Refs #2095, #2686.
2011-05-04 23:47:08 +02:00
cybersphinx 0eae4cfc9a Optimize YUV to RGB conversion.
Refs #816.
2011-05-04 23:47:08 +02:00
cybersphinx 9c6eb54f54 Use quad instead of triangle strip to show videos. 2011-05-04 23:47:08 +02:00
cybersphinx 730371881c Make video display blurred instead of blocky. 2011-05-04 23:47:08 +02:00
cybersphinx 2e5b58d213 Make sure to deallocate video texture. 2011-05-04 23:47:08 +02:00
cybersphinx 36a2fe771c Increase video texture size to 1024x1024.
Refs #2682.
2011-05-04 23:46:44 +02:00
Rene Jochum ae62ec9be5 Remove debug line. 2011-05-04 01:58:10 +02:00
Rene Jochum 3f868107f3 Fix dead keys on Mac OS-X, research by dak180.
Fixes #2676
2011-05-04 01:54:32 +02:00
Buginator 199a6d3c27 Move GLEW out of the project, and put it into the dev-package instead. 2011-05-02 20:02:12 -04:00
Rene Jochum f821332f97 Adds the configure option "--disable-ssl", fixes related errors. 2011-05-02 21:38:10 +02:00
Rene Jochum de05a4fe5a Adds a Login and a Logout Button. 2011-05-02 20:51:05 +02:00
Rene Jochum 5b61a53a60 Updates the "Multiplayer" Screen, thx cybersphinx for the proposal. 2011-05-02 20:01:30 +02:00
Rene Jochum 47b8a7c506 Fixes smaller bugs in netlobby.cpp 2011-05-02 19:29:37 +02:00
Rene Jochum c973d67004 Fixes W_LABEL after f23a94d644. 2011-05-01 19:18:56 +02:00
Rene Jochum f23a94d644 Add an Infotext to the login screen. This modifies lib/widget/label.*! 2011-05-01 16:35:14 +02:00
Rene Jochum 204eba3c3d Replaces the games vector by a QList. 2011-05-01 07:56:22 +02:00
Rene Jochum b2e54f49e3 Adds support for SSL encrypted connections to the lobby.
Changes config values "masterserver_*" to "lobby_*"
Uses QString instead of std::string for the lobby.
Fixes small lobby related bugs.
2011-05-01 05:11:41 +02:00
Rene Jochum 7005230d64 Uses QT for Networking. 2011-05-01 05:11:41 +02:00
Rene Jochum 421f46e526 Cleans a possible error after a delGame call, might fixes a yet unknown bug. 2011-05-01 05:11:41 +02:00
Rene Jochum e66fa5ffb1 Moves the declaration of "lobbyclient" to netplay.cpp/h as it should not be part of the lobby library. 2011-05-01 05:11:41 +02:00
Rene Jochum c7497bf005 Uses a namespace "Lobby" instead of that annoying "LOBBY_" prefixes. 2011-05-01 05:11:41 +02:00
Rene Jochum 739db7c881 Makes all LobbyClient function parameters const. 2011-05-01 05:11:41 +02:00
Rene Jochum 05acab78c0 Adds a nice error message when hosting failed, proposed by cybersphinx. 2011-05-01 05:11:41 +02:00
Rene Jochum 36576eac6d Bumps netcode for NETJoinGame / NETallowJoining changes. 2011-05-01 05:11:41 +02:00
Rene Jochum 0960ad8927 Adds a login form for "Multiplay" -> "Join" -> "Lobby".
Fixes some login related stuff.
Adds a check for joining users.
2011-05-01 05:11:41 +02:00
Rene Jochum c7441cad41 Optimizes the lobbyclient adds a new logging facility "LOG_LOBBY". 2011-05-01 05:11:41 +02:00
Rene Jochum 963bae58f4 Adds LOGIN support, you need to set "lobby_user" and "lobby_token" in your config as theres currently no GUI for that. 2011-05-01 05:11:41 +02:00
Rene Jochum 8b588a9501 Returns the error message instead of its code. 2011-05-01 05:11:41 +02:00
Rene Jochum 273d6381d3 Replaces Masterserver setter/getter with the ones from lobbyclient. 2011-05-01 05:10:08 +02:00
Rene Jochum 114f5a0d65 Silently tries to remove an existing game on the lobbyserver, supports 64bit ints for gameId. 2011-05-01 05:10:07 +02:00
Rene Jochum 062b864cb8 Removes GAMESTRUCT and SESSIONDESC, brakes savegames! 2011-05-01 05:10:07 +02:00
Rene Jochum 754e6c15c7 Uses Protocol V4 - BSON. 2011-05-01 05:10:07 +02:00
Rene Jochum 54fca60476 Embeds BSON from https://github.com/mongodb/mongo-c-driver - daba871. 2011-05-01 05:10:07 +02:00
Cyp 99394b816a Fix unneeded rounding errors. 2011-04-29 09:47:07 +02:00
Rene Jochum 4793a6a645 Fixes keybindings for numpad keys, arrow keys are numpad on the mac. 2011-04-29 00:48:58 +02:00
Buginator f8cc92dfd7 Demote Asserts() to LOG_INFO from LOG_ERROR, to prevent some end-user confusion.
We have 956 lines of LOG_ERRORs currently.
2011-04-26 22:49:39 -04:00
Buginator ce10843e02 Add a FSAA menu option.
NOTE: It is impossible to tell what the max level the card (drivers) supports,
without actually testing for said level.
2011-04-26 22:41:49 -04:00
Per Inge Mathisen 2769798d3d saveConfig() omits some values from saving, what leads to certain values ​​are reset to their default value. Initial patch by Fastdeath. Closes ticket 2670. 2011-04-26 22:51:35 +02:00
Per Inge Mathisen 4c673ebb09 Rearrange init sequence so that QApplication is run before i18n init. Fixes ticket 2566. 2011-04-26 22:44:03 +02:00
Buginator 140e707e5c Fix autohell's builds for mingw32
--fix by pabs3.
2011-04-25 22:16:53 -04:00
Buginator 75003517f9 This typo it brought to you by autohell'r'us, where the more difficult we can make it for the developer, the more they want to stick with us! 2011-04-25 21:38:21 -04:00
Buginator 2536b5f89f Might help if the copy & paste was what I wanted, not what it did. :P
Spotted by Safety0ff again.
2011-04-25 21:28:41 -04:00
Buginator a1bfd1f4c1 Fix {} to () spotted by Safety0ff. 2011-04-25 21:20:30 -04:00
Buginator fa91ccebb4 Only add the STATICLIB & _WIN32_WINNT defines for mingw builds
I would like to thank autohell for this commit.
2011-04-25 20:51:51 -04:00
Buginator 1c9bdd6f1b remove SDL flags, and add -D_WIN32_WINNT=0x0501 2011-04-25 20:06:37 -04:00
Buginator 5829d0a7ae MSVC fixes for miniupnp 2011-04-25 19:47:55 -04:00
Buginator 4680765ea9 Add lib iphlpapi for miniupnp
Fix define to STATICBUILD
2011-04-25 19:47:54 -04:00
cybersphinx 779fdd62bd Revert "Include miniupnpc headers as C."
Didn't work.
This reverts commit 954b5ad05b.
2011-04-25 23:49:02 +02:00
cybersphinx 954b5ad05b Include miniupnpc headers as C.
Should fix cross-compilation.
2011-04-25 22:55:53 +02:00
Rene Jochum 7bf96b20de Merge branch 'master' of github.com:Warzone2100/warzone2100 2011-04-25 22:22:06 +02:00
Rene Jochum 380123f97c Removes some includes from netplay.cpp as they are now in netsocket.h. 2011-04-25 22:10:49 +02:00
cybersphinx 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
Rene Jochum 8c57afedd2 Bumps MaxGames to 18 as 18 will shown fine on two columns in GAMEFIND. 2011-04-25 20:40:09 +02:00
Rene Jochum 4feac21ecb Moves per platform includes from netsocket.cpp to netsocket.h. 2011-04-25 20:39:11 +02:00
Rene Jochum 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
Rene Jochum b3106415ba Replaces NETgameIsCorrectVersion with NETisCorrectVersion, removes NETgameIsCorrectVersion. 2011-04-25 20:35:05 +02:00
Rene Jochum 15b5b6a48f Drops an incoming connection correct when the host is full, resolves a FIXME. 2011-04-25 20:33:27 +02:00
Rene Jochum 027229f5c9 Fixes client ip handling for the banlist. 2011-04-25 20:32:03 +02:00
Per Inge Mathisen 86a92ed314 Rendering cleanup, by Safety0ff. Closes ticket 2664. 2011-04-25 12:30:30 +02:00
Cyp 6adf3a7f70 Use -fno-strict-aliasing instead of -Wno-strict-aliasing for miniupnpc.
Fixes ticket:2666.
2011-04-25 11:46:19 +02:00
Per Inge Mathisen 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
Per Inge Mathisen 0fc0eeeb86 Fix optimized compile warnings. Remove unused GLee remains. 2011-04-25 00:32:57 +02:00
cybersphinx 89063105fa Actually start UPnP thread.
Closes #2631.
2011-04-24 13:57:11 +02:00
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 8be8d0949f Fix bugs in wzfs implementation. 2011-04-24 00:10:02 +02:00
Per Inge Mathisen 768fbe40e4 Fix compile warning. This closes ticket:2659 2011-04-23 23:24:41 +02:00
cybersphinx 65e2000db0 Remove unused variable gcc 4.6 doesn't like.
Closes #2659.
2011-04-23 21:52:25 +02:00
cybersphinx 25c2e2f540 Fix lib/netplay/miniupnpc/Makefile.am for renamed file. 2011-04-23 20:56:19 +02:00
cybersphinx 845d628a4b Add missing miniupnpc files. 2011-04-23 19:04:21 +02:00
cybersphinx d85bc38f5f Reapply miniupnpc segfault fix.
Is included upstream for newer versions.
2011-04-23 15:41:29 +02:00
cybersphinx 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
cybersphinx 583c318c2e Remove unused files from lib/netplay/miniupnpc. 2011-04-23 15:32:01 +02:00
Per Inge Mathisen 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
safety0ff 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
safety0ff 45c61b0b54 Only check for OpenGL 4 support if GLEW supports it. 2011-04-21 00:56:08 +00:00
cybersphinx 4f0296e801 Remove redundant info from the crashdumps. 2011-04-20 17:15:40 +02:00
Buginator 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
cybersphinx f312fd3e7d Demote GLEW version message to LOG_3D/crashdumps.
Also remove a few spaces before colons.
2011-04-20 17:11:04 +02:00
Per Inge Mathisen 777d50cd59 Remove more GLee related files 2011-04-20 16:44:10 +02:00
safety0ff 720caa8c31 Add omitted word to comment about inclusion order of glew.h. 2011-04-20 16:28:42 +02:00
safety0ff 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
safety0ff 2cb9d1e737 Fix glew cross compilation. 2011-04-20 16:28:41 +02:00
cybersphinx 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
cybersphinx 3481d2e0f6 Rip out our integrated GLee copy.
Conflicts:

	po/update-po.sh
	src/display3d.c
2011-04-20 16:28:41 +02:00
Per Inge Mathisen 5867fea746 Fix header define for some Windows thing to match how it is done in master. 2011-04-18 22:53:06 +02:00
Per Inge Mathisen c32d791ae0 qt: Add some more vector types to WzConfig 2011-04-18 11:08:27 +02:00
Per Inge Mathisen 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
Per Inge Mathisen 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
Buginator 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
Buginator 0af6d3fcef Fix VS2k10 files for Qt 2011-04-17 15:42:14 -04:00
cybersphinx 8f2ac8e0c8 Demote GLEW version message to LOG_3D/crashdumps.
Also remove a few spaces before colons.
2011-04-10 22:56:11 +02:00
Per Inge Mathisen 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
safety0ff 455553a54b Fix misusing utf8 encoded string as local codepage encoded string in exception handler.
Closes #2607.
2011-04-03 22:23:04 -04:00
safety0ff 49b78c1f80 Fix exchndl.cpp to work with recent versions of BFD.
Hopefully fixes #343.
2011-04-03 22:23:04 -04:00
cybersphinx 38088f37bc Add Catalan translation by mecatxis.
Closes #2616.
2011-04-03 21:44:57 +02:00
Per Inge Mathisen 0372b01b80 House cleaning in campaign resource files. Removing unused directories. Adding an assert for them. 2011-04-03 13:57:48 +02:00
Per Inge Mathisen 09c023a2d0 Actually remove GLee files. 2011-04-03 12:39:44 +02:00
cybersphinx 8bc7aa208c Add Hungarian translation by Mészáros Tamás.
Also sort the LANG_NAMEs.
2011-04-03 01:56:08 +02:00
Per Inge Mathisen de3be04ac5 Fix flickering due to face culling not being properly enabled. 2011-04-02 10:54:47 +02:00
Per Inge Mathisen 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
Per Inge Mathisen 1fe2cc8f4d Use GLEW instead of GLee. Based on patch by cybersphinx. 2011-04-02 10:08:26 +02:00
Per Inge Mathisen d78a8eb8ad Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load. 2011-04-01 20:31:15 +02:00
Buginator 84e4bf40cf Cleanup VS2k10 project files 2011-03-31 19:14:18 -04:00
Per Inge Mathisen 0ee8b860f8 Merge remote branch 'origin/qt' into qtscript 2011-03-30 18:05:40 +02:00
Buginator f431fc08c7 Remove a file that wasn't in the project's frustum. 2011-03-26 00:48:32 -04:00
Buginator 60099b70d6 Revert "Fix MMB use."
open ticket:2578

This reverts commit b3dcccba1d.

Conflicts:

	lib/framework/wzapp.cpp
2011-03-24 22:36:01 -04:00
Buginator 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
Buginator b3dcccba1d Fix MMB use.
fixes ticket:2578

Also add mouse button state to LOG_INPUT
2011-03-24 19:47:28 -04:00
Cyp 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
Cyp fe4d13f335 Add Meta as alternative to Alt when giving scout orders. 2011-03-21 23:56:08 +01:00
Cyp e5a4039e8f Fix Shift+Tab and ` keys.
Fixes ticket:2561.
2011-03-21 23:13:41 +01:00
Buginator 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

fixes ticket:2556
2011-03-19 21:52:25 -04:00
Buginator 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

fixes ticket:2556
2011-03-19 18:40:25 -04:00
Cyp ccab8415fa Add team-coloured blitting functions. 2011-03-18 19:18:48 +01:00
Buginator 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  2f780609.
cherry picked from commit c046bb88e5
2011-03-17 21:35:07 -04:00
Buginator ab118527f0 add guards 2011-03-17 21:35:06 -04:00
Buginator 466374d15d Populate some defines for MSVC (which we do nothing with anyway) 2011-03-17 21:35:03 -04:00
Buginator 0d4378c96f Add MSVC version guard, since this function is now included. 2011-03-17 21:35:02 -04:00
Buginator 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
Per Inge Mathisen 59309f5e59 Set a more sane FPS default limit of 60, rather than 30. 2011-03-15 21:17:21 +01:00
Per Inge Mathisen 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
Cyp 8ba7c625f0 Fix "bool|bool" instead of "bool|BOOL" in script lexer.
(Broke in a72c41aeec0136c86007739a97ccc9ed508c0283.)
2011-03-15 15:29:34 +01:00
Cyp 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
abomination 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
Cyp ad1fcb0c99 Remove some surviving “extern "C"”. 2011-03-13 10:30:13 +01:00
safety0ff 5ac26462f1 Fix use of uninitialized variable in exception handler. 2011-03-12 12:23:56 -05:00