Commit Graph

6472 Commits (a9e10388ab1504fc4a8dc09d4d473a38ff66fc1e)

Author SHA1 Message Date
Guangcong Luo a9e10388ab Make the SP transport refusal of orders a bit more graceful.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8857 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:02 +01:00
Guangcong Luo 6a059fc8f8 Fix bug that made it impossible to order more than one transport at a time.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8855 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:02 +01:00
Guangcong Luo aa891ea7e4 Xcode project file changes: Added a check to ensure a min. version of 1.4 for svn. Altered the "Copy Game Data" script to try to be more tolerant of spaces in the path. Minor housekeeping cleanups. Contributed by dak180
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8853 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:02 +01:00
Guangcong Luo 1526b124d2 Fix a crash caused by typo in trunk netcode in r7288.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8850 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:02 +01:00
Guangcong Luo 38b7d54ad0 Return on assert fail in all relevant group functions.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8845 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:01 +01:00
Guangcong Luo 6a9c587ffa Prevent crash from infinite recursion when checking to see if a commander has an electronic droid.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8844 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:01 +01:00
Giel van Schijndel 4801f4b4ca Win32 crossbuild scripts: dependency fixes (these ''should'' be the last)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8842 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:01 +01:00
Giel van Schijndel 733113472b Win32 crossbuild script: use stabs as default debug symbol format
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8841 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +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 4d006adb4f Add proper dependency resolving for `zlib` and `png` and bump the default INSTALLER_VERSION to 2.2.0.999 (must be numeric and 4 numbers)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8839 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel 53efd0f5db Add proper dependency resolving for `iconv` and fix a syntax error in __BUILD_SCRIPT
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8838 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
Giel van Schijndel 19754d0203 Win32 cross build scripts: better dependency tracking
* track the files we use, not the files that are the source of what we use

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8836 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel 18d344d8aa Win32 cross build scripts: don't depend on libiberty when building Popt
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8835 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Per Inge Mathisen fd4a2b991b Fix ticket:1253 - line build broken.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8834 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel 04e6a296f3 Win32 cross build scripts: don't clean the download cache unless very-clean or very-preclean is used
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8833 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel f36411f32e Win32 cross build scripts:
* Fix order of dependency building
 * Evaluate variables in the correct order when invoking ''our'' ./configure script
 * Depend on the correct files when building libraries
 * Link in all dependent libraries so that we won't abort when some library has to build its examples
 * Run `autoconf` to reproduce Ogg's configure script (apparently the one delivered is bad)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8832 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel 4efad885e7 Win32 cross build scripts: prevent linker errors in QuesoGLC
* as a result of trying to use rpl_malloc and rpl_realloc instead of the plain versions

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8831 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel d8d04545c4 configure.ac: libbfd depends on libiberty, so link with libiberty ''after'' libbfd
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8830 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel 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
Giel van Schijndel f03549b8b1 Win32 crossbuild scripts: some tweaks to make sure we cooperate nicely with pkg-config
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8828 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel 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
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