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

10341 Commits (f2e506e6ddef07375562a29df72f7c9c35331110)

Author SHA1 Message Date
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
vexed 2808328b4b Update Changelog 2011-07-18 22:26:13 -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
vexed 1bc2a38b04 Some script need this call, please don't disable it. 
(like fastplay, it is really ugly in 640x480 without it)
 2011-07-18 20:41:39 -04:00
Rene Jochum 2cb5bab031 Lobby: set the right authentication flag on logouts. 2011-07-18 21:50:46 +02:00
safety0ff 7dbf108ad6 Fix 195159406d (displayed vsync status was inverted if toggled). 
Revenge of the last minute commits part ???.
 2011-07-18 15:23:29 +00:00
vexed 4c5628b88a Update changelog for release 2011-07-17 18:39:16 -04:00
vexed 810463edfa Revert "Bump max structure limits, now that UI supports them." 
This reverts commit 61ed2a1505.
Our engine can't currently support all these units.

Once a new engine is in place, we can increase limits again.

Closes ticket:2812
 2011-07-17 17:45:59 -04:00
Per Inge Mathisen 2f394fb518 Do not clear droid rotation info on map load. Patch by Safety0ff. 2011-07-17 23:26:21 +02:00
safety0ff 195159406d Always show actual vsync setting in the interface instead of desired setting. 2011-07-17 16:46:08 +00:00
Rene Jochum d71934c8e5 Always allow playername changes in the skirmish setup screen. 2011-07-17 21:41:29 +02:00
vexed 8b8d2b676a Bring back scaled fonts as were in commit b3c2fabf16 
re: commit ebc8976dc1
 2011-07-17 14:53:47 -04:00
Rene Jochum 6688c2216a Update po/POTFILES.in 2011-07-17 20:17:32 +02: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
Per Inge Mathisen ced9c94790 Always set a sane default size for game window. Patch by glogow@fbihome.de, closes ticket:2822 2011-07-17 01:08:46 +02:00
Per Inge Mathisen b04a07cbf7 Ignore height value set in ini savegames for features, recalculate it on load every time instead. 2011-07-16 20:32:24 +02:00
Rene Jochum 022ab30a92 Fix a possible buffer overrun in netlobby 2011-07-16 13:11:56 +02:00
dak180 ca66dafa35 Fix the mac builds. 2011-07-14 23:09:31 -04:00
Rene Jochum e4727bcc9e Update po/POTFILES.in. Refs #2823. 2011-07-14 23:20:47 +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 1454529c5e Don't call po/update-custom.py in po/update-po.sh to remove python ... 
dependecies for building warzone.
 2011-07-13 18:15:45 +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
Buginator b4822511bf Add some console debug output to aid script builders with maps. 2011-07-12 21:07:57 -04:00
dak180 6dd85baedf Merge branch 'refs/heads/topic/QJson' 2011-07-11 21:49:31 -04:00
cybersphinx 7d349eb214 Update translations. 2011-07-11 22:57:07 +02:00
cybersphinx 42fd4dd0d1 Update POTFILES.in. 2011-07-11 21:43:00 +02:00
dak180 70526ea8a9 Fix the QJson url. 2011-07-11 15:41:49 -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
Per Inge Mathisen e94d8b5743 Initial mapconv changes for .gam to .ini support. 2011-07-11 20:39:21 +02:00
dak180 8c73647378 Replace BSON with QJson for the mac builds. 2011-07-11 12:15:49 -04:00
Rene Jochum 616c6c4086 Replace BSON with QJson. 2011-07-11 02:33:33 +02:00
Per Inge Mathisen 9b4b787c53 Work around crash reported in ticket:2762 where attack order has no object. 2011-07-11 00:38:33 +02:00
Rene Jochum 54d749f094 Reformat lib/netplay/netlobby.* 2011-07-10 17:30:25 +02:00
safety0ff 600952d5d1 Suppress windows console. 2011-07-09 01:35:57 +00:00
dak180 16ac69b065 Make Bson a framework to separate out different licences. 2011-07-09 00:50:53 -04: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