Commit Graph

6741 Commits (38fd6be936ddbe08cc535f6b116d86d564ab96bf)

Author SHA1 Message Date
Christian Ohm 254f657427 Really fix #1338 (crash when joining IP).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8997 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:08 +01:00
Christian Ohm 4c7554e9ed Update Polish translation.
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8996 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:07 +01:00
Christian Ohm 53b87689e0 Update Estonian translation.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8995 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:07 +01:00
Christian Ohm bcfd5a3829 Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8994 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:07 +01:00
Christian Ohm 0e8107e3a1 Fix grammar, typos, don't translate kickPlayer messages.
Those are only shown in the log anyway, the in-game messages are still
translated.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8993 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:06 +01:00
Guangcong Luo cd47405d83 Allow host to choose colors/positions for other players, without crashing this time. ;)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8992 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:05 +01:00
Guangcong Luo 36c85d7c78 Fix bug #709 - lobby server doesn't update player count when player leaves a game.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8989 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:05 +01:00
dak180 8bf87d1ddd More useful warning messages in the xcode build.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8986 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:05 +01:00
Guangcong Luo 13682eaa92 Fix bug #1338 - crash when joining IP.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8984 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:05 +01:00
Christian Ohm 9b554a2d6e Reject differing game versions, not the same.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8981 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:05 +01:00
Christian Ohm 92f53f68ff Shorten autokick message when version differs.
Was too long to be displayed completely.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8979 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:05 +01:00
dak180 972c6d397c Correct copyright strings
DMG script refinements

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8978 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:04 +01:00
Guangcong Luo e74168eb36 Make it easier to use cheat codes in single-player mode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8977 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:04 +01:00
Guangcong Luo 8e0e0ebf3f Some fixes to the new turnOffMultiMsg code.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8974 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:04 +01:00
Guangcong Luo d193b397fc Meant to commit these files in r8971.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8973 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:03 +01:00
Guangcong Luo 5bb3fc6132 Compare netcode versions rather than version strings - allows updating version strings while retaining netcode compatibility. Bump netcode version to 2.31.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8971 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:03 +01:00
Guangcong Luo 9037b0e236 Players (especially host) shouldn't autoquit just because he/she lost - they should stick around - maybe they want to chat.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8970 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:03 +01:00
Guangcong Luo e42645e66b Revert r8964 - apparently increasing the maximum number of games visible in the lobby breaks savegame compatibility.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8968 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:03 +01:00
Guangcong Luo 1854b0add0 Fix bug #1304 - crash when loading units from offworld.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8965 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:02 +01:00
Guangcong Luo be47ec5bfa Increase max game limit from 12 to 18 - now supported by new larger lobby!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8964 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:02 +01:00
Guangcong Luo 9d1c1f4cc1 Fix bug #1327 - players list doesn't appear sometimes.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8961 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:02 +01:00
Guangcong Luo fc94a37432 Fix bug #1325 - confusing research icons for some missile upgrades.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8960 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:02 +01:00
dak180 d1776d650d Add a "Make DMGs for Release" target to the xcode project.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8958 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:02 +01:00
Giel van Schijndel 2b8c85a686 Include source:trunk/autorevision.conf in `make dist`
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8956 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:01 +01:00
Christian Ohm 18294ffdc7 Update translations.
Also include po/stamp-po, to prevent the .po files from being changed during
the build process.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8954 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:01 +01:00
Giel van Schijndel 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
Giel van Schijndel 0705cbdf35 Don't perform additional dependency resolving for the installer when we're not building the installer...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8948 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:00 +01:00
Giel van Schijndel f0fb5d2168 Trac plugin TicketValidEmail:
* Reject e-mail addresses matching /^\w+@example\.(org|net|com)$/ (see #1317)
 * Suggest logging in as alternative to using a valid e-mail address for the reporter field

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8947 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Giel van Schijndel f0aacfd6a8 Add a new Trac plugin: TicketValidEmail
Extends Trac to only accept anonymous tickets when the reporter name is a valid RFC822 e-mail address.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8946 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Christian Ohm 3637a83e38 Remove stray parenthesis.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8945 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Per Inge Mathisen 3190fb0ab6 Fix warnings
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8941 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Guangcong Luo f69d38b4f2 Fix bug #1312 - forgot to commit multiint.c
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8940 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Guangcong Luo e372d3d44e Fix bug #1311 - typos in netplay.c
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8939 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Guangcong Luo f2e9a412ac I've discovered why the netcode is so unstable. Everthing just assumes it'll be successful. At one point, there's an infinite loop waiting for an accept message. No possibility of receiving a rejection message, no timeout, nothing. At another point, the host just overwrites an existing player, if the game is full. I've fixed most of the ones I came into contact with, but there are probably many more left.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8938 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:58 +01:00
Guangcong Luo 495004bc7c - Enlarge game lobby
- Move password prompt to separate dialog box (stops the annoying flashing)
- Attempt to join full games, in case lobby misreports game size.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8935 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:58 +01:00
Guangcong Luo 9b0381b14b Remove the two Warzone logo backdrops - they're really unprofessional and tacky, especially when there's already a Warzone logo at the top of the screen.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8933 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:57 +01:00
Guangcong Luo cb4c47cde5 Add a shadow to the sideways text, to make it more readable on some backdrops.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8932 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:56 +01:00
Guangcong Luo c10417b595 Disable some fields that should be disabled but weren't, in the multiplayer game join interface.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8929 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:56 +01:00
Guangcong Luo a414131f6f Fix design screen bug: Two tabs could be highlighted at once in some cases.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8924 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:56 +01:00
Per Inge Mathisen 0d6ded48d0 When adding droids to a transporter or sending a transporter to a new map, reset
their visibility caches. This closes ticket:1300 and closes ticket:1304


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8919 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:55 +01:00
dak180 d2f4eea3f1 Changed our plist to be more useful and dynamic.
Updated the xcode project file to support these changes.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8914 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:55 +01:00
Christian Ohm 8102cce397 Update Finnish translation.
Closes #1301.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8911 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Giel van Schijndel e89964b87b Win32 crossbuild scripts
* build the *.gmo files when required
 * only run autogen.sh when required.
 * Use 'set -x' to achieve make-like command printing behaviour
  - I.e. instead of using a custom 'execute' function

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8909 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Christian Ohm 9d2e338b64 Win32 build scripts: Use --force for QuesoGLC svn export to deal with failed earlier runs.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8907 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Giel van Schijndel 2863ece766 Dash workaround: source __BUILD_CONFIG.USER from the current directory (using ./)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8905 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Guangcong Luo 35335d6ede Rewrite the turnOffMultiMsg system - it can now be nested. However, it must be paired now - each turnOffMultiMsg(true) _must_ be followed by a turnOffMultiMsg(false). Also simplifies a lot of hacky code caused by bMultiPlayer being temporarily false because of turnOffMultiMsg.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8904 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Giel van Schijndel 4bd1606843 Win32 crossbuild scripts: use 'bash' as shell when building gettext
* Apparently that monster has some code that's sensitive to which shell is used as the default for /bin/sh

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8902 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:07 +01:00
Christian Ohm 80453a9def Lower skybox scale again.
This fixes the skybox at 1600x1200 at least, much higher resolutions might
still be broken.  Closes #575 again.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8901 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:07 +01:00
Per Inge Mathisen b9879638e1 Add map and radar minimap display of true fog of war to the game. This is the same
as what you see when you previously held in the 'z' button. That is, you see where
you have sensor coverage. Implemented using reference counting on each tile that is
unreferenced using a stored tile cache on each game object. Closes ticket:1289


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8900 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:07 +01:00
Guangcong Luo 14fc592429 Fix bug #1292 - auto-repair is sometimes instantaneous.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8899 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:07 +01:00