Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'bugfixes' into 3.1

  • Loading branch information...
commit a9c2db1e8c0b791cd74065fb254d5b3883042132 2 parents fdf2282 + b26d94f
automerge authored cybersphinx committed
7 ChangeLog
... ... @@ -1,4 +1,4 @@
1   -2012-09-NN: Version 3.1 rc3
  1 +2012-10-NN: Version 3.1 rc3
2 2 * General:
3 3 * Warning: Warn players to downgrade/upgrade PhysFS package from a buggy version 2.0.2 (ticket:3700, commit:408be743f017cce1519cd955767abf0e697ab7f7)
4 4 * Change: Patch PhysFS in the Mac build until there is a new release (commit:a05e8c980bc42fa66ed1b81ae40793645df8efbf)
@@ -17,8 +17,9 @@
17 17 * Fix: Fixed failure to repair commanders on Alt+click (ticket:1997, commit:56001781bcfcbecbd93831499a539d66b50d27d9)
18 18 * Fix: No longer halt factory production assigned to commanders in skirmish on commander limit, or for VTOLs (ticket:2138, commit:0773a9ff6cfc344def015f349e39fa62d09fe697)
19 19 * Fix: Automatically relocate delivery points when new structures are going to be built on top of them (ticket:2998, commit:1cc0d533f4edf33e672da3b55eb8f3d741db81e1)
  20 + * Fix: Update visible tiles immediately when researching sensor upgrades (ticket:3450, commit:b1a1a8e445d29bc2ea5b1ea8b36d93e80d8c656d)
  21 + * Fix: Use separate stored-template file for skirmish and campaign (ticket:3702, commit:d969dd7756859b0daea5ac2fe16422511f6876e0)
20 22 * Graphics:
21   - * Change: Update png to 1.5.13 in the mac build (commit:2d3c39e660110f35eb2da0ac5d63f4c2ec9bcea7)
22 23 * Fix: Droid parts now properly fly away from a droid which explodes above water (ticket:3681, commit:60c235ab3ff835edb60b0e0c020923351c893893)
23 24 * Fix: Turrets no longer appear to bounce when firing from atop a tower (ticket:2789, commit:d608f37fadfa969c225fef8149eaa700cc878a46)
24 25 * UI:
@@ -29,6 +30,7 @@
29 30 * Fix: Fixed location of centre of viewport rendered on radar window (ticket:3619, commit:0dde269379507a897ef2945ca76f840a8994f04a)
30 31 * Fix: Fixed bug which caused a weird behavior in the way menus worked (ticket:3653, commit:594b8a6c631b160fda06f9ffca4b9f227c97c3f8)
31 32 * Multiplayer:
  33 + * New: Add new maps by NoQ: Emergence (10p), Monocot (3p), Bloat (5p) and WindFury (9p) (commit:858664124de97921a551367656c0ba7cf4aecf3d)
