Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,636 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

3128 Commits (d1e2f1a2cb4ca989956e92d6f6009985773f0997)

Author SHA1 Message Date
Cyp f282cc289c Fix some warn-unused-result warnings. 
Wasn't compiling with -Werror.
 2011-09-02 12:07:18 +02:00
cybersphinx a22282c755 'Finnish' in Finnish is not 'tanska'. Thanks to _A-. 2011-08-26 01:09:12 +02:00
cybersphinx d3e213ee66 Don't include moc'ed files in the tarballs. 
Closes #2846.
 2011-08-04 22:36:12 +02:00
dak180 a899f46775 Add the map tools to the xcode project. 2011-07-30 00:39:56 -04:00
Per Inge Mathisen 0b36f7d0de Simplify frame redraw mechanism. Add a new paint event instantly instead of using a QTimer to redraw. Suggested by Safety0ff. Closes ticket:2842 2011-07-27 23:09:35 +02:00
cybersphinx 08d2bae4e5 Use Ctrl-V instead of Tab to paste in input boxes. 
Closes #2830.
 2011-07-27 16:06:25 +02:00
Rene Jochum 9ecba718a4 Revert "Remove a direct src include from lib/gamelib." 
This reverts commit e32c1f0e89.
It broke netsync for a weired reason.
 2011-07-20 21:42:22 +02:00
Rene Jochum cffdfa6144 Remove a direct src include from lib/sequence. 2011-07-20 12:17:27 +02:00
Rene Jochum e32c1f0e89 Remove a direct src include from lib/gamelib. 2011-07-20 12:06:13 +02:00
Rene Jochum 3ff588daab Remove another direct src include from the exceptionhandler. 2011-07-20 11:44:24 +02:00
vexed 0486acf35a Update the version to match the last build we released. 2011-07-19 21:59:29 -04:00
Rene Jochum 78af6cf247 Removes a include from src in lib/exceptionhandler/dumpinfo.cpp. 2011-07-20 03:28:49 +02:00
vexed f2e506e6dd Update MSVC builds to use SSL by default. 
NOTE: You must compile openSSL first, then point Qt to that, and then compile Qt.
 2011-07-19 20:39:36 -04:00
vexed 4479bf7e30 Update .gitignore, and some MSVC project file changes. 2011-07-19 20:33:44 -04:00
vexed f35bcccdee For commit ebc8976dc1 
the wrong stash was used.  Reapplying missing part of patch.

closes ticket:2824

Revert "Speed up text rendering for console messages by rendering to pixmaps instead of re-rendering the strings themselves for every display frame."

This reverts commit aaedaabf60.
 2011-07-19 20:23:27 -04:00
safety0ff 866aeb950b Make swapinterval.cpp independant of glew, this fixes issues caused by accessing glew vars before glew is initiliazed. 
Closes #2826.
 2011-07-18 21:06:20 +00:00
vexed c10d9ef8d4 Let's try another way to handle the trap cursor support for windows. 
Closes ticket:2813
 2011-07-18 20:42:58 -04:00
Rene Jochum 2cb5bab031 Lobby: set the right authentication flag on logouts. 2011-07-18 21:50:46 +02:00
vexed 8b8d2b676a Bring back scaled fonts as were in commit b3c2fabf16 
re: commit ebc8976dc1
 2011-07-17 14:53:47 -04:00
