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

71 Commits (master)

Author SHA1 Message Date
automerge 0c75c0a0bb Merge branch 'bugfixes' 2013-10-07 08:00:05 +02:00
cybersphinx e0841f5bdf Update .gitignore. 2013-10-05 15:25:37 +02:00
vexed d13bc0de7d Simplify build process by getting rid of bison/flex dependencies. 
Fixes both MSVC and autotools (automake 1.12+).

Revert "Abort autogen.sh when automake 1.12+ is found."

This reverts commit 978ed8f1f9.
Should now work with automake 1.11+

fixes ticket:3887
fixes ticket:3538
closes ticket:3950

(cherry picked from commit 372eff6693)

Forgot to push these changes for commit 372eff6693

(cherry picked from commit e397b24d47)

Out of tree builds ?  Who needs them. :P

refs: 372eff6693
(cherry picked from commit 20317c2a6f)
 2013-09-21 00:14:02 +02:00
per 667026afa9 Add autorevision.h.new to git ignore list. Closes ticket:4018. 2013-05-20 22:33:53 +02:00
vexed 372eff6693 Simplify build process by getting rid of bison/flex dependencies. 
Fixes both MSVC and autotools (automake 1.12+).

Revert "Abort autogen.sh when automake 1.12+ is found."

This reverts commit 978ed8f1f9.
Should now work with automake 1.11+

fixes ticket:3887
fixes ticket:3538
closes ticket:3950
 2013-02-17 20:15:15 -05:00
dak180 840321dc34 Clean up a few scripts. 2012-12-22 00:11:56 -05:00
dak180 83c7199392 Use the latest version of autorevision. 
From https://github.com/Autorevision/autorevision
 2012-10-28 11:17:35 -04:00
Cyp 26bb105885 Split frontend*.png and intfac*.png into individual images. 
The images are now combined into texture pages at runtime.

This should simplify adding/removing images.
 2012-08-05 22:33:34 +02:00
dak180 c4edfed60d Use codesigning for the mac builds. 
Requires the presence of 'macosx/configs/CS-ID.xcconfig' containing a valid codesign id listed in a CODE_SIGN_IDENTITY property.
 2012-07-30 21:43:49 -04:00
vexed 33f54edbcd update .gitignore 2012-01-07 01:33:41 -05:00
dak180 932d45244d Generate the quickstart guide and add it to the app bundle. 2012-01-05 10:45:42 -05:00
Paul Wise 74b3cae3fe Update the list of files to ignore when commiting to git 
Closes ticket:3018.
 2011-12-30 03:32:52 +01:00
Cyp b412744fb2 Update .gitignore. 2011-12-26 21:51:56 +01:00
cybersphinx 7eccaa5957 Update .gitignore. 2011-11-16 19:34:45 +01:00
vexed de28a736ef Updates for the red headed stepsister. 
Refs #2936.
 2011-11-08 14:01:40 +01:00
cybersphinx 8bd313920d Update .gitignore. 2011-09-21 21:22:30 +02:00
vexed 4479bf7e30 Update .gitignore, and some MSVC project file changes. 2011-07-19 20:33:44 -04:00
cybersphinx 20efb7edc8 Update .gitignore. 2011-05-14 18:12:09 +02:00
Rene Jochum 57907bdb1a Add Eclipse CDT files to .gitignore. 2011-05-02 19:04:00 +02:00
Per Inge Mathisen dda501bf13 Merge remote branch 'origin/master' into qt 
Conflicts:
	data/base/script/text/cam1a.slo
	lib/exceptionhandler/exceptionhandler.vcxproj
	lib/exceptionhandler/exchndl.h
	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/iniparser/iniparser.vcxproj
	lib/ivis_opengl/ivis_common.vcproj
	lib/ivis_opengl/ivis_opengl.vcxproj
	lib/netplay/netplay.vcxproj
	lib/script/script.vcxproj
	lib/sequence/sequence.vcxproj
	lib/sound/sound.vcxproj
	lib/widget/widget.vcxproj
	macosx/README.BUILD.txt
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Warzone2100.vcxproj
	src/main.cpp
 2011-04-17 23:17:24 +02:00
