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

219 Commits (19bfa0d8f6ba80b796825147b4d084142aef666b)

Author SHA1 Message Date
dak180 ac91494c60 Update the xcode project file from the newnet merge. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11471 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-15 09:53:42 +02:00
Cyp 7d5f1271a9 Merge remote branch 'origin/master' into newnet 
Conflicts:
	.gitignore
	lib/iniparser/Makefile.am
	macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
 2010-08-14 11:26:09 +02:00
dak180 158e58f27c Update the Korean .strings file. 
Refs #2075.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11445 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-13 11:29:54 +02:00
dak180 2f871942fe Update the Korean .strings file. 
Refs #2075.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11442 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-13 11:28:22 +02:00
dak180 36c9b413a5 Update the PT_BR .strings file. 
Closes #2047.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11366 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:39:11 +02:00
dak180 f2548c181f Update the PT_BR .strings file. 
Closes #2047.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11365 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-03 09:38:29 +02:00
dak180 3d0befebc9 Fix up the build rules. 
Add the Korean .strings file.

Closes #2039.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11318 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-31 19:03:34 +02:00
dak180 943af316ec Add the Korean .strings file. 
Closes #2039.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11317 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-31 18:51:15 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
 2010-07-30 22:51:33 +02:00
dak180 3f69367f3a Add dSYM bundles for maximum symbolication. 
http://bitbucket.org/boredzo/symbolicator can be used to symbolicate crash logs from people without dSYM bundles.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11313 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-29 23:27:39 +02:00
dak180 4e8f1fb7f3 Add the font files and clean up some of the scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11240 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-21 17:43:57 +02:00
Cyp 1a39299572 Merge remote branch 'origin/master' into newnet 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2010-07-20 23:07:26 +02:00
dak180 f7ceb6aca1 Since user comments at the top of "project.pbxproj" do not stick, be creative. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11236 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-20 23:01:36 +02:00
Guangcong Luo 2dcb53d326 Fix bug #1994 and apply patch #1998 - Change Mac OS X to use DejaVu Sans like in Windows/Linux, which fixes problems with text alignment. refs #1994, closes #1998 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11230 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
dak180 860d164ff4 Rip -mfpmath=sse and -mno-fused-madd out since we are eliminating floats instead. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11141 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 08:08:34 +02:00
dak180 d2994ad998 astar.c --> astar.cpp 
Add jpeg_encoder.(c|h)

Remove -mfpmath=sse and -mno-fused-madd since floats are going to be ripped out and so clang can be used

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11119 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 18:04:28 +02:00
Cyp f0beca71cc Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/netlog.c
	lib/netplay/netlog.h
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	macosx/configs/Warzone-Debug.xcconfig
	src/multijoin.c
 2010-07-10 17:02:39 +02:00
dak180 cd7550c0aa Make the Autorevision script a bit smarter. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11106 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:37 +02:00
dak180 d4996a8b7d Switch to gcc4.2 so -mfpmath=sse and -mno-fused-madd actually do something. 
Clean up a Build Rule for bison.

Make the autorevision script smarter.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11105 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-07 07:47:33 +02:00
dak180 9467cbd5a4 -msse3 is only used on intel in any case. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11104 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-07 07:47:33 +02:00
dak180 a658e90d16 Get rid of VORBIS_NEEDS_HACK on the theory that less hacks are better. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11102 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-06 07:17:42 +02:00
dak180 559a02e7f7 Minor adjustments to better match up with newnet. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11101 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-06 07:17:41 +02:00
dak180 88c1e07e00 Update the xcode project to bring it in line with trunk and multibot.c → cpp. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11096 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-05 19:12:24 +02:00
dak180 b66bdb8955 Turn -Wsign-compare warnings off until someone has time to fix them. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11093 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-05 08:08:53 +02:00
dak180 2d7d29c861 Change astar.c to astar.cpp in xcode project. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11092 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-03 11:06:38 +02:00
dak180 bb2eed7c63 Add jpeg_encoder.(c|h) to the xcode project. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11088 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-02 08:31:40 +02:00
dak180 5789b3acf9 Update libping to ver. 1.4.3. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11076 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-29 07:37:57 +02:00
dak180 36891ca806 Add a warning that we do not get now so we will not get it later. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11069 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-28 08:20:54 +02:00
dak180 0fbdda02f7 Add some warnings for Zarel. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11057 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-27 07:49:21 +02:00
Cyp 0b0e986ec6 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/gamelib/gtime.c
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	src/multiint.c
	src/multisync.c
 2010-06-26 22:42:44 +02:00
dak180 94fef64201 Clean up the link phase. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11034 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-26 19:50:22 +02:00
dak180 c77a8f43f9 Change compilers around to make Vorbis happy. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11029 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-24 20:00:16 +02:00
dak180 64b75224e7 Support for Mac OS X 10.4 is now dropped; the binaries may still work on 10.4 but this is no longer supported. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11026 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-23 23:42:28 +02:00
dak180 9bf30eab6b Add crc.(cpp|h) to the xcode project. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10992 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-18 08:47:35 +02:00
Cyp d7db005f71 Merge remote branch 'origin/master' into newnet 
Conflicts:
	.gitignore
	configure.ac
	data/base/images/intfac.img
	data/base/images/intfac5.png
	lib/netplay/makefile.win32
	lib/netplay/netlog.c
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/netplay.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	po/POTFILES.in
	src/hci.c
	src/intfac.h
	src/keybind.c
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multistruct.c
	src/multisync.c
	src/scriptai.c
 2010-06-15 08:35:52 +02:00
dak180 565983ffc7 Upgrade gettext to 18.1. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10929 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-06 09:57:27 +02:00
dak180 0224a4a80b Update the .strings files to a more standardized format. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10919 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-05 12:08:33 +02:00
dak180 4cffefc8bc Make the copy data script work with 10.5. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10891 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-03 22:41:43 +02:00
dak180 47ae3d8974 Make sure the SDL headers are in the path. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10889 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-31 21:27:35 +02:00
dak180 30288e3cae Eliminate some errors when SDL has not yet been downloaded. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10884 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-31 08:22:31 +02:00
dak180 c61a6b8632 Update libpng to 1.4.2 and upgrade warnings to force rebuilds. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10866 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-24 08:51:22 +02:00
dak180 a684e0c9ad Require native execution because otherwise wz gets confused. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10822 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-16 11:17:06 +02:00
dak180 e3c1703206 Improve the fetch scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10757 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-02 09:20:51 +02:00
dak180 a382b728c9 Update Ogg to 1.2.0 and Vorbis to 1.3.1. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10751 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-02 09:20:43 +02:00
dak180 2806c9ddf0 Update zlib to 1.2.5. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10750 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-02 09:20:43 +02:00
dak180 91b820f198 Fix a few typos. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10709 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-25 12:04:35 +02:00
dak180 d72ba6b872 Keep up with the changing urls for the videos and some general clean up. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10692 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-24 19:29:19 +02:00
dak180 765c648058 Distinguish between different types of .wz files 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10689 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-23 13:10:04 +02:00
dak180 7eff9e3ac4 When you know the data directory is messy, be sure to clean it up. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10594 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-16 14:21:39 +02:00
dak180 db2e3f3d16 Use working addresses for the videos. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10488 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:31 +02:00