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

431 Commits (03833edf3fc5c5f726f507d5352635fba9c7e475)

Author SHA1 Message Date
dak180 cb5842b3d1 Use a better naming scheme for the doc tarball. 2012-01-09 17:41:13 -05:00
dak180 6855e2a51d Use the included QuesoGLC. 
Adds Fribidi as an independent framework.
Also clean up some file references in the xcode project.

Refs #2828.
 2012-01-08 20:34:11 -05:00
dak180 600ae8525a Fix errors introduced by ac550ac. 2012-01-08 20:29:32 -05:00
vexed ac550acd58 Revert the new bsonlobby. 
Closes #3040.

Revert "Remove bson from project files."

This reverts commit 5c24f7b716.

Conflicts:

	lib/netplay/netlobby.h
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj

Revert "Merge branch 'refs/heads/topic/QJson'"

This reverts commit 6dd85baedf, reversing
changes made to 7d349eb214.

Conflicts:

	Makefile.am
	lib/netplay/netlobby.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
Revert "Fix various build issues for both 'qtgame' and the bson /new lobby stuff"

This reverts commit f76e960f7d.

Conflicts:

	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/gamelib/gtime.cpp
	lib/netplay/netplay.vcxproj
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj
	win32/Warzone2100.sln

Revert "Fix SSL errors on the Macs."

This reverts commit 4c387a199b.

Revert "Merge branch 'bsonlobby' into master"

This reverts commit 793c30a862, reversing
changes made to 5fa33b7209.

Conflicts:

	data/makefile.win32
	lib/netplay/netlobby.cpp
	lib/netplay/netlobby.h
	lib/netplay/netplay.cpp
	lib/widget/label.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	po/POTFILES.in
	src/configuration.cpp
	src/frontend.h
	src/multiint.cpp
 2012-01-08 23:10:26 +01:00
dak180 f60f172b62 Externalize the WarzoneHelp bundle. 2012-01-08 12:08:29 -05:00
dak180 62e4c65b63 Adjust the xcode project for the changes made in 545eb5c. 2012-01-07 14:21:51 -05:00
dak180 b70deb8538 Make the docs consistent. 
Also make sure that the right line endings are used.
 2012-01-06 06:36:04 -05:00
NanoTech 68ca38f537 Update generated OS X docs. 2012-01-05 17:41:51 -06:00
NanoTech f3d7b315a0 OS X: Make docs a valid Help bundle, add menu. 2012-01-05 17:41:49 -06:00
dak180 932d45244d Generate the quickstart guide and add it to the app bundle. 2012-01-05 10:45:42 -05:00
dak180 8fcdd1babe Activate SDL for the xcode builds. 2011-12-30 17:52:25 -05:00
dak180 0945972f1a Make autorevision output a uri in more cases. 
This does not change the form of the uri.
 2011-12-28 10:14:12 -05:00
dak180 13885c0d07 Add template.(cpp|h) and rational.h to the xcode project. 2011-12-18 18:33:13 -05:00
dak180 ce4547e9b6 Redo the merge for the xcode project file. 2011-12-17 10:54:01 -05:00
Per Inge Mathisen 700bb7a56e Merge branch 'master' into qt-sdl 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2011-12-17 16:02:26 +01:00
dak180 6c8e465bc5 Move the map tools builds out of the main xcode project. 2011-12-16 15:35:02 -05:00
dak180 1e03b2760f Exclude .svg files from the final build since they are currently unused. 
Also fix up some build rules.

Refs #2986.
 2011-12-16 15:32:08 -05:00
dak180 542a0f52fe Add cursors_sdl.(cpp|h) and wz2100icon.h files to the xcode build. 2011-12-15 19:14:41 -05:00
dak180 b7b5da782f Update Png to 1.5.7. 2011-12-15 13:54:59 -05:00
dak180 8e1c6578a1 Simplify SDL includes (especially for the mac build). 2011-12-15 13:17:43 -05:00
dak180 7cfc7b7fc7 Get rid of input.cpp in the xcode project. 2011-12-15 09:24:48 -05:00
dak180 7965939cc7 More updates to bring the xcode project inline with previous changes. 
Also some #if and #include clarity.
 2011-12-13 18:24:40 -05:00