Zarel dfd57a499a Xcode 4 files. 2011-04-01 22:48:01 -05:00
Buginator 13070ebc3e ignore moc generated files 2011-03-24 22:39:51 -04:00
Buginator 6b98cda4c0 Update .gitignore for new build system (VS2k10) 2011-03-17 21:35:05 -04:00
Cyp 577cbbf874 Fix weird logfile date due to Jan..Dec = 0..11 in struct tm. 2011-02-14 22:08:11 +01:00
cybersphinx ffaaf87c8b Unignore build_tools. 2010-12-30 23:34:15 +01:00
cybersphinx 00cf0767ba Get rid of force-linker.cpp. 
Shouldn't be needed anymore since everything is C++ now.
 2010-12-30 23:34:15 +01:00
buginator 6f1584d262 update .gitignore again 
refs ticket:2340
(cherry picked from commit 0a0fdadcb216ca21a6fcd95905d63a9dce6e5d1f)
 2010-12-09 22:33:02 -05:00
buginator 4fdba622e6 update .gitignore for profiler noise 2010-11-19 23:31:26 -05:00
dak180 654819950b Update the dmg script to allow for code signing. 2010-11-14 20:13:59 -05:00
cybersphinx f5358c205b Update .gitignore. 2010-10-31 13:19:41 +01:00
dak180 711f5ebc97 Update the ignores. 2010-10-28 14:42:53 -04:00
buginator c2368d5107 Update .gitignore for MSVC 2010-10-16 19:38:35 -04:00
dak180 15db57f405 Update the ignores. 2010-10-05 23:42:50 -04:00
Giel van Schijndel 7284776c38 .gitignore: ignore betawidget and libtool build products 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11667 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-13 23:16:05 +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
Christian Ohm 7befaa1f89 Update .gitignore. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11411 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-10 18:48:14 +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
Christian Ohm 9a05862fba Update .gitignore 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11253 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:23 +02:00
Cyp 4d522c1d06 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/gamelib/gtime.h
 2010-07-12 08:06:39 +02:00
Christian Ohm 3537be8401 Update .gitignore. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11134 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 08:08:34 +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
Christian Ohm aadc958906 Update .gitignore. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10715 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-25 21:24:58 +02:00
Cyp 8f2e94bb48 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/netplay.c
	src/multiint.c
	src/multiopt.c
 2010-02-22 10:43:24 +01:00
Giel van Schijndel 39afcf0604 Win32 cross build script: Optionally downgrade to SDL 1.2.13 
Use SDL 1.2.13 instead of 1.2.14 when asked for, SDL 1.2.14 has some
problems on Windows, see #1340. Unfortunately SDL 1.2.13 has other
problems on Windows 7.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9919 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-21 01:50:21 +01:00
Cyp a336d6455d newnet: Rename lib/netplay/nettypes.c to lib/netplay/nettypes.cpp. 2010-02-15 20:56:56 +01:00
Cyp d5a69618ce logical: Fix bug in confusing illogical mess of random units which caused (at least) VTOLs to roll. 
Closes ticket:1586.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9803 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-15 20:51:05 +01:00
Cyp 5c9585e8cb pointtree: Find points quickly. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9260 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:09 +01:00
Giel van Schijndel f83b2dbd79 Remove po/stamp-po from the ignore lists per cybersphinx's request (he uses git-svn) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8952 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:04:00 +01:00
Giel van Schijndel c526dfc78a Win32 cross build scripts: 
* automatically fetch the DejaVu fonts
 * Place the fontconfig configure files where they're expected by the NSIS script
  - source:trunk/pkg/nsis/fonts.conf.wd_enable and source:trunk/pkg/nsis/fonts.conf.wd_disable
 * Fix some dependency ordering for `fontconfig` and `ogg`

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8840 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 20:26:58 +01:00
Giel van Schijndel a08ed80b76 Win32 cross build scripts: automatically fetch and extract the devpkg (precompiled libraries) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8837 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 20:26:58 +01:00