Cyp
59e98903b8
Remove -Wc++-compat, since there are too many malloc cast warnings.
2010-08-15 13:37:09 +02:00
Christian Ohm
fd9c2157e6
Update translations.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11479 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 13:36:00 +02:00
Cyp
15d7243c5f
Make the warn_unused_result warning squelch compile on distros where the fwrite is already in an if (fwrite()) {}.
2010-08-15 13:15:04 +02:00
Cyp
438a4d5aff
Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them.
2010-08-15 12:30:46 +02:00
Per Inge Mathisen
5c00b04b62
from path branch: Remove unused speed parameter. Fix erroneous comment about droids spinning "on the spot".
...
This one took a while to figure out, as the only thing worse than no comments, are plain wrong comments.
The comment and variable names indicating a "spin on the spot" behaviour are dead wrong, all they do is
make droids make sharper turns when the turn angle is larger. To make proper "spin on the spot" behaviour,
we need support for acceleration and deacceleration, like proper movement physics. Otherwise movement will
look jagged and broken.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11476 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 12:30:04 +02:00
Per Inge Mathisen
278db5c637
Backport from path branch: Remove ugly hack that made cyborgs walk right through non-person sized units.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11474 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 11:42:16 +02:00
Per Inge Mathisen
c86838a43d
Backport from path branch: Reject ASR_NEAREST paths for construction/repair/demolish orders, as they might
...
make us generate paths to inaccessible areas and get stuck trying to get there.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11473 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 11:42:16 +02:00
Per Inge Mathisen
0a7fbf8b46
backport from path branch: Fix crash in gate check if a VTOL flies to the edge of the map.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11472 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 11:42:16 +02:00
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
Buginator
26fa2b06f9
Change back to "trunk" form newnet. (less confusion)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11470 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 00:10:52 +02:00
Per Inge Mathisen
59179d7df0
Simplify definition of base turn and move speed.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11469 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 00:10:52 +02:00
Buginator
48bad7a5a1
Update project file multibot.c -> multibot.cpp
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11466 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 00:10:51 +02:00
Cyp
0c2015425c
Merge remote branch 'origin/newnet'
...
Conflicts:
lib/gamelib/gtime.c
lib/gamelib/gtime.h
lib/netplay/netplay.c
Closes ticket:1573. Closes ticket:805. Probably fixes 100 more issues.
2010-08-14 22:34:30 +02:00
Per Inge Mathisen
57299dc208
Remove all float usage from logical fps calculations. Patch reviewed by Cyp.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11462 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-14 22:08:32 +02:00
Cyp
38bc0e336e
newnet: Place new droids as soon as built, since droid construction time is synchronised, and generated droid IDs now are synchronised.
2010-08-14 22:03:55 +02:00
Cyp
a83f0054b8
newnet: Synchronise generated object IDs, instead of fixing structure IDs later.
...
And remove code to send new structure IDs over the net, and later ignore them.
2010-08-14 20:26:21 +02:00
Per Inge Mathisen
b3054d87d0
Add --enable-debug=optimised for Cyp, debug build with optimizations turned on.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11460 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-14 14:38:16 +02:00
Cyp
d13fbd9dbc
Squelch warnings. (Need a way of doing optimised builds, but still with -Werror...)
2010-08-14 14:16:08 +02:00
Per Inge Mathisen
a34997239a
Fixes for game elements improperly being dependent on logical fps. Camera animation.
...
Water animation. Weather animations. Replaced all usages of the generic timeAdjustedIncrement
with proper gameTimeAdjustedIncrement or graphicsTimeAdjustedIncrement as appropriate.
See ticket:2083 for more info. Patch reviewed by Cyp.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11457 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-14 14:10:34 +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
Cyp
b9be7381ae
Comment "--debug=all" in man page.
2010-08-14 10:27:45 +02:00
Cyp
fcd0b6fe46
Print "Oldname → Newname" instead of "Oldname: -> Newname".
2010-08-14 09:58:36 +02:00
Cyp
18307a7fc1
Eschew ventriloquism assiduously.
2010-08-14 09:57:45 +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
Christian Ohm
42aa1d2f7f
Korean translation update by urgood2.
...
Closes #2075 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11433 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 13:48:01 +02:00
Christian Ohm
b1a4fe21fe
Actually install the Korean and Slovak translations on Windows.
...
Refs #2074 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11432 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 13:48:01 +02:00
Christian Ohm
7f0929bb48
Fix sk.po.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11429 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 00:04:10 +02:00
Christian Ohm
fe59e98943
Add Slovak translation by Koapa.
...
Closes #2036 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11418 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 00:04:10 +02:00
Christian Ohm
e210755cb5
Korean translation update by urgood2.
...
Closes #2068 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11417 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 00:04:10 +02:00
Christian Ohm
a11814e87f
Fix unitialized variables warning.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11416 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 00:04:10 +02:00
Christian Ohm
8d0efc507d
Update Debian packaging.
...
Based on r11266 from 2.3.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11412 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-10 18:48:15 +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
Christian Ohm
6e6b5a7c34
Update translations.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11407 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:50 +02:00
Christian Ohm
a07d8d3ad8
Don't save translated descriptions in the keymap.
...
Uses the English string in the keymap file, and translates it for display only.
That way, when changing the language, the descriptions will appear in the new
language. Old files will still work, just show the translated string until a
reset. Also mark all descriptions as translatable. Closes #2049 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11406 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:50 +02:00
Christian Ohm
fab89b8ab4
Don't crash in socketAccept when given a NULL socket.
...
Closes #2033 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11405 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:50 +02:00
Christian Ohm
5a21521678
Make some internal component names untranslatable.
...
Closes #2064 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11402 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:50 +02:00
Christian Ohm
4eb49a39d1
Add Korean translation by urgood2.
...
Closes #2035 , #2055 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11395 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:49 +02:00
Cyp
6bc0682c06
Don't use extra precision when avoiding (or trying to avoid) obstacles, since it leads to integer overflow and pseudorandom decisions.
2010-08-06 19:29:11 +02:00
Safety0ff
9998b89016
Apply patch from #2007 (Remove randomiseSeed calls from scripts.)
...
Closes #2007 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11386 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 20:05:02 +02:00
Giel van Schijndel
94320034ae
Assume that SDL headers are directly in the #include path, instead of assuming the SDL directory is in the #include path.
...
Closes #1941 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11385 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 20:05:02 +02:00
Safety0ff
1fa5ab201d
Apply patch from #1944 (vorbis error strings).
...
Closes #1944 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11384 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 20:05:02 +02:00
Safety0ff
dec83d8065
Apply patch #1982 .
...
Removes Vector3i_normalise and return int32_t instead of float for Vector3i_Length.
Closes #1982 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11383 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 17:48:53 +02:00
Buginator
235579d051
Backport revert:
...
As by consensus, revert ticket:1990, and revisions:
r11331, r11310, r11305, r11206, r11202, r11200, r11199, r11112.
Please see ticket:2051 for more discussion on the new routine.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11381 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 14:13:30 +02:00
Buginator
0a4bd99cb5
Removed unused file.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11378 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 14:13:29 +02:00
Christian Ohm
e503f52a32
Fix "make distcheck".
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11371 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-04 16:43:19 +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
Christian Ohm
602e7f13c9
Add missing files to the tarball.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11370 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-03 09:38:30 +02:00
Giel van Schijndel
ccbd9c56c7
wzmasterserver.py: change the `__author__` value to "The Warzone 2100 Project"
...
This used to be a list of authors. Ego-boosting can always be performed by the AUTHORS file, no need to boost it all over the place ;-)
Suggested by Fastdeath's patch, see #1985
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11369 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-03 09:38:30 +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