dak180 f6d963963c Adjust the xcode build to moves and additional files. 
Some additional changes to set up support SDL for mac builds.
 2011-12-12 09:40:49 -05:00
dak180 1206639cf8 Add wzconfig.(cpp|h) to the mac build. 2011-12-11 10:26:42 -05:00
dak180 e5d7318b0c Speed boosts (for the mac build times). 
Also PBXBuildRules simplification.
 2011-12-04 14:23:43 -05:00
dak180 8ee9e6747e Change The copyright dates that get displayed. 2011-12-02 16:04:04 -05:00
dak180 06a61f011b Small correction to the sed revision processing. 2011-11-26 16:11:10 -05:00
dak180 ecb3fa62e5 Update the Xcode project for the changes in cazfi's patch. 
Closes #2936.
 2011-11-08 14:01:52 +01:00
dak180 57512019cf Update Png to 1.5.6. 2011-11-03 10:08:47 -04:00
dak180 5c700b8a2b Get rid of unnecessary files. 
Change the way the xcode project runs moc to not require additional files.
 2011-10-29 16:47:27 -04:00
dak180 758821c35d Use the md5 for the standard vids. 2011-10-24 07:32:51 -04:00
dak180 78a4482764 Fix a few errors in the dmg script. 2011-10-23 19:39:02 -04:00
dak180 cadb61ea06 Change the compile order with an eye to speed. 2011-10-23 12:02:48 -04:00
dak180 7426d0c2bf Adapt to the new video urls. 
Also do some general cleanup of the script.
 2011-10-23 00:46:14 -04:00
dak180 070b09d412 Activated Romanian translations for mac builds now that they are being updated. 2011-10-02 15:31:20 -03:00
dak180 06872ce2c9 Update Png to 1.5.5. 2011-09-22 12:08:07 -04:00
dak180 790a205f5b Add the backup url to the prebuilt script. 2011-09-22 11:35:27 -04:00
dak180 af83dc1098 Merge branch 'dak180/topic/TypeConfig' 
Mac builds no longer require X11 to be installed to run.

* topic/TypeConfig:
  Try to ensure linking to the correct versions of FontConfig and Freetype.
  Use AT&T's binaries of fontconfig and freetype for QuesoGLC.
 2011-09-18 14:59:26 -04:00
dak180 381250690b Try to ensure linking to the correct versions of FontConfig and Freetype. 
The linker on the mac prefers dynamic libs over static, so if any are in the path it will use them instead.
 2011-09-18 14:49:48 -04:00
dak180 9b4b81c797 Knock out 20 warnings cased by system frameworks in the mac build. 2011-09-15 12:27:43 -04:00
NanoTech a9925074c7 Move cocoaAppendAvailableScreenResolutions to lib/qtgame. 2011-09-14 17:09:48 -06:00
dak180 d890e63f46 Use AT&T's binaries of fontconfig and freetype for QuesoGLC. 
This eliminates the dependency on X11 for the mac builds.
 2011-09-12 01:42:15 -04:00
dak180 347e1da397 Update GLEW to 1.7.0. 2011-08-27 02:40:51 -04:00
dak180 53a23b0464 Switch vorbis to the default compiler. 2011-08-17 09:48:47 -04:00
dak180 2361edcb93 Patch vorbis to work with LLVM. 2011-08-17 09:37:38 -04:00
dak180 2d16f7848b Update Ogg to 1.3.0. 2011-08-06 12:16:12 -04:00
dak180 a899f46775 Add the map tools to the xcode project. 2011-07-30 00:39:56 -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
dak180 ca66dafa35 Fix the mac builds. 2011-07-14 23:09:31 -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