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

3083 Commits (3ebb55a23dbc98b65645e41ad5e638b0a93fef09)

Author SHA1 Message Date
Per Inge Mathisen b6112ae391 Remove some unused code 2011-09-03 21:26:20 -04:00
vexed f31e223626 Fix all builds, they should now all compile assuming everything is set up correctly. 
You have both Debug & Release builds, using MS's STL, and the you have Debug & Release builds using STLport.
The STLport version is prefered.
 2011-09-03 00:21:40 -04:00
vexed 0e50bcb29e update MSVC project files 2011-09-02 22:52:47 -04:00
Cyp 16c8d06caf Fix number pad on non-macs. 2011-09-02 18:46:50 +02:00
Cyp 86c9451525 Show planned structure blueprints to allies. 2011-09-02 18:35:01 +02:00
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