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

10358 Commits (23b4d3e8a1ed17e3cc9eba344c2e05e554fa5623)

Author SHA1 Message Date
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
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
dak180 e0f8fc3685 Update Png to 1.5.4. 2011-07-08 12:30:07 -04:00
cybersphinx e85f9fdfbf Actually build bson. 2011-07-08 18:14:08 +02:00
Rene Jochum 793c30a862 Merge branch 'bsonlobby' into master 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2011-07-08 18:01:52 +02:00
dak180 5fa33b7209 Update Png to 1.5.4. 2011-07-07 12:21:00 -04:00
cybersphinx 27cabaedfd Check for Xrandr header. 2011-07-05 21:23:44 +02:00
cybersphinx f5d6e2d662 Update ChangeLog. 2011-07-05 21:06:24 +02:00
cybersphinx ed753ff8c4 Fix Windows cross-build. 2011-07-05 02:43:43 +02:00
cybersphinx c85c2d5d7b Update POTFILES.in. 2011-07-05 02:12:05 +02:00
cybersphinx 4c18b7b4c9 Update ChangeLog. 2011-07-05 02:12:05 +02:00
Rene Jochum c22bf98884 Merge pull request #4 from dak180/topic/bson 
Get the mac builds working the latest location of bson.
 2011-07-04 15:48:04 -07:00
dak180 7b26683f1a Use the newer OpenAL framework. 2011-07-04 18:29:49 -04:00
dak180 b6a2c1cb63 Adjust to the bson code moving. 2011-07-04 18:24:46 -04:00
Rene Jochum ea14cbc69b Fixes the players name to his nick on the lobbyserver. 2011-07-04 23:35:49 +02:00
Rene Jochum 44235d4cb3 Moves the bson code to 3rdparty. 2011-07-04 22:56:35 +02:00
cybersphinx dc812b353e Update ChangeLog. 2011-07-04 22:43:40 +02:00
Rene Jochum 1013ed8c3f Merge pull request #3 from dak180/topic/bson 
Merge branch 'master' into topic/bson
 2011-07-04 13:39:36 -07:00
dak180 729e5ff297 Use the newer OpenAL framework. 2011-07-04 16:30:22 -04:00
Per Inge Mathisen 429fa56f39 Remove unused 'validity key' code. 2011-07-04 22:10:58 +02:00
Per Inge Mathisen 3d6533d678 Remove some unused declarations 2011-07-04 22:01:45 +02:00
Per Inge Mathisen 3d5c00fe4a Merge pull request #14 from aberent/fullscreen 
Fix fullscreen display on Linux. Patch by aberent. Closes ticket:2711
 2011-07-04 11:22:23 -07:00
Anthony Berent b826bbb2d6 Fix fullscreen display on Linux: 
1) Avoid calling mainwindow.show() before mainwindow.showFullScreen()
since the show() call seems to disable the showFullScreen() call.
2) resize the window before calling showFullScreen() since
showFullScreen() takes the resolution from the size of the window, which
is not yet set (and defaults to VGA size).
3) After showFullScreen() get back the actual size; I am not sure if
this is necessary, but the resize() documentation suggests it may be.

Fixes #2711
 2011-07-04 00:15:50 +01:00
Per Inge Mathisen d82ce97a77 Remove Dydo AI for now, since it does not work properly. 2011-07-03 22:06:41 +02:00
Per Inge Mathisen 218ac195b2 Some old script file cleanup 2011-07-03 15:47:21 +02:00
Per Inge Mathisen ec5ef19c88 Fix saving of scavengers. Fix scavenger enable button by reintroducing an absurd hack. 2011-07-03 13:50:27 +02:00
Per Inge Mathisen 29dd80d936 Split references to player index and player start position on map in savegames. This has already 
been done in the codebase earlier. This cleans up any remaining confusion and hacks related to
how players are indexed, and closes ticket:2806
 2011-07-03 13:15:31 +02:00
dak180 9273fc5f49 Merge branch 'master' into topic/bson 
Now with a proper merge of the xcode project.

Conflicts:
	configure.ac
	lib/netplay/Makefile.am
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
 2011-07-03 00:31:01 -04: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 2d69281f04 Makefiles for the last commit. 2011-07-03 00:39:31 +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 5a9f420475 Fix crash when loading active repair facilities 2011-07-02 15:28:14 +02:00
Per Inge Mathisen 09eb6e79f3 Convert structures in savegames to ini file format. 2011-07-02 14:30:51 +02:00