dak180 9357171481 Bring back QuesoGLC for the mac builds. 
X11 (Apple's official version for 10.6) is not required to be installed to run the game.

Refs #2824.
 2011-07-17 14:10:27 -04:00
vexed ebc8976dc1 Bring back quesoGLC to Warzone. 
This renders the text much faster than what Qt offers, and also fixes issues with Vsync being ON, on windows.

patch fixes by Safety0ff

closes ticket:2824

This patch basically reverts:
828c0f72ae
Revert 9e29aa5210 which reverted the removal of QuesoGLC, to start
    working on fixing the font rendering with Qt.

NOTE: On some systems, there is a assertion failure with FcFini().
We could fix the issue by doing a embed of quesoGLC in our repo, or hope the fontconfig
guys fix the issue upstream.
See ticket:2824 for more discussion on this issue.
 2011-07-17 13:15:15 -04:00
vexed f8e1c75a48 Update framework project files for this commit. 
d51379938d
Remove old cursor code. Refs #2823.
 2011-07-17 13:10:16 -04:00
Rene Jochum 022ab30a92 Fix a possible buffer overrun in netlobby 2011-07-16 13:11:56 +02:00
Rene Jochum d726117be9 Remove lib/framework/configfile.*. Closes #2823. 2011-07-14 23:11:18 +02:00
Rene Jochum 608da2ed7c Remove the unused wz2100.icon.h file. Refs #2823. 2011-07-14 23:10:54 +02:00
Rene Jochum d51379938d Remove old cursor code. Refs #2823. 2011-07-14 23:10:35 +02:00
Buginator 3971d661c7 Update qtgame project files for MSVC. 2011-07-13 22:34:41 -04:00
safety0ff c394a15fda Add swap interval control to QtGame. There's no longer any need to restart to change vsync settings. 
Refs #2815.
 2011-07-13 21:00:31 +00:00
Rene Jochum 620589928a Fix Mingw-cross-env compile errors, fixes #2820. Thx to Safety0ff. 2011-07-13 20:25:21 +02:00
Rene Jochum c6edf9fbf4 Revert the multiline feature from the label widget as it breaks updates. ... 
fixes #2818.
 2011-07-13 12:42:14 +02:00
Buginator 5c24f7b716 Remove bson from project files. 
Add qjson to include path & libs.  (Yes, we now require qjson, see 2646b4211d48f61fddb4bc2c5d1ac9d20e8201b2 )

**REMOVE** bastardization of the normal operators with the alternative operator
representations--requires special header file & should NEVER be used
in our code.  die, alternative operator representations, die!

Make a note for NO_SSL default builds (MSVC only)
 2011-07-12 21:07:58 -04:00
Buginator f4ec6ca3b2 Remove SDL_framerate.cpp/.h from project file. 
see b786c62da4
 2011-07-12 21:07:58 -04:00
dak180 6dd85baedf Merge branch 'refs/heads/topic/QJson' 2011-07-11 21:49:31 -04:00
dak180 3ddd7a279f Remove the frame rate limiter from the mac builds. 2011-07-11 15:08:59 -04:00
Per Inge Mathisen b786c62da4 Remove our own frame rate limiter, since it will break (brake) vsync when monitor vsync is higher than rate limiter. 2011-07-11 20:44:37 +02:00
Rene Jochum 616c6c4086 Replace BSON with QJson. 2011-07-11 02:33:33 +02:00
Rene Jochum 54d749f094 Reformat lib/netplay/netlobby.* 2011-07-10 17:30:25 +02:00
Buginator f76e960f7d Fix various build issues for both 'qtgame' and the bson /new lobby stuff 
for MSVC.

Nothing here should break other platforms.
 2011-07-08 21:51:16 -04:00
dak180 12676f77a8 Rename the .moc files so they do not clobber other things. 2011-07-08 21:00:15 -04:00
Rene Jochum bbad94b1fc Fix MinGW compile errors. 2011-07-08 20:42:30 +02:00
Rene Jochum 4c387a199b Fix SSL errors on the Macs. 2011-07-08 20:35:23 +02:00
Rene Jochum 793c30a862 Merge branch 'bsonlobby' into master 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2011-07-08 18:01:52 +02:00
cybersphinx ed753ff8c4 Fix Windows cross-build. 2011-07-05 02:43:43 +02:00
Rene Jochum 44235d4cb3 Moves the bson code to 3rdparty. 2011-07-04 22:56:35 +02:00
Rene Jochum f4017eda50 Merge remote-tracking branch 'upstream/master' into bsonlobby 
Conflicts:
	configure.ac
	lib/netplay/Makefile.am
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
 2011-07-03 01:04:50 +02:00
Rene Jochum 002983b6ae Splits the cacert up, fixes ssl errors on systems without it. 2011-07-03 00:38:39 +02:00
Per Inge Mathisen c07093a209 Remove complaint when WzConfig fails to open file that does not exist for reading. This is 
(unfortunately) what QSettings occasionally does to check if a file exists.
 2011-07-02 14:30:51 +02:00
dak180 1ef935e646 Get the qtgame project working in the mac build. 2011-07-01 19:50:49 -04:00
Per Inge Mathisen 4b8679b591 Fix mac compile errors and warnings. 2011-07-02 01:36:33 +02:00
Per Inge Mathisen d5001ccd54 Try again to fix mac/win compiles of qtgame 2011-07-02 01:21:23 +02:00
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