Giel van Schijndel
5e6cf99d24
Forgot to ''enable'' crossbuilding of SDL in r8824
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8826 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
6f04fa89c3
Windows cross build script: add a `clean` (and `preclean`) command
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8825 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
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
Giel van Schijndel
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
Giel van Schijndel
122d68b3be
Popt requires iberty as well when cross compiling for Windows, so check for it ''before'' checking Popt
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8822 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
Giel van Schijndel
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
Guangcong Luo
9876e857cc
A few fixes to the Xcode project to make compiling work with spaces in directories, as described in http://forums.wz2100.net/viewtopic.php?f=6&t=3974
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8819 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
Christian Ohm
4b34fb8e4f
Rename "screendumps" to "screenshots".
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8817 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
Giel van Schijndel
3067002d04
Allow autogen.sh to be executed out-of-tree
...
This improves out-of-tree builds
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8816 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
Guangcong Luo
06e5d32f1a
Don't deselect a retreating unit if it's the only unit selected.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8814 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:54 +01:00
Per Inge Mathisen
6986f8a054
Undelete droidBuiltAssign() that turned out to be quite essential. Make no
...
base builds much faster yet, by making droids cooperate on more buildings.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8813 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:54 +01:00
Per Inge Mathisen
209bf40833
Remove dead or non-working code from the default skirmish AI.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8812 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:53 +01:00
Per Inge Mathisen
4fa0703bc2
Fix trunk build problem (hey, please at least check that your fixes
...
can build before committing them!)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8810 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:53 +01:00
Guangcong Luo
64e98f9e2b
Don't let trucks and other noncombatants guard anything since they'll just get confused and spin in circles. Also let super cyborgs guard things just like regular cyborgs and tanks. Fixes bug #1198 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8809 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:53 +01:00
Guangcong Luo
7eae98cefe
Fix a race condition that could cause the ready button not to appear with two players - fixes bug #1230 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8806 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:53 +01:00
Guangcong Luo
656e6a3516
Allow host to swap player positions and colors - fixes bug #1241 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8804 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:52 +01:00
Guangcong Luo
84ba706499
New interface images: Attack-move and unload transport images, better North pointer, and correctly-aligned checkbox.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8802 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:52 +01:00
Guangcong Luo
17fb3e5c5f
Remove SDL_net dependencies from Mac OS X, since they're no longer used (partially done by dak180)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8801 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:52 +01:00
Guangcong Luo
875849f7b5
Add new text functions so we can actually display the word "READY" above a checkbox. Also add version numbers to the lobby.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8796 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:52 +01:00
Guangcong Luo
bbba6f6ff8
Only delSocket if it actually exists (fix assert).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8794 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:52 +01:00
Giel van Schijndel
34b50b4219
Fix the doxygen documentation for `addSocket` and `delSocket`
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8792 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:52 +01:00
Guangcong Luo
b448b51ab7
Cleanup files no longer needed by new xcodeproj
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8785 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:51 +01:00
Guangcong Luo
16ed0e53d0
Add dak180's improvements to the Xcode project system.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8781 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:51 +01:00
Giel van Schijndel
64d8e39b38
Check for socket errors and handle them:
...
* Close a socket when an error occurs on it
* Store the return values of send() and recv() in `ssize_t` instead of `int`
- Prevents truncation of values as ssize_t is the return type specified by POSIX to use
This should prevent us from ever getting hit with SIGPIPE again.
SIGPIPE is transmitted when we try to write to a connection we've previously been told has closed.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8772 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:50 +01:00
Giel van Schijndel
46aa89779e
Be more resiliant in the case of dangling pointers to a Socket
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8769 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:50 +01:00
Per Inge Mathisen
513df7b3c3
Add a new droid variable frustration that is set each time it gets stuck. For a time after,
...
the droid will fire on any destructible features nearby if there is nothing else to fire at.
This might clear the way in some cases. This closes ticket:1165
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8765 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:50 +01:00
Buginator
521503cc4c
Fix trunk's skirmish game, as reported by cybersphinx.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8759 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:50 +01:00
Christian Ohm
d7143d6ace
Update translations.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8758 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:49 +01:00
Buginator
f5b417e7d0
Remove unneeded abort that was already removed in 2.3
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8754 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:49 +01:00
Buginator
1fc98725c8
frontport r7797
...
"In inputLooseFocus(), we clear the keyboard/mouse to the init state (KEY_UP).
fixes ticket:515 "
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8750 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:48 +01:00
Buginator
5b2eabf0b5
Fix bad indentation on a merge that went astray
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8749 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:48 +01:00
Buginator
7eaecb9d24
Fix a couple compiler warnings about floats (or lack thereof)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8747 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:48 +01:00
Buginator
751c5623c6
Fix bad indentation on a merge that went astray
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8746 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:48 +01:00
Buginator
d3b60c66bb
frontport r8726
...
"Tally up construction borgs/trucks in SP games as well.
fixes ticket:966 "
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8745 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:48 +01:00
Buginator
f7cdc815e5
frontport r8717
...
"Trap for a NULL pointer, and check for experience rollover."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8744 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:48 +01:00
Buginator
79037573f0
frontport r8717
...
"Add new flag to keep track of when Host is alive.
Add a popup window notification for when the Host drops, and also notify the host when *they* quit, that the game will be over for everyone else (because of the network model)
Fix heap corruption when the host's connection was severed in the NET_fillBuffer() function.
Fix a socket error when we tried to write to a NULL socket.
Note: added two strings that need translating"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8743 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:47 +01:00
Buginator
f4057d280e
frontport r8714
...
"Fix a few compiler warnings about floats, and also fix a very old cheat as was mentioned in ticket #1220"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8742 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:47 +01:00
Buginator
dcc1654924
frontport r8713
...
"Actually set the limits if people don't set them.
fixes ticket #1236"
and r8725 "Reset the hash array when needed."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8741 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:47 +01:00
Buginator
1a7a19ac60
frontport r8712
...
"Trap when psMsg is NULL so people don't crash on release builds.
Fixes ticket #1244 "
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8740 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:47 +01:00
Buginator
f5ad9ace95
frontport r8711
...
"Fix some casts that were wrong. "
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8739 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:46 +01:00
Buginator
38528c7524
fix typo (r8709)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8738 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:46 +01:00
Buginator
15413718c8
frontport r8672
...
"Update packet names for new packet types in log.
refs ticket:1185"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8737 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:46 +01:00
Buginator
d26716553b
frontport r8671
...
"Reset flags for new people joining."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8736 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:46 +01:00
Buginator
119ff9467f
frontport r8670
...
"Trap transporter's alt-click to be MP only."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8735 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:46 +01:00
Buginator
38f66c5f9e
frontport r8667
...
"Rewrite the stupid file transfer routines.
* It will now only send the file to the person that needs it.
* Adds abort code to the file routines as well, and also tries to detect when the Host is using a malformed filename to host a map.
* Make sure user can't hit the 'ready' button when the map transfer is ongoing.
* Get rid of the silly delays (Much faster transfers)
NOTE: we are still capped by fps.
fixes ticket:1128
fixes ticket:1127
refs ticket:215 (still can't transfer 'map packs')"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8734 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator
87802afa73
frontport r8666
...
"Never, ever, let users mess with the SP Transporter.
It breaks the SP scripts!"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8733 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator
5a2509a26d
frontport r8651
...
"Add config variable 'UPnP' to enable/disable UPnP detection / routines. 1=on, 0=off, default is ON.
"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8732 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator
098a1ea117
frontport r8650
...
"To prevent some confusion rename 'game' structure in netplay.c to gamestruct.
'game' is used as MULTIPLAYERGAME structure everywhere else, and it used GAMESTRUCT in netplay.c"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8731 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Buginator
1a1896e3bc
Add the laser satellite to the limits screen.
...
fixes ticket:1227
Patch by 13KukYNexus666
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8730 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00
Guangcong Luo
c7f5afb358
Add asserts for experience increase out of range.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:45 +01:00