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
48ea346406
Revert "Testcommit"
...
This reverts commit r5277.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5279 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-20 08:52:27 +00:00
df7933f9f7
Testcommit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5277 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 20:53:00 +00:00
55ee376dc2
Ignore .wz files, too
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5159 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:55:29 +00:00
98993e96a1
Add a gitignore file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5040 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-11 10:54:58 +00:00
Cyp
Giel van Schijndel
Christian Ohm
Buginator
Dennis Schridde