32 34 * Change: Make available again research topics if the Research Facilities researching these particular topics are out-of-order temporarily for construction of Research Modules (commit:5bac6e4273fbdbd43acaf4a0042b373d4c9dec7c)
33 35 * Change: Allow setting/clearing game password even after a game is hosted. Also, if typing password and pressing Enter, will actually set the password (commit:9575cf93e2a0b39c11d7bd2f51aef100fe4dae57)
34 36 * Change: Disabled game name icon in multiplayer, since it didn't do anything anyway (ticket:1231, commit:831d22c7d26930872a9ec766177f8a00b63ace98)
@@ -170,7 +172,6 @@
170 172 * Update: Turkish (ticket:3486, commit:a400fe055fd5d176cd809bcfdc0973cf839a4a2c)
171 173 * Update: Dutch (ticket:3484, commit:c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37)
172 174
173   -
174 175 2012-05-13: Version 3.1 beta10
175 176 * General:
176 177 * Fix: Loading of skirmish games (ticket:3451, commit:18216c60e76d05ad0fe2bf7d860347f76f70c8f8)
22 data/mp/multiplay/skirmish/nexus.slo
@@ -3260,16 +3260,16 @@ function bool attemptToHelp(int _playerToHelp, int _x, int _y)
3260 3260 if(haveHelpers() or _DEBUG)
3261 3261 {
3262 3262 dbg("got attackers", me);
3263   - if(allyBaseAtLoc(_playerToHelp, _x, _y)) //is he just trying to misuse us?
3264   - {
  3263 + //if(allyBaseAtLoc(_playerToHelp, _x, _y)) //is he just trying to misuse us?
  3264 + //{
3265 3265 helpPlayer(_playerToHelp, _x, _y);
3266 3266 return TRUE;
3267   - }
3268   - else
3269   - {
3270   - dbg("ally needs no help", me);
3271   - messagePlayer(ALL_ALLIES, M_ANNOYED, MAX_PROBABILITY / 2);
3272   - }
  3267 + //}
  3268 + //else
  3269 + //{
  3270 + // dbg("ally needs no help", me);
  3271 + // messagePlayer(ALL_ALLIES, M_ANNOYED, MAX_PROBABILITY / 2);
  3272 + //}
3273 3273 }
3274 3274 else
3275 3275 {
@@ -3431,9 +3431,9 @@ function bool canStopHelpingAlly()
3431 3431 }
3432 3432
3433 3433 /* Nothing to defend anymore */
3434   - if(!allyBaseAtLoc(lastHelpPlayer, helpX, helpY)){
3435   - return TRUE;
3436   - }
  3434 + //if(!allyBaseAtLoc(lastHelpPlayer, helpX, helpY)){
  3435 + // return TRUE;
  3436 + //}
3437 3437
3438 3438 return FALSE;
3439 3439 }
22 data/mp/multiplay/skirmish/semperfi.slo
@@ -3681,16 +3681,16 @@ function bool attemptToHelp(int _playerToHelp, int _x, int _y)
3681 3681 if(haveHelpers() or _DEBUG)
3682 3682 {
3683 3683 dbg("got attackers", me);
3684   - if(allyBaseAtLoc(_playerToHelp, _x, _y)) //is he just trying to misuse us?
3685   - {
  3684 + //if(allyBaseAtLoc(_playerToHelp, _x, _y)) //is he just trying to misuse us?
  3685 + //{
3686 3686 helpPlayer(_playerToHelp, _x, _y);
3687 3687 return TRUE;
3688   - }
3689   - else
3690   - {
3691   - dbg("ally needs no help", me);
3692   - messagePlayer(ALL_ALLIES, M_ANNOYED, MAX_PROBABILITY / 2);
3693   - }
  3688 + //}
  3689 + //else
  3690 + //{
  3691 + // dbg("ally needs no help", me);
  3692 + // messagePlayer(ALL_ALLIES, M_ANNOYED, MAX_PROBABILITY / 2);
  3693 + //}
3694 3694 }
3695 3695 else
3696 3696 {
@@ -3852,9 +3852,9 @@ function bool canStopHelpingAlly()
3852 3852 }
3853 3853
3854 3854 /* Nothing to defend anymore */
3855   - if(!allyBaseAtLoc(lastHelpPlayer, helpX, helpY)){
3856   - return TRUE;
3857   - }
  3855 + //if(!allyBaseAtLoc(lastHelpPlayer, helpX, helpY)){
  3856 + // return TRUE;
  3857 + //}
