20efb7edc8
Update .gitignore.
2011-05-14 18:12:09 +02:00
57907bdb1a
Add Eclipse CDT files to .gitignore.
2011-05-02 19:04:00 +02:00
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
dfd57a499a
Xcode 4 files.
2011-04-01 22:48:01 -05:00
13070ebc3e
ignore moc generated files
2011-03-24 22:39:51 -04:00
6b98cda4c0
Update .gitignore for new build system (VS2k10)
2011-03-17 21:35:05 -04:00
577cbbf874
Fix weird logfile date due to Jan..Dec = 0..11 in struct tm.
2011-02-14 22:08:11 +01:00
ffaaf87c8b
Unignore build_tools.
2010-12-30 23:34:15 +01:00
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
6f1584d262
update .gitignore again
...
refs ticket:2340
(cherry picked from commit 0a0fdadcb216ca21a6fcd95905d63a9dce6e5d1f)
2010-12-09 22:33:02 -05:00
4fdba622e6
update .gitignore for profiler noise
2010-11-19 23:31:26 -05:00
654819950b
Update the dmg script to allow for code signing.
2010-11-14 20:13:59 -05:00
f5358c205b
Update .gitignore.
2010-10-31 13:19:41 +01:00
711f5ebc97
Update the ignores.
2010-10-28 14:42:53 -04:00
c2368d5107
Update .gitignore for MSVC
2010-10-16 19:38:35 -04:00
15db57f405
Update the ignores.
2010-10-05 23:42:50 -04:00
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
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
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
b59b089ca5
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/nettypes.c
src/multibot.c
2010-07-30 22:51:33 +02:00
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
4d522c1d06
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/gamelib/gtime.h
2010-07-12 08:06:39 +02:00
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
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
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
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
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
a336d6455d
newnet: Rename lib/netplay/nettypes.c to lib/netplay/nettypes.cpp.
2010-02-15 20:56:56 +01:00
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
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
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
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
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
128f779778
Win32 cross build scripts: add support for building Ogg, Vorbis and Theora
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8829 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
a98f8117ab
Win32 cross build scripts: enable cross building for Expat, FreeType2, Fontconfig and QuesoGLC
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8827 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
5bb996c268
Win32 cross build scripts: enable cross building of SDL (1.2.14)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8824 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
3b6aceb15d
Win32 cross build scripts: enable cross building of libiconv
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8823 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
115d2bfd2c
Windows cross compilation scripts
...
* redo the cross compilation script in such a way that it'll also automatically fetch (wget) and build the dependencies
- Currently only building of popt, gettext, zlib and png is implemented
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8821 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
1a3cd75d71
Update .gitignore with cscope and vim temp files.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8535 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
52c8ba24e4
Revert accidentilly committed revisions r7394, r7395 and r7396 (part of a private branch)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7398 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:31 +02:00
ef5a01eeb9
Add a JSON tokenizer (lexer), parser and serializer
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7395 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:30 +02:00
64666c8889
Ignore build products from unit tests
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7092 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-20 15:31:23 +02:00
0c178e51d9
Add a document describing design decisions and the current status of the SQLization of the stats
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6895 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:56 +02:00
ba5fc9d56f
Updates .gitignore with lots of files to ignore from windows builds
2009-03-20 20:16:34 -04:00
d968e753cf
GitIgnore more stuff
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6497 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 00:46:12 +00:00
6670b8e8f0
GitIgnore more betawidget stuff
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6491 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-25 17:11:45 +00:00
872a436895
Force using the C++ compiler as linker
...
This fixes #65
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6142 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-13 11:45:47 +00:00
c413354ea2
Ignore /ltmain.sh
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6069 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-23 11:13:14 +00:00
87f127c146
Do not autogenerate aivolution scripts
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5726 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 17:39:10 +00:00
5e4a60ed64
Do not ignore /configure.ac in the .gitignore file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5289 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 18:34:30 +00:00
cybersphinx
Rene Jochum
Per Inge Mathisen
Zarel
Buginator
Cyp
dak180
Giel van Schijndel
Dennis Schridde