3858 3858
3859 3859 return FALSE;
3860 3860 }
2  macosx/Warzone.xcodeproj/project.pbxproj
@@ -4413,7 +4413,7 @@
4413 4413 );
4414 4414 runOnlyForDeploymentPostprocessing = 0;
4415 4415 shellPath = /bin/sh;
4416   - shellScript = "cd ${SRCROOT}/external/physfs\n\nif [ -f \"882cdbd7d0a3.diff\" ]; then\n\texit 0\nfi\n\nif ! curl -LfC - --connect-timeout \"30\" -o \"882cdbd7d0a3.diff\" \"http://hg.icculus.org/icculus/physfs/raw-rev/882cdbd7d0a3\"; then\n\tif ! curl -LfOC - --connect-timeout \"30\" \"http://wz2100.net/~dak180/BuildTools/Mac/882cdbd7d0a3.diff\"; then\n\t\techo \"error: Unable to fetch vorbis.diff\" >&2\n\t\texit 1\n\tfi\nfi\n\nif ! cat \"882cdbd7d0a3.diff\" | patch --posix -sNfp1; then\n\techo \"error: Unable to apply vorbis.diff\" >&2\n\texit 1\nfi\n\nexit 0\n";
  4416 + shellScript = "cd ${SRCROOT}/external/physfs\n\nif [[ -f \"882cdbd7d0a3.diff\" ]] && [[ -f \"8qzAkGJa.diff\" ]]; then\n\texit 0\nfi\n\nif ! curl -LfC - --connect-timeout \"30\" -o \"882cdbd7d0a3.diff\" \"http://hg.icculus.org/icculus/physfs/raw-rev/882cdbd7d0a3\"; then\n\tif ! curl -LfOC - --connect-timeout \"30\" \"http://wz2100.net/~dak180/BuildTools/Mac/882cdbd7d0a3.diff\"; then\n\t\techo \"error: Unable to fetch 882cdbd7d0a3.diff\" >&2\n\t\texit 1\n\tfi\nfi\n\nif ! curl -LfC - --connect-timeout \"30\" -o \"8qzAkGJa.diff\" \"http://pastebin.com/raw.php?i=8qzAkGJa\"; then\n\tif ! curl -LfOC - --connect-timeout \"30\" \"http://wz2100.net/~dak180/BuildTools/Mac/8qzAkGJa.diff\"; then\n\t\techo \"error: Unable to fetch 8qzAkGJa.diff\" >&2\n\t\texit 1\n\tfi\nfi\nperl -pi -e 's/\\r\\n/\\n/g' 8qzAkGJa.diff\nsed -i -e '$a\\' \"8qzAkGJa.diff\"\n\nif ! cat \"882cdbd7d0a3.diff\" \"8qzAkGJa.diff\" `echo ` | patch --posix -sNfp1; then\n\techo \"error: Unable to apply vorbis.diff\" >&2\n\texit 1\nfi\n\nexit 0\n";
4417 4417 };
4418 4418 43964E45150EDCE2007BCC60 /* Vorbis - Patch */ = {
4419 4419 isa = PBXShellScriptBuildPhase;
4 macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
... ... @@ -1,10 +1,10 @@
1 1 #!/bin/sh
2 2
3 3 OutDir="WarzoneHelp"
4   -DirectorY="${OutDir}-b66426c"
  4 +DirectorY="${OutDir}-fdf2282"
5 5 FileName="${DirectorY}.tgz"
6 6 BuiltDLP="http://downloads.sourceforge.net/project/warzone2100/build-tools/mac/${FileName}"
7   -MD5Sum="e0f3b5d15efa4a063461c1ffb21769b8"
  7 +MD5Sum="44f9d1204f55b6fe536e3dc86f454f4e"
8 8
9 9 configs/FetchPrebuilt.sh "${DirectorY}" "${OutDir}" "${FileName}" "${BuiltDLP}" "${MD5Sum}"
10 10 exit ${?}
3  src/qtscriptfuncs.cpp
@@ -1145,7 +1145,7 @@ static QScriptValue js_debug(QScriptContext *context, QScriptEngine *engine)
1145 1145
1146 1146 //-- \subsection{pickStructLocation(droid, structure type, x, y)}
1147 1147 //-- Pick a location for constructing a certain type of building near some given position.
1148   -//-- Returns a position object containing "x" and "y" values, if successful.
  1148 +//-- Returns an object containing "type" POSITION, and "x" and "y" values, if successful.
1149 1149 static QScriptValue js_pickStructLocation(QScriptContext *context, QScriptEngine *engine)
1150 1150 {
1151 1151 QScriptValue droidVal = context->argument(0);
@@ -1235,6 +1235,7 @@ static QScriptValue js_pickStructLocation(QScriptContext *context, QScriptEngine
1235 1235 QScriptValue retval = engine->newObject();
1236 1236 retval.setProperty("x", x + map_coord(offset.x), QScriptValue::ReadOnly);
1237 1237 retval.setProperty("y", y + map_coord(offset.y), QScriptValue::ReadOnly);
  1238 + retval.setProperty("type", SCRIPT_POSITION, QScriptValue::ReadOnly);
1238 1239 return retval;
1239 1240 }
1240 1241 else

0 comments on commit a9c2db1

Please sign in to comment.
Something went wrong with that request. Please try again.