[Warzone2100-commits] [Warzone2100/warzone2100] 8b5e60: Save our openGL info so we can write it out.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 8b5e6039edd4f16b76d9aa53cd289c7755c1e1a5
  
https://github.com/Warzone2100/warzone2100/commit/8b5e6039edd4f16b76d9aa53cd289c7755c1e1a5
  Author: vexed 
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
M lib/framework/debug.cpp
  M lib/ivis_opengl/screen.cpp
  M lib/ivis_opengl/screen.h
  M src/display3d.cpp
  M src/game.cpp
  M src/scores.cpp
  M src/scores.h

  Log Message:
  ---
  Save our openGL info so we can write it out.
Save game version / time / openGL stats / and misc. other things
that we can use to debug issues to a gameinfo.ini (in savegames)
or WZdebuginfo.txt (on fatal errors) file that can be easily
uploaded to us.


  Commit: cf319509b8fa00f95dac2a1f1caf4e42b75f8bc1
  
https://github.com/Warzone2100/warzone2100/commit/cf319509b8fa00f95dac2a1f1caf4e42b75f8bc1
  Author: NanoTech 
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
M lib/framework/cocoa_wrapper.h
  M lib/framework/cocoa_wrapper.mm
  M lib/framework/debug.cpp

  Log Message:
  ---
  Simplify the OS X crash dialog.

With the option to automatically open relevant
directories and the new ticket page.


  Commit: ba99a063fd21d31f7920839301fadd67c45cc0d9
  
https://github.com/Warzone2100/warzone2100/commit/ba99a063fd21d31f7920839301fadd67c45cc0d9
  Author: automerge 
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
M lib/framework/cocoa_wrapper.h
  M lib/framework/cocoa_wrapper.mm
  M lib/framework/debug.cpp
  M lib/ivis_opengl/screen.cpp
  M lib/ivis_opengl/screen.h
  M src/display3d.cpp
  M src/game.cpp
  M src/scores.cpp
  M src/scores.h

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/6c73cd9...ba99a06
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 451201: Fix border on tooltips

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 451201e89a076cc5e839c126921bc1929b555b5e
  
https://github.com/Warzone2100/warzone2100/commit/451201e89a076cc5e839c126921bc1929b555b5e
  Author: vexed 
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
M lib/widget/tip.cpp

  Log Message:
  ---
  Fix border on tooltips


  Commit: 8db07f4fb7cbef54819b090a28c6ee6e4c7ad912
  
https://github.com/Warzone2100/warzone2100/commit/8db07f4fb7cbef54819b090a28c6ee6e4c7ad912
  Author: vexed 
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
M lib/netplay/netlog.cpp
  M lib/netplay/netplay.cpp

  Log Message:
  ---
  Try to fix the output of netlogs.


  Commit: bd6c1d203b784a923e9331f67b2cee7226daab99
  
https://github.com/Warzone2100/warzone2100/commit/bd6c1d203b784a923e9331f67b2cee7226daab99
  Author: vexed 
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Fix the lock icon to always show it being locked when a password is set.
Remove the box when we don't use a password & in skirmish games.

refs ticket:3357


  Commit: 73f089c217dc86b9a2dac5c1b1a9d2a7d216bacd
  
https://github.com/Warzone2100/warzone2100/commit/73f089c217dc86b9a2dac5c1b1a9d2a7d216bacd
  Author: Cyp 
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
M data/base/images/frontend.img
  M data/base/images/frontend2.png
  M src/frend.h

  Log Message:
  ---
  Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD.


  Commit: dc6a4b3eb82d2c062273b9ecd504e7065e3badfd
  
https://github.com/Warzone2100/warzone2100/commit/dc6a4b3eb82d2c062273b9ecd504e7065e3badfd
  Author: Cyp 
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Distinguish between wrong version, wrong mod and full game.

Using IMAGE_NOJOIN, IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD, respectively.


  Commit: 0c5aebfdc1baf3d19d1524b829a23e802d6590a4
  
https://github.com/Warzone2100/warzone2100/commit/0c5aebfdc1baf3d19d1524b829a23e802d6590a4
  Author: Cyp 
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Subtract closed slots from displayed max players.

For example, in a 6 player map with 2 players and 2 closed slots, show 2/4 
instead
of 4/6.


  Commit: 2f1e063ec858309b73d2144d6afe070981997c6e
  
https://github.com/Warzone2100/warzone2100/commit/2f1e063ec858309b73d2144d6afe070981997c6e
  Author: vexed 
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
M src/cheat.cpp
  M src/keybind.cpp
  M src/keybind.h

  Log Message:
  ---
  Add debug command "damage me" to facilitate debugging issues related to
damage level.
Note: you can't kill a droid / structure with this command.
Used to debug retreat levels & autorepair issues & ...


  Commit: 0de4f38295d2db0e1df9db11c6ccb598f5e84d2f
  
https://github.com/Warzone2100/warzone2100/commit/0de4f38295d2db0e1df9db11c6ccb598f5e84d2f
  Author: vexed 
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
M lib/netplay/netplay.cpp
  M src/multiint.cpp

  Log Message:
  ---
  Handle host drop errors.
Restart the background screen on errors (instead of looking at a small map 
preview)

fixes ticket:3313


  Commit: 556bbc011ba9e43a0d52ce0a713f3730bf1419d3
  
https://github.com/Warzone2100/warzone2100/commit/556bbc011ba9e43a0d52ce0a713f3730bf1419d3
  Author: vexed 
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Don't bother even checking to send maps if not host.


  Commit: 613b75c5baf4a54e5d014fcc307bd437c0543a61
  
https://github.com/Warzone2100/warzone2100/commit/613b75c5baf4a54e5d014fcc307bd437c0543a61
  Author: automerge 
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
M ChangeLog
  M data/base/images/frontend.img
  M data/base/images/frontend2.png
  M data/mp/multiplay/skirmish/rules.js
  M lib/framework/cocoa_wrapper.mm
  M lib/framework/debug.cpp
  M lib/netplay/netlog.cpp
  M lib/netplay/netplay.cpp
  M lib/widget/tip.cpp
  M src/cheat.cpp
  M src/display.cpp
  M src/frend.h
  M src/keybind.cpp
  M src/keybind.h
  M src/map.cpp
  M src/multiint.cpp
  M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/29cd427...613b75c
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 83f7ad: Avoid mixing up droid orders during lag.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 83f7adecc9ec6d769f10ee4df2e7f8c75a84ecb8
  
https://github.com/Warzone2100/warzone2100/commit/83f7adecc9ec6d769f10ee4df2e7f8c75a84ecb8
  Author: Cyp 
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
M src/loop.cpp

  Log Message:
  ---
  Avoid mixing up droid orders during lag.

Droid were sorted (in order to better compress net data) and queued, each game 
tick.
During lag, multiple build orders could be queued, and executed in an 
unintended order
due to being sorted. Queueing droid orders immediately after processing user 
input
should fix this, while maintaining net data size efficiency.


  Commit: bf53f1befa6888c80c963e803c57123c9a02d6e8
  
https://github.com/Warzone2100/warzone2100/commit/bf53f1befa6888c80c963e803c57123c9a02d6e8
  Author: automerge 
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
M src/loop.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/613b75c...bf53f1b
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] fad926: Actually use the include from our included quesogl...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: fad926f03bf05e2fda409930156753cde1c5c52a
  
https://github.com/Warzone2100/warzone2100/commit/fad926f03bf05e2fda409930156753cde1c5c52a
  Author: cybersphinx 
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
M configure.ac

  Log Message:
  ---
  Actually use the include from our included quesoglc.

Fixes #3098.


  Commit: ce86eb66f4c808198c163c2df31b165cbed0417a
  
https://github.com/Warzone2100/warzone2100/commit/ce86eb66f4c808198c163c2df31b165cbed0417a
  Author: automerge 
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
M configure.ac
  M data/mp/multiplay/skirmish/rules.js
  M po/ca_ES.po
  M po/cs.po
  M po/da.po
  M po/de.po
  M po/en_GB.po
  M po/es.po
  M po/et_EE.po
  M po/fi.po
  M po/fr.po
  M po/fy.po
  M po/ga.po
  M po/hr.po
  M po/hu.po
  M po/it.po
  M po/ko.po
  M po/la.po
  M po/lt.po
  M po/nb.po
  M po/nl.po
  M po/pl.po
  M po/pt.po
  M po/pt_BR.po
  M po/ro.po
  M po/ru.po
  M po/sk.po
  M po/sl.po
  M po/tr.po
  M po/uk_UA.po
  M po/zh_CN.po
  M po/zh_TW.po

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/bf53f1b...ce86eb6
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] fa67c4: Make the FetchPrebuilt script smarter about replac...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: fa67c45c0d7f0170e03563b5dc2cab5443250537
  
https://github.com/Warzone2100/warzone2100/commit/fa67c45c0d7f0170e03563b5dc2cab5443250537
  Author: dak180 
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
M macosx/configs/FetchPrebuilt.sh
  M macosx/configs/FetchSource.sh
  M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Make the FetchPrebuilt script smarter about replacing incorrect tarballs.


  Commit: d0c0bb4eab76ad8cd30c100100508b52541b3ece
  
https://github.com/Warzone2100/warzone2100/commit/d0c0bb4eab76ad8cd30c100100508b52541b3ece
  Author: automerge 
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
M macosx/configs/FetchPrebuilt.sh
  M macosx/configs/FetchSource.sh
  M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/ce86eb6...d0c0bb4
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 8283ac: Fix clockwise skidding.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 8283ac455e136631b13aee335f837c2c1bbf027a
  
https://github.com/Warzone2100/warzone2100/commit/8283ac455e136631b13aee335f837c2c1bbf027a
  Author: Cyp 
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
M src/move.cpp

  Log Message:
  ---
  Fix clockwise skidding.

Droids (mainly hover and VTOLs) would skid when turning anti-clockwise, but not 
when
turning clockwise.


  Commit: a93b782c2c48361499e2602a2713eec90c450409
  
https://github.com/Warzone2100/warzone2100/commit/a93b782c2c48361499e2602a2713eec90c450409
  Author: automerge 
  Date:   2012-03-31 (Sat, 31 Mar 2012)

  Changed paths:
M src/move.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/d0c0bb4...a93b782
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] f6fe0b: Fix release builds, busted in fe80d02734c1e8833446...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: f6fe0b7700c9b91905adf865fa2c661d354f5ad1
  
https://github.com/Warzone2100/warzone2100/commit/f6fe0b7700c9b91905adf865fa2c661d354f5ad1
  Author: vexed 
  Date:   2012-03-31 (Sat, 31 Mar 2012)

  Changed paths:
M src/droid.cpp

  Log Message:
  ---
  Fix release builds, busted in fe80d02734c1e883344616561f05ac63bf84e1b5


  Commit: 6db98fab8fb5a52aedbc1c15350e7a125e29e9f1
  
https://github.com/Warzone2100/warzone2100/commit/6db98fab8fb5a52aedbc1c15350e7a125e29e9f1
  Author: automerge 
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
  M lib/netplay/netplay.h
  M macosx/configs/fetchscripts/Png-FetchSource.sh
  M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
  M src/display.cpp
  M src/display.h
  M src/droid.cpp
  M src/feature.cpp
  M src/loop.cpp
  M src/multibot.cpp
  M src/multigifts.cpp
  M src/multigifts.h
  M src/multiint.cpp
  M src/multijoin.cpp
  M src/multiopt.cpp
  M src/multiplay.cpp
  M src/multiplay.h
  M src/multistruct.cpp
  M src/projectile.cpp
  M src/random.h
  M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/5920686...6db98fa
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] aaeaa4: Restore missing check, so artefacts are only dropp...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: aaeaa4140a157341f68eb827ddbfaf1e90c4261b
  
https://github.com/Warzone2100/warzone2100/commit/aaeaa4140a157341f68eb827ddbfaf1e90c4261b
  Author: Cyp 
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Restore missing check, so artefacts are only dropped by factories.

Check went missing in 29966c5da299f944a0e52ab579d2b3a7ed8d3063. (Although the 
entire
function was skipped before 29966c5da299f944a0e52ab579d2b3a7ed8d3063.)


  Commit: f861a8c308d2e74727ee47aedad629b4af88b1f8
  
https://github.com/Warzone2100/warzone2100/commit/f861a8c308d2e74727ee47aedad629b4af88b1f8
  Author: automerge 
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/6db98fa...f861a8c
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 37a8ee: Don't prevent the use of the scroll wheel when the...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 37a8ee7409e49c2ca6c1928768834d7a14ec3c8a
  
https://github.com/Warzone2100/warzone2100/commit/37a8ee7409e49c2ca6c1928768834d7a14ec3c8a
  Author: vexed 
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
M src/hci.cpp
  M src/hci.h

  Log Message:
  ---
  Don't prevent the use of the scroll wheel when the build / research / design 
/ whatever window isn't up yet.


  Commit: 8e48e9e422b6a962374e9f822c2de1e95f196942
  
https://github.com/Warzone2100/warzone2100/commit/8e48e9e422b6a962374e9f822c2de1e95f196942
  Author: vexed 
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Don't spawn artifacts in campaign games, that is only done via scripts, since 
they serve a specific function in the campaign.

fixes ticket:3375


  Commit: 76650418ade70825fdc3b683cefc48ecafc76585
  
https://github.com/Warzone2100/warzone2100/commit/76650418ade70825fdc3b683cefc48ecafc76585
  Author: vexed 
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
M src/intdisplay.cpp

  Log Message:
  ---
  Don't scale the font, just use the regular size when displaying meter.


  Commit: f2dd8a0098a746e78fd5ee8ebd978ee1179623d4
  
https://github.com/Warzone2100/warzone2100/commit/f2dd8a0098a746e78fd5ee8ebd978ee1179623d4
  Author: vexed 
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
M src/frontend.cpp

  Log Message:
  ---
  Make it more obvious the game is free to anyone who wants it.
Thanks to Kreuvf for the wording.


  Commit: 361212d906db81b552fe2d6b13eea25f59a57324
  
https://github.com/Warzone2100/warzone2100/commit/361212d906db81b552fe2d6b13eea25f59a57324
  Author: vexed 
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
M src/intelmap.cpp
  M src/scriptfuncs.cpp

  Log Message:
  ---
  Revert back to flashing the intel button by default. (New players to the game 
have no idea what "New Intelligence Report" meant if they don't have the vids 
installed)


  Commit: 8c1dd73fee8ab2872912daa748b3a9fa69578dd3
  
https://github.com/Warzone2100/warzone2100/commit/8c1dd73fee8ab2872912daa748b3a9fa69578dd3
  Author: automerge 
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
M src/frontend.cpp
  M src/hci.cpp
  M src/hci.h
  M src/intdisplay.cpp
  M src/intelmap.cpp
  M src/scriptfuncs.cpp
  M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/f861a8c...8c1dd73
--
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] a00bab: Use Clang wherever possible.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: a00bab1a65d4f7f35c560635ceb70c37d73f59cf
  
https://github.com/Warzone2100/warzone2100/commit/a00bab1a65d4f7f35c560635ceb70c37d73f59cf
  Author: dak180 
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
M macosx/configs/Base-Framework.xcconfig
  M macosx/configs/Project-All.xcconfig

  Log Message:
  ---
  Use Clang wherever possible.


  Commit: 5ff4045d0d8e68b7bc05685573451288969c33ea
  
https://github.com/Warzone2100/warzone2100/commit/5ff4045d0d8e68b7bc05685573451288969c33ea
  Author: automerge 
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
M macosx/configs/Base-Framework.xcconfig
  M macosx/configs/Project-All.xcconfig

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/57c9223...5ff4045
--
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] be3753: Keep default secondary order from droid initializa...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: be375355edd2fe4efc7d77d6d909a51c04351cf2
  
https://github.com/Warzone2100/warzone2100/commit/be375355edd2fe4efc7d77d6d909a51c04351cf2
  Author: Per Inge Mathisen 
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Keep default secondary order from droid initialization if no replacement 
order found in savegame. Should fix ticket:3359


  Commit: 38b2c7def950d631892831fbca0847bd1715354e
  
https://github.com/Warzone2100/warzone2100/commit/38b2c7def950d631892831fbca0847bd1715354e
  Author: automerge 
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/5ff4045...38b2c7d
--
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] b9d6e1: Hungarian translation update by mtomi78.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b9d6e17f93c5f651c1070c4d89eedaec094794a1
  
https://github.com/Warzone2100/warzone2100/commit/b9d6e17f93c5f651c1070c4d89eedaec094794a1
  Author: cybersphinx 
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3412.


  Commit: 0ad1b227ff63958b1af969f6e6b3d256f8607647
  
https://github.com/Warzone2100/warzone2100/commit/0ad1b227ff63958b1af969f6e6b3d256f8607647
  Author: cybersphinx 
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
M data/mp/multiplay/maps/4c-greatrift/droid.ini
M data/mp/multiplay/maps/4c-greatrift/feature.ini
M data/mp/multiplay/maps/4c-greatrift/game.map
M data/mp/multiplay/maps/4c-greatrift/struct.ini
M data/mp/multiplay/maps/8c-mizamaze/droid.ini
M data/mp/multiplay/maps/8c-mizamaze/feature.ini
M data/mp/multiplay/maps/8c-mizamaze/game.map
M data/mp/multiplay/maps/8c-mizamaze/struct.ini
M data/mp/multiplay/maps/8c-wheeloffortune/droid.ini
M data/mp/multiplay/maps/8c-wheeloffortune/feature.ini
M data/mp/multiplay/maps/8c-wheeloffortune/game.map
M data/mp/multiplay/maps/8c-wheeloffortune/struct.ini
M data/mp/multiplay/maps/8c-wheeloffortune/ttypes.ttp

  Log Message:
  ---
  Map fixes and updates: GreatRift, MizaMaze, Wheel.

Thanks to NoQ. Closes #2857, refs #3317.


  Commit: 42ea41ddc6b1af59a89e2929ab3d88d36af26d8d
  
https://github.com/Warzone2100/warzone2100/commit/42ea41ddc6b1af59a89e2929ab3d88d36af26d8d
  Author: automerge 
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
M data/mp/multiplay/maps/4c-greatrift/droid.ini
M data/mp/multiplay/maps/4c-greatrift/feature.ini
M data/mp/multiplay/maps/4c-greatrift/game.map
M data/mp/multiplay/maps/4c-greatrift/struct.ini
M data/mp/multiplay/maps/8c-mizamaze/droid.ini
M data/mp/multiplay/maps/8c-mizamaze/feature.ini
M data/mp/multiplay/maps/8c-mizamaze/game.map
M data/mp/multiplay/maps/8c-mizamaze/struct.ini
M data/mp/multiplay/maps/8c-wheeloffortune/droid.ini
M data/mp/multiplay/maps/8c-wheeloffortune/feature.ini
M data/mp/multiplay/maps/8c-wheeloffortune/game.map
M data/mp/multiplay/maps/8c-wheeloffortune/struct.ini
M data/mp/multiplay/maps/8c-wheeloffortune/ttypes.ttp
M po/hu.po

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/2772636...42ea41d
--
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 5f7b47: Only send 2 desynch logs per player on desynch.

[automerge]

M src/loadsave.h
M src/main.cpp

  Log Message:
  ---
  Savegames are now stored by type. Campaign saves are located in 
savegames/campaign/ Skirmish saves are located in savegames/skirmish/


  Commit: 28c10b00a8f3bf6d87176e3aba8fba65993cedba
  
https://github.com/Warzone2100/warzone2100/commit/28c10b00a8f3bf6d87176e3aba8fba65993cedba
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/droid.cpp
M src/game.cpp
M src/keybind.cpp
M src/multiplay.cpp
M src/scriptobj.cpp
M src/template.cpp
M src/template.h

  Log Message:
  ---
  Do away with apsStaticTemplates completely, it caused multiple issues. There 
is no difference in accessing the templates for the AI or Humans now. Only 
write templates out for active players. Make each template's group unique to 
each player. Fix clone wars templates. Remove hacky functions 
GetHumanDroidTemplate & GetAIDroidTemplate fixes ticket:3146 close ticket:3369

refs b99e845d979e89d7735f61cf71c634d0c2b1e033
refs 0cc7c315db4b1b80048e9a45839cdbde5900f698


  Commit: 0eeffa516b8031d96121f44b12cb1626734a54b3
  
https://github.com/Warzone2100/warzone2100/commit/0eeffa516b8031d96121f44b12cb1626734a54b3
  Author: automerge 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M icons/warzone2100.desktop
M lib/netplay/netplay.cpp
M lib/netplay/netqueue.cpp
M lib/netplay/netqueue.h
M lib/netplay/netsocket.cpp
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
A po/generate-statistics-html.py
A po/generate-statistics-text.sh
M src/droid.cpp
M src/frontend.cpp
M src/frontend.h
M src/game.cpp
M src/ingameop.cpp
M src/ingameop.h
M src/keybind.cpp
M src/loadsave.cpp
M src/loadsave.h
M src/main.cpp
M src/map.cpp
M src/mission.cpp
M src/multigifts.cpp
M src/multiplay.cpp
M src/scriptobj.cpp
M src/structure.cpp
M src/template.cpp
M src/template.h

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/c65abcb...0eeffa5
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 9775d0: Let's try to stop checking for tiles when we are o...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9775d0c4f66f80d6378cee0dc9ea31d3cdfe5708
  
https://github.com/Warzone2100/warzone2100/commit/9775d0c4f66f80d6378cee0dc9ea31d3cdfe5708
  Author: vexed 
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
M src/component.cpp
M src/move.cpp

  Log Message:
  ---
  Let's try to stop checking for tiles when we are offscreen via a Transporter.

fixes ticket:3403


  Commit: c1a02a96e49160af3c4ccec2e6925c68447a191f
  
https://github.com/Warzone2100/warzone2100/commit/c1a02a96e49160af3c4ccec2e6925c68447a191f
  Author: automerge 
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
M src/component.cpp
M src/move.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/0eeffa5...c1a02a9
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 500580: Clarify when we reach unit cap.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 500580717937e94793b7c816842384a910f5e658
  
https://github.com/Warzone2100/warzone2100/commit/500580717937e94793b7c816842384a910f5e658
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Clarify when we reach unit cap.


  Commit: 84117025e0faabe0543c1181d8987fc2dcccf358
  
https://github.com/Warzone2100/warzone2100/commit/84117025e0faabe0543c1181d8987fc2dcccf358
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Specify which wrong player was trying to give a gift


  Commit: 62da559ebe7fbb0ede9592b4b5d9382fecd9ef09
  
https://github.com/Warzone2100/warzone2100/commit/62da559ebe7fbb0ede9592b4b5d9382fecd9ef09
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/mission.cpp

  Log Message:
  ---
  Disable being shown the option to save at the end of the mission (in the 
mission summary screen), this is a work around for a flaw in the level loading 
code in some levels. Also disable autosaves, for the same problem. refs #3377


  Commit: 3228514dad2729e919340338020d1fecd1ca98f2
  
https://github.com/Warzone2100/warzone2100/commit/3228514dad2729e919340338020d1fecd1ca98f2
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/map.cpp

  Log Message:
  ---
  Cleanup leaks in floodbucket

refs #3395


  Commit: 2a7a8acc7d78029b934b0682cb8756f0b74a1747
  
https://github.com/Warzone2100/warzone2100/commit/2a7a8acc7d78029b934b0682cb8756f0b74a1747
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/main.cpp

  Log Message:
  ---
  Cleanup leaks in UTF conversion of command line (windows only) refs #3395


  Commit: 7d5315e3ee01cf255ac5a057517ef4b905a2dbd2
  
https://github.com/Warzone2100/warzone2100/commit/7d5315e3ee01cf255ac5a057517ef4b905a2dbd2
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/frontend.cpp
M src/main.cpp

  Log Message:
  ---
  Move NETinit() routines to better location

refs #3395


  Commit: 2d5f8587b938439b11f2e8f815f7c17f46ee77c4
  
https://github.com/Warzone2100/warzone2100/commit/2d5f8587b938439b11f2e8f815f7c17f46ee77c4
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netqueue.cpp
M lib/netplay/netqueue.h
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h

  Log Message:
  ---
  Cleanup some leaks in the NET* routines.

refs #3395


  Commit: d8789661fbffe2f648a06a0689de3a9350bbe8b0
  
https://github.com/Warzone2100/warzone2100/commit/d8789661fbffe2f648a06a0689de3a9350bbe8b0
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/frontend.cpp
M src/frontend.h
M src/ingameop.cpp
M src/ingameop.h
M src/loadsave.cpp
M src/loadsave.h
M src/main.cpp

  Log Message:
  ---
  Savegames are now stored by type. Campaign saves are located in 
savegames/campaign/ Skirmish saves are located in savegames/skirmish/


  Commit: 28c10b00a8f3bf6d87176e3aba8fba65993cedba
  
https://github.com/Warzone2100/warzone2100/commit/28c10b00a8f3bf6d87176e3aba8fba65993cedba
  Author: vexed 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/droid.cpp
M src/game.cpp
M src/keybind.cpp
M src/multiplay.cpp
M src/scriptobj.cpp
M src/template.cpp
M src/template.h

  Log Message:
  ---
  Do away with apsStaticTemplates completely, it caused multiple issues. There 
is no difference in accessing the templates for the AI or Humans now. Only 
write templates out for active players. Make each template's group unique to 
each player. Fix clone wars templates. Remove hacky functions 
GetHumanDroidTemplate & GetAIDroidTemplate fixes ticket:3146 close ticket:3369

refs b99e845d979e89d7735f61cf71c634d0c2b1e033
refs 0cc7c315db4b1b80048e9a45839cdbde5900f698


  Commit: 9775d0c4f66f80d6378cee0dc9ea31d3cdfe5708
  
https://github.com/Warzone2100/warzone2100/commit/9775d0c4f66f80d6378cee0dc9ea31d3cdfe5708
  Author: vexed 
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
M src/component.cpp
M src/move.cpp

  Log Message:
  ---
  Let's try to stop checking for tiles when we are offscreen via a Transporter.

fixes ticket:3403


  Commit: 4879779b631235bdfa5890a0cbfcdeea79023656
  
https://github.com/Warzone2100/warzone2100/commit/4879779b631235bdfa5890a0cbfcdeea79023656
  Author: automerge 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netqueue.cpp
M lib/netplay/netqueue.h
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M src/component.cpp
M src/droid.cpp
M src/frontend

[Warzone2100-commits] [Warzone2100/warzone2100] 937703: Add missing license header to generate-statistics-...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 937703ffb71de3de3e52f91a62b772549116efed
  
https://github.com/Warzone2100/warzone2100/commit/937703ffb71de3de3e52f91a62b772549116efed
  Author: cybersphinx 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M po/generate-statistics-html.py

  Log Message:
  ---
  Add missing license header to generate-statistics-html.py.


  Commit: 316c0aff5f0d019c264698d7a3922c057bd2cfdc
  
https://github.com/Warzone2100/warzone2100/commit/316c0aff5f0d019c264698d7a3922c057bd2cfdc
  Author: cybersphinx 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.


  Commit: 7f54b33436fe55cf8d73574b1a32fe01065a96b7
  
https://github.com/Warzone2100/warzone2100/commit/7f54b33436fe55cf8d73574b1a32fe01065a96b7
  Author: vexed 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M src/frontend.cpp
M src/game.cpp

  Log Message:
  ---
  Trying to find out why savegames are being broken.
Possibly helps in finding out why #3416 happens.

refs:3416


  Commit: 0de0c416297a1694146af7ca82189ee971c93502
  
https://github.com/Warzone2100/warzone2100/commit/0de0c416297a1694146af7ca82189ee971c93502
  Author: vexed 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M src/template.cpp

  Log Message:
  ---
  Only populate unique entries for the UI template list.

Fixes #3369


  Commit: d2f0082cebad05a516e80989c3b781fb774c0219
  
https://github.com/Warzone2100/warzone2100/commit/d2f0082cebad05a516e80989c3b781fb774c0219
  Author: automerge 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M ChangeLog
M po/generate-statistics-html.py
M src/frontend.cpp
M src/game.cpp
M src/template.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/c701e27...d2f0082
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 937703: Add missing license header to generate-statistics-...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 937703ffb71de3de3e52f91a62b772549116efed
  
https://github.com/Warzone2100/warzone2100/commit/937703ffb71de3de3e52f91a62b772549116efed
  Author: cybersphinx 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M po/generate-statistics-html.py

  Log Message:
  ---
  Add missing license header to generate-statistics-html.py.


  Commit: 316c0aff5f0d019c264698d7a3922c057bd2cfdc
  
https://github.com/Warzone2100/warzone2100/commit/316c0aff5f0d019c264698d7a3922c057bd2cfdc
  Author: cybersphinx 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.


  Commit: 7f54b33436fe55cf8d73574b1a32fe01065a96b7
  
https://github.com/Warzone2100/warzone2100/commit/7f54b33436fe55cf8d73574b1a32fe01065a96b7
  Author: vexed 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M src/frontend.cpp
M src/game.cpp

  Log Message:
  ---
  Trying to find out why savegames are being broken.
Possibly helps in finding out why #3416 happens.

refs:3416


  Commit: 0de0c416297a1694146af7ca82189ee971c93502
  
https://github.com/Warzone2100/warzone2100/commit/0de0c416297a1694146af7ca82189ee971c93502
  Author: vexed 
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
M src/template.cpp

  Log Message:
  ---
  Only populate unique entries for the UI template list.

Fixes #3369


  Commit: 6236028c15f8240ca4561b9187265fb6ced4acee
  
https://github.com/Warzone2100/warzone2100/commit/6236028c15f8240ca4561b9187265fb6ced4acee
  Author: automerge 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M ChangeLog
M po/generate-statistics-html.py
M src/frontend.cpp
M src/game.cpp
M src/template.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/880ee8e...6236028
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 146332: Fix typo for SuperTransport.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 146332aaee331997dd668bf36635fa190ca7ba2b
  
https://github.com/Warzone2100/warzone2100/commit/146332aaee331997dd668bf36635fa190ca7ba2b
  Author: vexed 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M data/mp/stats/templates.txt

  Log Message:
  ---
  Fix typo for SuperTransport.

Fixes ticket:3426


  Commit: 3bebe1a0d6c3e8f230b56def4a823430a2a58c9f
  
https://github.com/Warzone2100/warzone2100/commit/3bebe1a0d6c3e8f230b56def4a823430a2a58c9f
  Author: vexed 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/cheat.cpp
M src/frontend.cpp
M src/keybind.cpp
M src/keybind.h
M src/multistruct.cpp

  Log Message:
  ---
  Try to fix the autogame hack by introducing a new bool to keep track of
when we should be using the AI's templates.

This only works in debug mode!

TODO: Move the actual setting of this bool script side, in case the user picks
a AI that doesn't support the 'autogame' command.

close ticket:3369


  Commit: 6688d820d3a533dca978490bab5df4e6d7c936a8
  
https://github.com/Warzone2100/warzone2100/commit/6688d820d3a533dca978490bab5df4e6d7c936a8
  Author: automerge 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M data/mp/stats/templates.txt
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/cheat.cpp
M src/frontend.cpp
M src/keybind.cpp
M src/keybind.h
M src/multistruct.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/d2f0082...6688d82
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 146332: Fix typo for SuperTransport.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 146332aaee331997dd668bf36635fa190ca7ba2b
  
https://github.com/Warzone2100/warzone2100/commit/146332aaee331997dd668bf36635fa190ca7ba2b
  Author: vexed 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M data/mp/stats/templates.txt

  Log Message:
  ---
  Fix typo for SuperTransport.

Fixes ticket:3426


  Commit: 3bebe1a0d6c3e8f230b56def4a823430a2a58c9f
  
https://github.com/Warzone2100/warzone2100/commit/3bebe1a0d6c3e8f230b56def4a823430a2a58c9f
  Author: vexed 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/cheat.cpp
M src/frontend.cpp
M src/keybind.cpp
M src/keybind.h
M src/multistruct.cpp

  Log Message:
  ---
  Try to fix the autogame hack by introducing a new bool to keep track of
when we should be using the AI's templates.

This only works in debug mode!

TODO: Move the actual setting of this bool script side, in case the user picks
a AI that doesn't support the 'autogame' command.

close ticket:3369


  Commit: 9546393be4c398ae73bdf91f2160f4b4a84a585a
  
https://github.com/Warzone2100/warzone2100/commit/9546393be4c398ae73bdf91f2160f4b4a84a585a
  Author: automerge 
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
M data/mp/stats/templates.txt
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/cheat.cpp
M src/frontend.cpp
M src/keybind.cpp
M src/keybind.h
M src/multistruct.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/4beba1f...9546393
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] ad018a: Don't desynch in debug mode when pressing 'A' or '...

[automerge]

82efa8884a61d940b0414f0526b8abef78b62d0
  
https://github.com/Warzone2100/warzone2100/commit/282efa8884a61d940b0414f0526b8abef78b62d0
  Author: Cyp 
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multimenu.cpp

  Log Message:
  ---
  Show net usage statistics per game, as well as per second.


  Commit: 1fb55c6fdadb2aad713b348ecab8e4c6e57cc21a
  
https://github.com/Warzone2100/warzone2100/commit/1fb55c6fdadb2aad713b348ecab8e4c6e57cc21a
  Author: automerge 
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
A data/base/components/weapons/scavmra.pie
M data/base/stats/weapons.txt
M data/base/wrf/piestats.wrf
A data/mp/components/weapons/scavmra.pie
M data/mp/stats/weapons.txt
M data/mp/wrf/piestats.wrf
M lib/gamelib/gtime.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/netplay/netsocket.cpp
M lib/netplay/netsocket.h
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M src/droid.cpp
M src/keybind.cpp
M src/loop.cpp
M src/multigifts.cpp
M src/multigifts.h
M src/multimenu.cpp
M src/objmem.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/6688d82...1fb55c6
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] ad018a: Don't desynch in debug mode when pressing 'A' or '...

[automerge]

82efa8884a61d940b0414f0526b8abef78b62d0
  
https://github.com/Warzone2100/warzone2100/commit/282efa8884a61d940b0414f0526b8abef78b62d0
  Author: Cyp 
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multimenu.cpp

  Log Message:
  ---
  Show net usage statistics per game, as well as per second.


  Commit: b763c32cf584064141d8f801f297c93e9b4e3a0d
  
https://github.com/Warzone2100/warzone2100/commit/b763c32cf584064141d8f801f297c93e9b4e3a0d
  Author: automerge 
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
A data/base/components/weapons/scavmra.pie
M data/base/stats/weapons.txt
M data/base/wrf/piestats.wrf
A data/mp/components/weapons/scavmra.pie
M data/mp/stats/weapons.txt
M data/mp/wrf/piestats.wrf
M lib/gamelib/gtime.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/netplay/netsocket.cpp
M lib/netplay/netsocket.h
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M src/droid.cpp
M src/keybind.cpp
M src/loop.cpp
M src/multigifts.cpp
M src/multigifts.h
M src/multimenu.cpp
M src/objmem.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/9546393...b763c32
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 2309f1: Try harder to prevent desynch on player leaving.

[automerge]

: af016845d908f3d92a4ed4e9ee951701e9ec35b0
  
https://github.com/Warzone2100/warzone2100/commit/af016845d908f3d92a4ed4e9ee951701e9ec35b0
  Author: cybersphinx 
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
M src/display3d.cpp

  Log Message:
  ---
  Remove unused variable to shut up gcc 4.7.

Leftover from fcd5510a1311cfc535685aeac2983df13800729e.


  Commit: 93f0e61d924d6709c8db68b53d19f7e3bbeaa911
  
https://github.com/Warzone2100/warzone2100/commit/93f0e61d924d6709c8db68b53d19f7e3bbeaa911
  Author: Cyp 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M src/multijoin.cpp

  Log Message:
  ---
  Do not freeze on player leaving, either.

Introduced in 2309f165b021e7ea0a4d9c8a2e85cdea6e8f10ba. (Although freezing 
isn't much
worse than desynch.)


  Commit: 3015548e6d161ebca885893471edeb26043ffb28
  
https://github.com/Warzone2100/warzone2100/commit/3015548e6d161ebca885893471edeb26043ffb28
  Author: cybersphinx 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M po/tr.po

  Log Message:
  ---
  Turkish translation update by Ayhan Görgülü.

Closes #3417.


  Commit: 17f7f71f9b4b629491212dbb32d0ec811fa488b9
  
https://github.com/Warzone2100/warzone2100/commit/17f7f71f9b4b629491212dbb32d0ec811fa488b9
  Author: cybersphinx 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3430.


  Commit: 401114484054fb2d63f2cfb5b57f3f6c3330a72e
  
https://github.com/Warzone2100/warzone2100/commit/401114484054fb2d63f2cfb5b57f3f6c3330a72e
  Author: cybersphinx 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Update translations.


  Commit: 1e1b51af94fae188636604a502688d4881fa5ba6
  
https://github.com/Warzone2100/warzone2100/commit/1e1b51af94fae188636604a502688d4881fa5ba6
  Author: cybersphinx 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.


  Commit: ca736e71af9e2444ae0133a19214f27db456e9a2
  
https://github.com/Warzone2100/warzone2100/commit/ca736e71af9e2444ae0133a19214f27db456e9a2
  Author: Cyp 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M src/multijoin.cpp

  Log Message:
  ---
  Fix kicking of AIs.

See 93f0e61d924d6709c8db68b53d19f7e3bbeaa911, introduced in 
2309f165b021e7ea0a4d9c8a2e85cdea6e8f10ba.

Fixes ticket:3439.


  Commit: a28bcf928dee7d32dc326866c35ab60c6d5f0d47
  
https://github.com/Warzone2100/warzone2100/commit/a28bcf928dee7d32dc326866c35ab60c6d5f0d47
  Author: automerge 
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
M ChangeLog
M data/mp/stats/structures.txt
M data/mp/structs/blgateh.pie
A data/mp/structs/blgateh_l.pie
A data/mp/structs/blgateh_t.pie
A data/mp/structs/blgateh_x.pie
M data/mp/wrf/piestats.wrf
M lib/netplay/netplay.cpp
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/action.cpp
M src/ai.cpp
M src/display3d.cpp
M src/loop.cpp
M src/move.cpp
M src/multijoin.cpp
M src/projectile.cpp
M src/structure.cpp
M src/structure.h

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/b763c32...a28bcf9
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 887eea: Update ChangeLog.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 887eea8e704f39ef98cb6264484cb2612fb1dcce
  
https://github.com/Warzone2100/warzone2100/commit/887eea8e704f39ef98cb6264484cb2612fb1dcce
  Author: cybersphinx 
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.


  Commit: c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c
  
https://github.com/Warzone2100/warzone2100/commit/c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c
  Author: vexed 
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
M src/frontend.cpp

  Log Message:
  ---
  Fix Fastplay

Fixes ticket:3447


  Commit: 18216c60e76d05ad0fe2bf7d860347f76f70c8f8
  
https://github.com/Warzone2100/warzone2100/commit/18216c60e76d05ad0fe2bf7d860347f76f70c8f8
  Author: vexed 
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
M src/frontend.cpp

  Log Message:
  ---
  Fix Skirmish loading

fixes ticket:3451


  Commit: 1ef4fc6cfdf05435bbaaa95155c23ea1a76d6409
  
https://github.com/Warzone2100/warzone2100/commit/1ef4fc6cfdf05435bbaaa95155c23ea1a76d6409
  Author: Cyp 
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/loop.cpp

  Log Message:
  ---
  Don't report desynch when player names don't match.

Host sometimes considers empty slots to have names, while other clients 
consider the
empty slots unnamed. Since the player names don't affect the game state, this 
is safe
to ignore.


  Commit: ef685d0b892327b6e8af90da0ade792575925e3d
  
https://github.com/Warzone2100/warzone2100/commit/ef685d0b892327b6e8af90da0ade792575925e3d
  Author: Cyp 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/loop.cpp

  Log Message:
  ---
  Clear player names iff game not started, instead of iff not host.

This seems more logical, and matches the comment on the next line. Clients no 
longer
disagree with the host on whether an empty slot has a name, when a player joins 
and
leaves before the game starts.


  Commit: 4a9ac7fc3ed17ee9b63e829b10de3791c0ee7bd9
  
https://github.com/Warzone2100/warzone2100/commit/4a9ac7fc3ed17ee9b63e829b10de3791c0ee7bd9
  Author: vexed 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M data/base/texpages/page-31-features-urban.png

  Log Message:
  ---
  Update the building textures.
Thanks to Berg for the update.


  Commit: 25e118c628881f20411d027ff2d48e8a63a44730
  
https://github.com/Warzone2100/warzone2100/commit/25e118c628881f20411d027ff2d48e8a63a44730
  Author: vexed 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Don't pretend that everyone is a winner when they have failed.

fixes ticket:3449


  Commit: c007bb9527f5c9dddc51b2667e9e83539ba9cb92
  
https://github.com/Warzone2100/warzone2100/commit/c007bb9527f5c9dddc51b2667e9e83539ba9cb92
  Author: automerge 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M ChangeLog
M data/base/texpages/page-31-features-urban.png
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/frontend.cpp
M src/loop.cpp
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/a3134ae...c007bb9
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] c3218e: Fix Fastplay

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c
  
https://github.com/Warzone2100/warzone2100/commit/c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c
  Author: vexed 
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
M src/frontend.cpp

  Log Message:
  ---
  Fix Fastplay

Fixes ticket:3447


  Commit: 18216c60e76d05ad0fe2bf7d860347f76f70c8f8
  
https://github.com/Warzone2100/warzone2100/commit/18216c60e76d05ad0fe2bf7d860347f76f70c8f8
  Author: vexed 
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
M src/frontend.cpp

  Log Message:
  ---
  Fix Skirmish loading

fixes ticket:3451


  Commit: 1ef4fc6cfdf05435bbaaa95155c23ea1a76d6409
  
https://github.com/Warzone2100/warzone2100/commit/1ef4fc6cfdf05435bbaaa95155c23ea1a76d6409
  Author: Cyp 
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/loop.cpp

  Log Message:
  ---
  Don't report desynch when player names don't match.

Host sometimes considers empty slots to have names, while other clients 
consider the
empty slots unnamed. Since the player names don't affect the game state, this 
is safe
to ignore.


  Commit: ef685d0b892327b6e8af90da0ade792575925e3d
  
https://github.com/Warzone2100/warzone2100/commit/ef685d0b892327b6e8af90da0ade792575925e3d
  Author: Cyp 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/loop.cpp

  Log Message:
  ---
  Clear player names iff game not started, instead of iff not host.

This seems more logical, and matches the comment on the next line. Clients no 
longer
disagree with the host on whether an empty slot has a name, when a player joins 
and
leaves before the game starts.


  Commit: 4a9ac7fc3ed17ee9b63e829b10de3791c0ee7bd9
  
https://github.com/Warzone2100/warzone2100/commit/4a9ac7fc3ed17ee9b63e829b10de3791c0ee7bd9
  Author: vexed 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M data/base/texpages/page-31-features-urban.png

  Log Message:
  ---
  Update the building textures.
Thanks to Berg for the update.


  Commit: 25e118c628881f20411d027ff2d48e8a63a44730
  
https://github.com/Warzone2100/warzone2100/commit/25e118c628881f20411d027ff2d48e8a63a44730
  Author: vexed 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Don't pretend that everyone is a winner when they have failed.

fixes ticket:3449


  Commit: a31b9ab30d048f612a36d7eb965d5ab5f3d2e700
  
https://github.com/Warzone2100/warzone2100/commit/a31b9ab30d048f612a36d7eb965d5ab5f3d2e700
  Author: automerge 
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
M data/base/texpages/page-31-features-urban.png
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/frontend.cpp
M src/loop.cpp
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/778a426...a31b9ab
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 0def25: Hungarian translation update by mtomi78.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 0def25206b7d23788919a2aa067e880626e542fc
  
https://github.com/Warzone2100/warzone2100/commit/0def25206b7d23788919a2aa067e880626e542fc
  Author: cybersphinx 
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3458.


  Commit: e36cdf11e827e85c79cbd9319507809c1fae838b
  
https://github.com/Warzone2100/warzone2100/commit/e36cdf11e827e85c79cbd9319507809c1fae838b
  Author: Cyp 
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
M data/base/components/weapons/trmair2.pie
M data/base/components/weapons/trmair3.pie
M data/mp/structs/trmflmrp.pie

  Log Message:
  ---
  Fix tcmask on Plasmite Flamer, Sunburst AA and AA Flak Cannon.

Fixed by running simplipie.

Could not fix Naval propulsion, which seems to be missing the tcmask.

Fixes ticket:3433.


  Commit: 7079ad295112abcd83e6be1e7c172d36aec64c25
  
https://github.com/Warzone2100/warzone2100/commit/7079ad295112abcd83e6be1e7c172d36aec64c25
  Author: vexed 
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
M src/scriptfuncs.cpp
M src/template.cpp

  Log Message:
  ---
  Fix tutorial that was broken in a6fa286dcf463d4c6d74e8a874e70f671f3d5018 and 
e862a993cb4ad1939e70dfc9a5b09e8b6519b5a7

Fixes ticket:3058


  Commit: e03bfe06ee593c7ff10b600671f62bd909760991
  
https://github.com/Warzone2100/warzone2100/commit/e03bfe06ee593c7ff10b600671f62bd909760991
  Author: automerge 
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
M data/base/components/weapons/trmair2.pie
M data/base/components/weapons/trmair3.pie
M data/mp/structs/trmflmrp.pie
M po/hu.po
M src/scriptfuncs.cpp
M src/template.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/bc035af...e03bfe0
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 0def25: Hungarian translation update by mtomi78.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 0def25206b7d23788919a2aa067e880626e542fc
  
https://github.com/Warzone2100/warzone2100/commit/0def25206b7d23788919a2aa067e880626e542fc
  Author: cybersphinx 
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3458.


  Commit: e36cdf11e827e85c79cbd9319507809c1fae838b
  
https://github.com/Warzone2100/warzone2100/commit/e36cdf11e827e85c79cbd9319507809c1fae838b
  Author: Cyp 
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
M data/base/components/weapons/trmair2.pie
M data/base/components/weapons/trmair3.pie
M data/mp/structs/trmflmrp.pie

  Log Message:
  ---
  Fix tcmask on Plasmite Flamer, Sunburst AA and AA Flak Cannon.

Fixed by running simplipie.

Could not fix Naval propulsion, which seems to be missing the tcmask.

Fixes ticket:3433.


  Commit: 7079ad295112abcd83e6be1e7c172d36aec64c25
  
https://github.com/Warzone2100/warzone2100/commit/7079ad295112abcd83e6be1e7c172d36aec64c25
  Author: vexed 
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
M src/scriptfuncs.cpp
M src/template.cpp

  Log Message:
  ---
  Fix tutorial that was broken in a6fa286dcf463d4c6d74e8a874e70f671f3d5018 and 
e862a993cb4ad1939e70dfc9a5b09e8b6519b5a7

Fixes ticket:3058


  Commit: 2a794bea26cbd67097da4a970fe9de9f5801d2ae
  
https://github.com/Warzone2100/warzone2100/commit/2a794bea26cbd67097da4a970fe9de9f5801d2ae
  Author: automerge 
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
M data/base/components/weapons/trmair2.pie
M data/base/components/weapons/trmair3.pie
M data/mp/structs/trmflmrp.pie
M po/hu.po
M src/scriptfuncs.cpp
M src/template.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/a31b9ab...2a794be
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 6365f2: Check template validity before trying to build dro...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 6365f2dbec51abb8ac2509c0623b54dce3e655fd
  
https://github.com/Warzone2100/warzone2100/commit/6365f2dbec51abb8ac2509c0623b54dce3e655fd
  Author: Cyp 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Check template validity before trying to build droids.


  Commit: 9fc92b7d64200c65f7ea8baab617ed8d19a773cf
  
https://github.com/Warzone2100/warzone2100/commit/9fc92b7d64200c65f7ea8baab617ed8d19a773cf
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/pl.po

  Log Message:
  ---
  Polish translation update by Emdek.

Closes #1347.


  Commit: badb8c05cb3e9e8a8e1af529288d57b96126e482
  
https://github.com/Warzone2100/warzone2100/commit/badb8c05cb3e9e8a8e1af529288d57b96126e482
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3483.


  Commit: d74ebad6a32dbe49771223c347ad9515a101976b
  
https://github.com/Warzone2100/warzone2100/commit/d74ebad6a32dbe49771223c347ad9515a101976b
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3485.


  Commit: a400fe055fd5d176cd809bcfdc0973cf839a4a2c
  
https://github.com/Warzone2100/warzone2100/commit/a400fe055fd5d176cd809bcfdc0973cf839a4a2c
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/tr.po

  Log Message:
  ---
  Turkish translation update by Ayhan Görgülü.

Closes #3486.


  Commit: c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37
  
https://github.com/Warzone2100/warzone2100/commit/c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/nl.po

  Log Message:
  ---
  Dutch translation update by nino_romans.

Closes #3484.


  Commit: 52511cec6003e389307859535853eb96a9cf60a4
  
https://github.com/Warzone2100/warzone2100/commit/52511cec6003e389307859535853eb96a9cf60a4
  Author: cybersphinx 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M src/map.cpp
M tests/modeltest.c

  Log Message:
  ---
  Fix some typos.

Thanks to pabs for noticing one of them. Closes #3495.


  Commit: e5d2242be00bdb665e0e8ea55adcbd90be462160
  
https://github.com/Warzone2100/warzone2100/commit/e5d2242be00bdb665e0e8ea55adcbd90be462160
  Author: Paul Wise 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/script/parse.h
M src/qtscriptfuncs.cpp
M src/scriptvals.h

  Log Message:
  ---
  fix an FTBFS with -Werror=format-security

Fixes ticket:3493.


  Commit: 737b3d9d24ab1634dafd09558fc8b8a5354ffa9c
  
https://github.com/Warzone2100/warzone2100/commit/737b3d9d24ab1634dafd09558fc8b8a5354ffa9c
  Author: vexed 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M src/game.cpp
M src/objmem.cpp
M src/structure.cpp

  Log Message:
  ---
  Fix flag loading code to work for out of sequence factories.

fixes ticket:3384


  Commit: dadfdf00f40292af947b5ee7cba9408162e6200a
  
https://github.com/Warzone2100/warzone2100/commit/dadfdf00f40292af947b5ee7cba9408162e6200a
  Author: automerge 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/script/parse.h
M po/fr.po
M po/hu.po
M po/nl.po
M po/pl.po
M po/tr.po
M src/game.cpp
M src/map.cpp
M src/objmem.cpp
M src/qtscriptfuncs.cpp
M src/scriptvals.h
M src/structure.cpp
M tests/modeltest.c

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/5da5846...dadfdf0
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 6365f2: Check template validity before trying to build dro...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 6365f2dbec51abb8ac2509c0623b54dce3e655fd
  
https://github.com/Warzone2100/warzone2100/commit/6365f2dbec51abb8ac2509c0623b54dce3e655fd
  Author: Cyp 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Check template validity before trying to build droids.


  Commit: 9fc92b7d64200c65f7ea8baab617ed8d19a773cf
  
https://github.com/Warzone2100/warzone2100/commit/9fc92b7d64200c65f7ea8baab617ed8d19a773cf
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/pl.po

  Log Message:
  ---
  Polish translation update by Emdek.

Closes #1347.


  Commit: badb8c05cb3e9e8a8e1af529288d57b96126e482
  
https://github.com/Warzone2100/warzone2100/commit/badb8c05cb3e9e8a8e1af529288d57b96126e482
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3483.


  Commit: d74ebad6a32dbe49771223c347ad9515a101976b
  
https://github.com/Warzone2100/warzone2100/commit/d74ebad6a32dbe49771223c347ad9515a101976b
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3485.


  Commit: a400fe055fd5d176cd809bcfdc0973cf839a4a2c
  
https://github.com/Warzone2100/warzone2100/commit/a400fe055fd5d176cd809bcfdc0973cf839a4a2c
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/tr.po

  Log Message:
  ---
  Turkish translation update by Ayhan Görgülü.

Closes #3486.


  Commit: c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37
  
https://github.com/Warzone2100/warzone2100/commit/c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37
  Author: cybersphinx 
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
M po/nl.po

  Log Message:
  ---
  Dutch translation update by nino_romans.

Closes #3484.


  Commit: 52511cec6003e389307859535853eb96a9cf60a4
  
https://github.com/Warzone2100/warzone2100/commit/52511cec6003e389307859535853eb96a9cf60a4
  Author: cybersphinx 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M src/map.cpp
M tests/modeltest.c

  Log Message:
  ---
  Fix some typos.

Thanks to pabs for noticing one of them. Closes #3495.


  Commit: e5d2242be00bdb665e0e8ea55adcbd90be462160
  
https://github.com/Warzone2100/warzone2100/commit/e5d2242be00bdb665e0e8ea55adcbd90be462160
  Author: Paul Wise 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/script/parse.h
M src/qtscriptfuncs.cpp
M src/scriptvals.h

  Log Message:
  ---
  fix an FTBFS with -Werror=format-security

Fixes ticket:3493.


  Commit: 737b3d9d24ab1634dafd09558fc8b8a5354ffa9c
  
https://github.com/Warzone2100/warzone2100/commit/737b3d9d24ab1634dafd09558fc8b8a5354ffa9c
  Author: vexed 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M src/game.cpp
M src/objmem.cpp
M src/structure.cpp

  Log Message:
  ---
  Fix flag loading code to work for out of sequence factories.

fixes ticket:3384


  Commit: f04b5ddb8bde2aa6476a296aa88cb8f749d1ab84
  
https://github.com/Warzone2100/warzone2100/commit/f04b5ddb8bde2aa6476a296aa88cb8f749d1ab84
  Author: automerge 
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/script/parse.h
M po/fr.po
M po/hu.po
M po/nl.po
M po/pl.po
M po/tr.po
M src/game.cpp
M src/map.cpp
M src/objmem.cpp
M src/qtscriptfuncs.cpp
M src/scriptvals.h
M src/structure.cpp
M tests/modeltest.c

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/4a1e029...f04b5dd
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] e14c39: Fix communication between remaining clients when o...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e14c39fb38ba8c6f11bb4f8e3f0e78a61cb86828
  
https://github.com/Warzone2100/warzone2100/commit/e14c39fb38ba8c6f11bb4f8e3f0e78a61cb86828
  Author: Cyp 
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
M src/loop.cpp

  Log Message:
  ---
  Fix communication between remaining clients when one client freezes.

Problem persisted until the frozen client drops completely, or unfreezes (net 
connection is restored).

To reproduce, test with host and 2 other clients, and freeze one client with 
kill -STOP or by pausing the net
connection somehow.

Cause was lack of flushing, due to an inverted condition exposed in 
b9cc7702b7dc7ff3781f32f69b9cac110ebd6b98 and
introduced in c1ca4d2d343e01ab9eb672bf6d3b2809e11efe19. Would probably trigger 
before
b9cc7702b7dc7ff3781f32f69b9cac110ebd6b98, for any remaining clients that freeze 
for any reason (for example, because
of <2.5 FPS or momentary hard drive swapping) for more than 400ms.


  Commit: bedd8704f2aef5afd1c2acfa4566a0445d3b22fb
  
https://github.com/Warzone2100/warzone2100/commit/bedd8704f2aef5afd1c2acfa4566a0445d3b22fb
  Author: Cyp 
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
M src/multiint.cpp
M src/multimenu.cpp
M src/multiplay.h

  Log Message:
  ---
  Be more consistent in ping display, show ping ≥ 4000 as ∞.


  Commit: a80f0408495e8357994b8ace0812d5f4ad817956
  
https://github.com/Warzone2100/warzone2100/commit/a80f0408495e8357994b8ace0812d5f4ad817956
  Author: Cyp 
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
M src/multiplay.h

  Log Message:
  ---
  Put the unused MAX_BYTESPERSEC define out of its misery.


  Commit: f0eea791042c6baba6173c2d5da37f5eaf097813
  
https://github.com/Warzone2100/warzone2100/commit/f0eea791042c6baba6173c2d5da37f5eaf097813
  Author: Cyp 
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
M data/base/script/data/tutorial3.vlo
M data/base/stats/templates.txt
M data/mp/stats/templates.txt
M src/template.cpp

  Log Message:
  ---
  Fix Nexus AI unable to build units.

Nexus was building units with an unresearched sensor (equivalent to the default 
sensor). Since
6365f2dbec51abb8ac2509c0623b54dce3e655fd, Nexus can no longer build 
unresearched units.

In the tutorial, the designed MG viper wheels would also use the same 
unresearched sensor.

Replaced unresearched DefaultSensor1Mk1 with ZNULLSENSOR. Removed special case 
for tutorial in
7079ad295112abcd83e6be1e7c172d36aec64c25, which is no longer required.


  Commit: 22799c2b2607949b1920e8d1f143311c167f7a39
  
https://github.com/Warzone2100/warzone2100/commit/22799c2b2607949b1920e8d1f143311c167f7a39
  Author: Cyp 
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
M src/selection.cpp

  Log Message:
  ---
  Fix unconventional reported unit count on selecting all units of same type.

Previous unconventional behaviour was to consider the set of 
previously-unselected droids becoming selected, and
report the size of the set plus the size of the set of types of droids in the 
set.

Iff there was exactly one droid of each type previously selected, and there was 
at least one unselected droid of
each selected type, then the reported unit count would coincidentally be 
correct.

Fixes ticket:3479.


  Commit: 00b1968184ff4f215ed7de8b217857f0d5866ad1
  
https://github.com/Warzone2100/warzone2100/commit/00b1968184ff4f215ed7de8b217857f0d5866ad1
  Author: Cyp 
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
M src/multijoin.cpp

  Log Message:
  ---
  Show "[PlayerName] has left the game." to all players again.

Fixes ticket:3461.


  Commit: 15aebc46f3b4fe78063dcb52aa777c5f437ca30e
  
https://github.com/Warzone2100/warzone2100/commit/15aebc46f3b4fe78063dcb52aa777c5f437ca30e
  Author: dak180 
  Date:   2012-05-22 (Tue, 22 May 2012)

  Changed paths:
M macosx/configs/fetchscripts/Zlib-FetchSource.sh

  Log Message:
  ---
  Update zlib to 1.2.7.


  Commit: 5d199046c8e4ba59e1b1c4b8871c0e2e7c1aa308
  
https://github.com/Warzone2100/warzone2100/commit/5d199046c8e4ba59e1b1c4b8871c0e2e7c1aa308
  Author: Cyp 
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
M src/action.cpp

  Log Message:
  ---
  Don't spam assertions while artillery is assigned to allied sensors.


  Commit: 313738ed235c69c64c83eb9b987d63efc95d8782
  
https://github.com/Warzone2100/warzone2100/commit/313738ed235c69c64c83eb9b987d63efc95d8782
  Author: Cyp 
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
M src/combat.cpp

  Log Message:
  ---
  Let CB sensors defend allies too.


  Commit: ddb696c28647a9816d26a45d60d7042db4db87c3
  
https://github.com/Warzone2100/warzone2100/commit/ddb696c28647a9816d26a45d60d7042db4db87c3
  Author: automerge 
  Date:   2012-05-24 (Thu, 24 May 2012)

  Ch

[Warzone2100-commits] [Warzone2100/warzone2100] acaf46: Only play ID_SOUND_ARTIFACT_RECOVERED to the playe...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: acaf4620e0f14d50b0c1696e0236ef9e82ca8e6a
  
https://github.com/Warzone2100/warzone2100/commit/acaf4620e0f14d50b0c1696e0236ef9e82ca8e6a
  Author: Cyp 
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Only play ID_SOUND_ARTIFACT_RECOVERED to the player picking up the artefact.

Fixes ticket:3488.


  Commit: 2738fe8ff929fa540f7cd697b798e81cfafd10c1
  
https://github.com/Warzone2100/warzone2100/commit/2738fe8ff929fa540f7cd697b798e81cfafd10c1
  Author: automerge 
  Date:   2012-05-27 (Sun, 27 May 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/ddb696c...2738fe8
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 53ce0a: Make sockets nonblocking as workaround for socket ...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc
  
https://github.com/Warzone2100/warzone2100/commit/53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc
  Author: Cyp 
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
M lib/netplay/netsocket.cpp

  Log Message:
  ---
  Make sockets nonblocking as workaround for socket calls unexpectedly blocking.

For some weird reason, select() sometimes returns that a socket write would not 
block, but the socket write does
block, anyway.

On display in the bottom of a locked manpage for select(), stuck in a disused 
lavatory with a sign on the door
saying "Beware of the Leopard":
BUGS
   Under Linux, select() may report a socket file descriptor as "ready for 
reading", while nevertheless a
   subsequent read blocks. This could for example happen when data has 
arrived but upon examination has wrong
   checksum and is discarded. There may be other circumstances in which a 
file descriptor is spuriously
   reported as ready. Thus it may be safer to use O_NONBLOCK on sockets 
that should not block.

This would explain a socket read unexpectedly blocking, although the issue is 
actually a socket write unexpectedly
blocking.

Fixes ticket:3410, or else.


  Commit: 5ba90fec427096f6016867852ce696126514d378
  
https://github.com/Warzone2100/warzone2100/commit/5ba90fec427096f6016867852ce696126514d378
  Author: Cyp 
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Fix game mechanics bug allowing one truck to claim 10 derricks at once.

Abandoned structures with no cost now slowly deconstruct over a period of one 
minute.


  Commit: b3f3b089f1438bf66fad0e3d4db4447bd2dd6d23
  
https://github.com/Warzone2100/warzone2100/commit/b3f3b089f1438bf66fad0e3d4db4447bd2dd6d23
  Author: vexed 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M src/cmddroid.cpp
M src/game.cpp

  Log Message:
  ---
  Fix commander unit count on loading games.
Add error sound, and text when you can't add any more units to the Commander.

Fixes ticket:3513
Fixes ticket:3062


  Commit: 20f203e7eace960525c173d160ac142d3b2332ed
  
https://github.com/Warzone2100/warzone2100/commit/20f203e7eace960525c173d160ac142d3b2332ed
  Author: vexed 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Add a work around and a assert to help out with the savegame issues described 
in said ticket.
Close ticket #3154


  Commit: 3334b4db16bde9127841f2feb16e0f229300fc48
  
https://github.com/Warzone2100/warzone2100/commit/3334b4db16bde9127841f2feb16e0f229300fc48
  Author: vexed 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M src/cmddroid.cpp

  Log Message:
  ---
  Add missing header for last commit


  Commit: fba03ae82d213be335268677711295a2b8eb48c9
  
https://github.com/Warzone2100/warzone2100/commit/fba03ae82d213be335268677711295a2b8eb48c9
  Author: automerge 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M lib/netplay/netsocket.cpp
M src/cmddroid.cpp
M src/game.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/001f33a...fba03ae
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 53ce0a: Make sockets nonblocking as workaround for socket ...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc
  
https://github.com/Warzone2100/warzone2100/commit/53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc
  Author: Cyp 
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
M lib/netplay/netsocket.cpp

  Log Message:
  ---
  Make sockets nonblocking as workaround for socket calls unexpectedly blocking.

For some weird reason, select() sometimes returns that a socket write would not 
block, but the socket write does
block, anyway.

On display in the bottom of a locked manpage for select(), stuck in a disused 
lavatory with a sign on the door
saying "Beware of the Leopard":
BUGS
   Under Linux, select() may report a socket file descriptor as "ready for 
reading", while nevertheless a
   subsequent read blocks. This could for example happen when data has 
arrived but upon examination has wrong
   checksum and is discarded. There may be other circumstances in which a 
file descriptor is spuriously
   reported as ready. Thus it may be safer to use O_NONBLOCK on sockets 
that should not block.

This would explain a socket read unexpectedly blocking, although the issue is 
actually a socket write unexpectedly
blocking.

Fixes ticket:3410, or else.


  Commit: 5ba90fec427096f6016867852ce696126514d378
  
https://github.com/Warzone2100/warzone2100/commit/5ba90fec427096f6016867852ce696126514d378
  Author: Cyp 
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Fix game mechanics bug allowing one truck to claim 10 derricks at once.

Abandoned structures with no cost now slowly deconstruct over a period of one 
minute.


  Commit: b3f3b089f1438bf66fad0e3d4db4447bd2dd6d23
  
https://github.com/Warzone2100/warzone2100/commit/b3f3b089f1438bf66fad0e3d4db4447bd2dd6d23
  Author: vexed 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M src/cmddroid.cpp
M src/game.cpp

  Log Message:
  ---
  Fix commander unit count on loading games.
Add error sound, and text when you can't add any more units to the Commander.

Fixes ticket:3513
Fixes ticket:3062


  Commit: 20f203e7eace960525c173d160ac142d3b2332ed
  
https://github.com/Warzone2100/warzone2100/commit/20f203e7eace960525c173d160ac142d3b2332ed
  Author: vexed 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Add a work around and a assert to help out with the savegame issues described 
in said ticket.
Close ticket #3154


  Commit: 3334b4db16bde9127841f2feb16e0f229300fc48
  
https://github.com/Warzone2100/warzone2100/commit/3334b4db16bde9127841f2feb16e0f229300fc48
  Author: vexed 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M src/cmddroid.cpp

  Log Message:
  ---
  Add missing header for last commit


  Commit: f996fa0bb430c48e20bfdc624675454cff949d9a
  
https://github.com/Warzone2100/warzone2100/commit/f996fa0bb430c48e20bfdc624675454cff949d9a
  Author: automerge 
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
M lib/netplay/netsocket.cpp
M src/cmddroid.cpp
M src/game.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/2738fe8...f996fa0
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 4079ff: Assert on cyclic research dependencies instead of ...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 4079ff203fe6d5f46eb2cb572e170aa1fdd9f9c8
  
https://github.com/Warzone2100/warzone2100/commit/4079ff203fe6d5f46eb2cb572e170aa1fdd9f9c8
  Author: Cyp 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Assert on cyclic research dependencies instead of doing an infinite loop.

Spurious assertions are possible in the case that the research tree is 
excessively interconnected, such as
researches 31-40 all depending on all of researches 21-30, and researches 21-30 
all depending on all researches
11-20, and so on. Although it probably shouldn't assert on excessively 
interconnected research trees, the loop as
written could take a ridiculously long time, anyway.


  Commit: 113796a9d6a8e34ced9c93bae213ba53b19d5944
  
https://github.com/Warzone2100/warzone2100/commit/113796a9d6a8e34ced9c93bae213ba53b19d5944
  Author: cybersphinx 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3512.


  Commit: b6c77bd603e134d18eeb30e7d01fe9f2eff9c30b
  
https://github.com/Warzone2100/warzone2100/commit/b6c77bd603e134d18eeb30e7d01fe9f2eff9c30b
  Author: cybersphinx 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Update translations.


  Commit: 2228e801981d73c35be9c483ab19bff141d48b65
  
https://github.com/Warzone2100/warzone2100/commit/2228e801981d73c35be9c483ab19bff141d48b65
  Author: cybersphinx 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M po/generate-statistics-html.py

  Log Message:
  ---
  Increase precision of sorting in generate-statistics-html.py.

Fix by Emdek, closes #3519.

Also remove unneeded "import os".


  Commit: e0939a02175e56f8a0f1468286f0cbd039053174
  
https://github.com/Warzone2100/warzone2100/commit/e0939a02175e56f8a0f1468286f0cbd039053174
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix some weird code that partly relied on sockets being blocking.

Exposed in 53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc.


  Commit: bf2483cbd7430bd81457a6931c1e526828c7d18a
  
https://github.com/Warzone2100/warzone2100/commit/bf2483cbd7430bd81457a6931c1e526828c7d18a
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Don't use bsocket and tcp_socket at the same time.

Somehow fixes a client crash when failing to join a game. Possibly caused by 
deleting one of bsocket or tcp_socket,
and then using the other.


  Commit: 4d658c9157dbbef19ee7f161ae85bb96322fbee9
  
https://github.com/Warzone2100/warzone2100/commit/4d658c9157dbbef19ee7f161ae85bb96322fbee9
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Don't continue to wait for a NET_ACCEPTED after processing a NET_REJECTED.

Don't wait for a NET_ACCEPTED after the socket is broken, either.


  Commit: 7a0cd2eccfe733215ee43cab28243d7f29918b75
  
https://github.com/Warzone2100/warzone2100/commit/7a0cd2eccfe733215ee43cab28243d7f29918b75
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix host crash on failure in NET_CreatePlayer().

NET_CreatePlayer() should not be able to fail here, though. See following 
commit.

Crash was due to treating ERROR_FULL == 2 as an uint8_t pointer, and trying to 
dereference it.


  Commit: 7816f9f57a8ac8d213a8a2cc239bef43409db048
  
https://github.com/Warzone2100/warzone2100/commit/7816f9f57a8ac8d213a8a2cc239bef43409db048
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix joining games with some closed slots.

Although it no longer crashed when trying to join a game with some closed slots 
(see previous commits), it is also
desirable to actually be able to join it.


  Commit: 803e9b27a440568612e889dabea6eb186a90da44
  
https://github.com/Warzone2100/warzone2100/commit/803e9b27a440568612e889dabea6eb186a90da44
  Author: automerge 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de

[Warzone2100-commits] [Warzone2100/warzone2100] 4079ff: Assert on cyclic research dependencies instead of ...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 4079ff203fe6d5f46eb2cb572e170aa1fdd9f9c8
  
https://github.com/Warzone2100/warzone2100/commit/4079ff203fe6d5f46eb2cb572e170aa1fdd9f9c8
  Author: Cyp 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Assert on cyclic research dependencies instead of doing an infinite loop.

Spurious assertions are possible in the case that the research tree is 
excessively interconnected, such as
researches 31-40 all depending on all of researches 21-30, and researches 21-30 
all depending on all researches
11-20, and so on. Although it probably shouldn't assert on excessively 
interconnected research trees, the loop as
written could take a ridiculously long time, anyway.


  Commit: 113796a9d6a8e34ced9c93bae213ba53b19d5944
  
https://github.com/Warzone2100/warzone2100/commit/113796a9d6a8e34ced9c93bae213ba53b19d5944
  Author: cybersphinx 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3512.


  Commit: b6c77bd603e134d18eeb30e7d01fe9f2eff9c30b
  
https://github.com/Warzone2100/warzone2100/commit/b6c77bd603e134d18eeb30e7d01fe9f2eff9c30b
  Author: cybersphinx 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Update translations.


  Commit: 2228e801981d73c35be9c483ab19bff141d48b65
  
https://github.com/Warzone2100/warzone2100/commit/2228e801981d73c35be9c483ab19bff141d48b65
  Author: cybersphinx 
  Date:   2012-06-02 (Sat, 02 Jun 2012)

  Changed paths:
M po/generate-statistics-html.py

  Log Message:
  ---
  Increase precision of sorting in generate-statistics-html.py.

Fix by Emdek, closes #3519.

Also remove unneeded "import os".


  Commit: e0939a02175e56f8a0f1468286f0cbd039053174
  
https://github.com/Warzone2100/warzone2100/commit/e0939a02175e56f8a0f1468286f0cbd039053174
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix some weird code that partly relied on sockets being blocking.

Exposed in 53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc.


  Commit: bf2483cbd7430bd81457a6931c1e526828c7d18a
  
https://github.com/Warzone2100/warzone2100/commit/bf2483cbd7430bd81457a6931c1e526828c7d18a
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Don't use bsocket and tcp_socket at the same time.

Somehow fixes a client crash when failing to join a game. Possibly caused by 
deleting one of bsocket or tcp_socket,
and then using the other.


  Commit: 4d658c9157dbbef19ee7f161ae85bb96322fbee9
  
https://github.com/Warzone2100/warzone2100/commit/4d658c9157dbbef19ee7f161ae85bb96322fbee9
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Don't continue to wait for a NET_ACCEPTED after processing a NET_REJECTED.

Don't wait for a NET_ACCEPTED after the socket is broken, either.


  Commit: 7a0cd2eccfe733215ee43cab28243d7f29918b75
  
https://github.com/Warzone2100/warzone2100/commit/7a0cd2eccfe733215ee43cab28243d7f29918b75
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix host crash on failure in NET_CreatePlayer().

NET_CreatePlayer() should not be able to fail here, though. See following 
commit.

Crash was due to treating ERROR_FULL == 2 as an uint8_t pointer, and trying to 
dereference it.


  Commit: 7816f9f57a8ac8d213a8a2cc239bef43409db048
  
https://github.com/Warzone2100/warzone2100/commit/7816f9f57a8ac8d213a8a2cc239bef43409db048
  Author: Cyp 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix joining games with some closed slots.

Although it no longer crashed when trying to join a game with some closed slots 
(see previous commits), it is also
desirable to actually be able to join it.


  Commit: 49d60d4b6316e8839e548444ef8d90f9dc73c889
  
https://github.com/Warzone2100/warzone2100/commit/49d60d4b6316e8839e548444ef8d90f9dc73c889
  Author: automerge 
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de

[Warzone2100-commits] [Warzone2100/warzone2100] 58551b: Do not return client broadcast messages to the sen...

[automerge]

  M src/action.cpp
M src/structure.cpp
M src/visibility.cpp

  Log Message:
  ---
  Fix CB fire against mobile targets.

Steps to reproduce:
1) Player A builds a CB sensor.
2) Player B attacks the CB sensor with a mortar borg.
3) Player B runs away with the mortar borg where player A can't see.
4) Player A builds artillery.
5) Player B slowly kills off all the artillery with an MG viper wheels tank, 
while the artillery just sits there
   pointing at the mortar borg without firing.

To trigger, the artillery must be built after the last CB sensor in range of 
where the mortar borg attacks. Any
type of mobile artillery can trigger the bug, such as archangel leopard tracks, 
or MRA dragon wheels.

Workaround: Player A can build an uplink, so that the mortar borg becomes 
visible, and the artillery fires. If
  there's still anything left of the artillery by the time the uplink is 
built, that is.

Fixes ticket:3529.


  Commit: c94112b6b33439157cc04e29a33676d9af07263e
  
https://github.com/Warzone2100/warzone2100/commit/c94112b6b33439157cc04e29a33676d9af07263e
  Author: Cyp 
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
M tools/image/.gitignore

  Log Message:
  ---
  Fix .gitignore.

The tools/image/image in .gitignore was mysteriously changed to be a directory 
only in
c346e9ebb6abafc9be31325ce3b2ce1c2f42227a, and the file therefore fails to be 
ignored.


  Commit: 62153e972fc7c6516f997c8182b1328cfd8dd990
  
https://github.com/Warzone2100/warzone2100/commit/62153e972fc7c6516f997c8182b1328cfd8dd990
  Author: safety0ff 
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
M lib/ivis_opengl/screen.cpp

  Log Message:
  ---
  Fix taking screenshots whose width is not congruent to 0 mod 4.

Closes #3537.


  Commit: 75041d82eac86a90437e497f7d44427ac0ba0e19
  
https://github.com/Warzone2100/warzone2100/commit/75041d82eac86a90437e497f7d44427ac0ba0e19
  Author: dak180 
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
M tests/configs/modeltest-All.xcconfig

  Log Message:
  ---
  Do not bother looking for things that might not exist.


  Commit: 64951d6f128c6a3db01b1705a462f4f632bcf2af
  
https://github.com/Warzone2100/warzone2100/commit/64951d6f128c6a3db01b1705a462f4f632bcf2af
  Author: dak180 
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
M tests/configs/scripts/jslist.sh
M tests/configs/scripts/maplist.sh
M tests/configs/scripts/modellist.sh

  Log Message:
  ---
  Try to only show issues in the test outputs.


  Commit: 7107400b2b3b5761b96fa97fffddcb8a2383a77a
  
https://github.com/Warzone2100/warzone2100/commit/7107400b2b3b5761b96fa97fffddcb8a2383a77a
  Author: automerge 
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
M data/base/palette.txt
M lib/gamelib/gtime.cpp
M lib/ivis_opengl/piepalette.h
M lib/ivis_opengl/screen.cpp
M lib/netplay/netplay.cpp
M lib/netplay/nettypes.cpp
M lib/netplay/nettypes.h
M src/action.cpp
M src/display.cpp
M src/droid.cpp
M src/droid.h
M src/game.cpp
M src/hci.cpp
M src/multijoin.cpp
M src/structure.cpp
M src/visibility.cpp
M tests/Tests.xcodeproj/project.pbxproj
M tests/configs/modeltest-All.xcconfig
M tests/configs/scripts/jslist.sh
M tests/configs/scripts/maplist.sh
M tests/configs/scripts/modellist.sh
M tools/image/.gitignore
A tools/image/Image.xcodeproj/project.pbxproj
A tools/image/configs/Base-Image.xcconfig
A tools/image/configs/Project-All.xcconfig
A tools/image/configs/image-All.xcconfig
A tools/image/configs/image-Debug.xcconfig
A tools/image/configs/image-Release.xcconfig
A tools/image/configs/image-StaticAnalyzer.xcconfig
M tools/image/image.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/803e9b2...7107400
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 7e18c2: Update COPYING.NONGPL.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 7e18c2a58a4c73941f4fdd6aba238e162f81f641
  
https://github.com/Warzone2100/warzone2100/commit/7e18c2a58a4c73941f4fdd6aba238e162f81f641
  Author: cybersphinx 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M COPYING.NONGPL

  Log Message:
  ---
  Update COPYING.NONGPL.

Closes #3533, refs #3534.


  Commit: d51cea925ba706b58b14ff66dd32f2ce133c1baa
  
https://github.com/Warzone2100/warzone2100/commit/d51cea925ba706b58b14ff66dd32f2ce133c1baa
  Author: cybersphinx 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.


  Commit: aca180e0e860f42206bc9be21d9e7a65638afbec
  
https://github.com/Warzone2100/warzone2100/commit/aca180e0e860f42206bc9be21d9e7a65638afbec
  Author: Christian Ohm 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M COPYING.NONGPL
M data/base/texpages/page-25-sky-urban.png

  Log Message:
  ---
  New skybox for urban maps.

Closes #3534.


  Commit: c7e72b30e917459d15da0f9e2bda2ac23c16ab36
  
https://github.com/Warzone2100/warzone2100/commit/c7e72b30e917459d15da0f9e2bda2ac23c16ab36
  Author: safety0ff 
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piematrix.h
M src/display3d.cpp

  Log Message:
  ---
  Make sure we pop our matrix when returning from rendering functions in 
exceptional circumstances.


  Commit: 3928607fd9188f5147de396437a7367594949c33
  
https://github.com/Warzone2100/warzone2100/commit/3928607fd9188f5147de396437a7367594949c33
  Author: automerge 
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
M COPYING.NONGPL
M ChangeLog
M data/base/texpages/page-25-sky-urban.png
M lib/ivis_opengl/piematrix.h
M src/display3d.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/d227d3a...3928607
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] ea7b19: Balance changes by NoQ.

[automerge]

ata/base/texpages/tertilesc3hw-16/tile-46.png
M data/base/texpages/tertilesc3hw-16/tile-54.png
M data/base/texpages/tertilesc3hw-16/tile-61.png
M data/base/texpages/tertilesc3hw-16/tile-63.png
M data/base/texpages/tertilesc3hw-16/tile-68.png
M data/base/texpages/tertilesc3hw-16/tile-69.png
M data/base/texpages/tertilesc3hw-16/tile-71.png
M data/base/texpages/tertilesc3hw-16/tile-76.png
M data/base/texpages/tertilesc3hw-16/tile-77.png
M data/base/texpages/tertilesc3hw-16/tile-78.png
M data/base/texpages/tertilesc3hw-32/tile-09.png
M data/base/texpages/tertilesc3hw-32/tile-18.png
M data/base/texpages/tertilesc3hw-32/tile-29.png
M data/base/texpages/tertilesc3hw-32/tile-30.png
M data/base/texpages/tertilesc3hw-32/tile-42.png
M data/base/texpages/tertilesc3hw-32/tile-44.png
M data/base/texpages/tertilesc3hw-32/tile-45.png
M data/base/texpages/tertilesc3hw-32/tile-46.png
M data/base/texpages/tertilesc3hw-32/tile-54.png
M data/base/texpages/tertilesc3hw-32/tile-61.png
M data/base/texpages/tertilesc3hw-32/tile-63.png
M data/base/texpages/tertilesc3hw-32/tile-68.png
M data/base/texpages/tertilesc3hw-32/tile-69.png
M data/base/texpages/tertilesc3hw-32/tile-71.png
M data/base/texpages/tertilesc3hw-32/tile-76.png
M data/base/texpages/tertilesc3hw-32/tile-77.png
M data/base/texpages/tertilesc3hw-32/tile-78.png
M data/base/texpages/tertilesc3hw-64/tile-09.png
M data/base/texpages/tertilesc3hw-64/tile-18.png
M data/base/texpages/tertilesc3hw-64/tile-29.png
M data/base/texpages/tertilesc3hw-64/tile-30.png
M data/base/texpages/tertilesc3hw-64/tile-42.png
M data/base/texpages/tertilesc3hw-64/tile-44.png
M data/base/texpages/tertilesc3hw-64/tile-45.png
M data/base/texpages/tertilesc3hw-64/tile-46.png
M data/base/texpages/tertilesc3hw-64/tile-54.png
M data/base/texpages/tertilesc3hw-64/tile-61.png
M data/base/texpages/tertilesc3hw-64/tile-63.png
M data/base/texpages/tertilesc3hw-64/tile-68.png
M data/base/texpages/tertilesc3hw-64/tile-69.png
M data/base/texpages/tertilesc3hw-64/tile-71.png
M data/base/texpages/tertilesc3hw-64/tile-76.png
M data/base/texpages/tertilesc3hw-64/tile-77.png
M data/base/texpages/tertilesc3hw-64/tile-78.png
M data/base/tileset/arizona_enum.txt
M data/base/tileset/arizonadecals.txt
M data/base/tileset/arizonaground.txt
M data/base/tileset/rockiedecals.txt
M data/base/tileset/tertilesc1hwGtype.txt
M data/base/tileset/tertilesc3hwGtype.txt
M data/base/tileset/urbandecals.txt
M data/base/wrf/vidmem.wrf
M data/mp/wrf/vidmem.wrf

  Log Message:
  ---
  Texture changes by several people.

Cliff decals by Jorzi, sand support by Mysteryem, new rocky ground texture by 
MaNGusT, minor tweaks by NoQ.

Cliffs should now be visible.


  Commit: 74d8086132a3f847ea13b88254096fe68a30474b
  
https://github.com/Warzone2100/warzone2100/commit/74d8086132a3f847ea13b88254096fe68a30474b
  Author: Cyp 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M src/combat.cpp

  Log Message:
  ---
  Always reload weapons when bar is full.

Weapons would only reload if completely empty. If not completely empty, the 
reloading bar was meaningless.


  Commit: 7e18c2a58a4c73941f4fdd6aba238e162f81f641
  
https://github.com/Warzone2100/warzone2100/commit/7e18c2a58a4c73941f4fdd6aba238e162f81f641
  Author: cybersphinx 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M COPYING.NONGPL

  Log Message:
  ---
  Update COPYING.NONGPL.

Closes #3533, refs #3534.


  Commit: d51cea925ba706b58b14ff66dd32f2ce133c1baa
  
https://github.com/Warzone2100/warzone2100/commit/d51cea925ba706b58b14ff66dd32f2ce133c1baa
  Author: cybersphinx 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.


  Commit: aca180e0e860f42206bc9be21d9e7a65638afbec
  
https://github.com/Warzone2100/warzone2100/commit/aca180e0e860f42206bc9be21d9e7a65638afbec
  Author: Christian Ohm 
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
M COPYING.NONGPL
M data/base/texpages/page-25-sky-urban.png

  Log Message:
  ---
  New skybox for urban maps.

Closes #3534.


  Commit: c7e72b30e917459d15da0f9e2bda2ac23c16ab36
  
https://github.com/Warzone2100/warzone2100/commit/c7e72b30e917459d15da0f9e2bda2ac23c16ab36
  Author: safety0ff 
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piematrix.h
M src/display3d.cpp

  Log Message:
  ---
  Make sure we pop our matrix when returning from rendering functions in 
exceptional circumstances.


  Commit: d42095db7b4eaf430d4c1c8a0331d6f9271f11fc
      
https://github.com/Warzone2100/warzone2100/commit/d42095db7b4eaf430d4c1c8a0331d6f9271f11fc
  Author: automerge 
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
M COPYING.NONGPL
M Cha

[Warzone2100-commits] [Warzone2100/warzone2100] d11516: Fix fpathBlockingTile() usage in moveGetObstacleVe...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: d11516795a7d98a6bcf0cdeafe159435108344a4
  
https://github.com/Warzone2100/warzone2100/commit/d11516795a7d98a6bcf0cdeafe159435108344a4
  Author: Cyp 
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
M src/move.cpp

  Log Message:
  ---
  Fix fpathBlockingTile() usage in moveGetObstacleVector().


  Commit: 57a56f21c372e268a645e6312b3f1c5a95a98000
  
https://github.com/Warzone2100/warzone2100/commit/57a56f21c372e268a645e6312b3f1c5a95a98000
  Author: Cyp 
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
M src/astar.cpp

  Log Message:
  ---
  Don't put pathfinding points very close to blocking tiles.


  Commit: f7c6e38aa8e06051c6ac6e42ab9bbaf1b760c9e8
  
https://github.com/Warzone2100/warzone2100/commit/f7c6e38aa8e06051c6ac6e42ab9bbaf1b760c9e8
  Author: Cyp 
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
M src/move.cpp

  Log Message:
  ---
  Do not give up following a path due to the droid being on a blocking tile.

If the droid is on a blocking tile, repeatedly redoing pathfinding will not 
result in a path which does not
originate on said blocking tile.


  Commit: f54eb00d7044827e011bd3261108bfd446f6a68e
  
https://github.com/Warzone2100/warzone2100/commit/f54eb00d7044827e011bd3261108bfd446f6a68e
  Author: Cyp 
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piestate.cpp

  Log Message:
  ---
  Add extra deprecated feature check in the obsolete driver workaround function.


  Commit: 86c4b9a37ebdbd2040f6a71380a22e7f1ad66991
  
https://github.com/Warzone2100/warzone2100/commit/86c4b9a37ebdbd2040f6a71380a22e7f1ad66991
  Author: Cyp 
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
M lib/ivis_opengl/screen.cpp

  Log Message:
  ---
  Print all OpenGL extensions with --debug=3d, not just what fits on one line.


  Commit: ff09d24f6198e98799f77a1c3f7e873c08d9fd02
  
https://github.com/Warzone2100/warzone2100/commit/ff09d24f6198e98799f77a1c3f7e873c08d9fd02
  Author: Cyp 
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
M lib/ivis_opengl/screen.cpp

  Log Message:
  ---
  Add #include.

Buildbot apparently wasn't happy.


  Commit: e971ebbf1cce31b3b7e4e14479ed23b235824254
  
https://github.com/Warzone2100/warzone2100/commit/e971ebbf1cce31b3b7e4e14479ed23b235824254
  Author: dak180 
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Update Png to 1.5.11.


  Commit: dd8025d10853fe775ef37c0c632647086752b4d9
  
https://github.com/Warzone2100/warzone2100/commit/dd8025d10853fe775ef37c0c632647086752b4d9
  Author: safety0ff 
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
M src/display3d.cpp

  Log Message:
  ---
  Fix on-screen droid radius calculation and placement of group/cmndr numbers, 
rank, etc

Closes #3547.


  Commit: 8b8282cc1f9bbddd6c48cef4dbf1681b84160129
  
https://github.com/Warzone2100/warzone2100/commit/8b8282cc1f9bbddd6c48cef4dbf1681b84160129
  Author: Cyp 
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
M lib/ivis_opengl/screen.cpp

  Log Message:
  ---
  Change OpenGL 1.4+VBO check to OpenGL 1.2+VBO+TEC check for testing.


  Commit: ce72663915cbd87495eb60d5d1cb2d888735f774
  
https://github.com/Warzone2100/warzone2100/commit/ce72663915cbd87495eb60d5d1cb2d888735f774
  Author: automerge 
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/screen.cpp
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/fetchscripts/Png-FetchSource.sh
M src/astar.cpp
M src/display3d.cpp
M src/move.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/7c451d54485b...ce72663915cb
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] e636d4: Use Berg's animated factory (GPL).

[automerge]

ne2100/commit/4a1aec1c57adedd57c757fb06df91dfecfe071dc
  Author: Cyp 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M data/mp/addon.lev

  Log Message:
  ---
  Swap Rush-T[23] map with 4c-Rush2-T[23] map, such that the map order does not 
depend on tech level.


  Commit: 474216b781e1b5f418585a073cb693dafdc777dd
  
https://github.com/Warzone2100/warzone2100/commit/474216b781e1b5f418585a073cb693dafdc777dd
  Author: Cyp 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M lib/framework/crc.cpp
M lib/framework/crc.h

  Log Message:
  ---
  Add SHA-256 implementation.


  Commit: 7867b7abe209613da26ae36897ac864eaee73a14
  
https://github.com/Warzone2100/warzone2100/commit/7867b7abe209613da26ae36897ac864eaee73a14
  Author: Cyp 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/screen.cpp

  Log Message:
  ---
  In fallback, try to use glBlendColorEXT if glBlendColor is not present.


  Commit: d9aab02307d326caf7d42e54f4d8ef19d75b09ce
  
https://github.com/Warzone2100/warzone2100/commit/d9aab02307d326caf7d42e54f4d8ef19d75b09ce
  Author: dak180 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M Makefile.am

  Log Message:
  ---
  Add tools/image to the tarballs.

Closes #3528.


  Commit: da433789c3e272c9c22307b6e74eeb81b2925e07
  
https://github.com/Warzone2100/warzone2100/commit/da433789c3e272c9c22307b6e74eeb81b2925e07
  Author: safety0ff 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M data/base/structs/blcfact1.pie

  Log Message:
  ---
  Use Berg's animated cyborg factory (GPL.)


  Commit: b35afbf9d34ef33980888af3803cbc29bb05497a
  
https://github.com/Warzone2100/warzone2100/commit/b35afbf9d34ef33980888af3803cbc29bb05497a
  Author: safety0ff 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piemode.cpp

  Log Message:
  ---
  Determine which stencil functions and enums to use once instead of each frame.


  Commit: 9d428d553e271f834a848776b296b62ba321e754
  
https://github.com/Warzone2100/warzone2100/commit/9d428d553e271f834a848776b296b62ba321e754
  Author: safety0ff 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M doc/gl/wzgl.ods

  Log Message:
  ---
  Add some enums that were missed and update the functions for a newly used 
function.


  Commit: 2e72860fb1c666f9950350d0bdd5238315c4ea1c
  
https://github.com/Warzone2100/warzone2100/commit/2e72860fb1c666f9950350d0bdd5238315c4ea1c
  Author: dak180 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M Makefile.am

  Log Message:
  ---
  Be somewhat less unaimed in putting the image tool in the tarball.


  Commit: 02395b3f02589a7a908cb7cddfaaf5248fdd8d23
  
https://github.com/Warzone2100/warzone2100/commit/02395b3f02589a7a908cb7cddfaaf5248fdd8d23
  Author: automerge 
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
M Makefile.am
M data/base/structs/blcfact1.pie
M data/base/structs/blfact0.pie
M data/base/structs/blfact1.pie
M data/base/structs/blfact2.pie
M data/base/texpages/page-11-player-buildings.png
M data/base/texpages/page-11_tcmask.png
M data/base/texpages/page-12-player-buildings.png
M data/base/texpages/page-12_tcmask.png
M data/base/texpages/page-13-player-buildings.png
M data/base/texpages/page-13_tcmask.png
M data/base/texpages/page-14-droid-hubs.png
M data/base/texpages/page-14_tcmask.png
M data/base/texpages/page-17-droid-weapons.png
M data/base/texpages/page-17_tcmask.png
M data/mp/addon.lev
M doc/gl/wzgl.ods
M lib/framework/crc.cpp
M lib/framework/crc.h
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piemode.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/screen.cpp
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M src/function.cpp
M src/game.cpp
M src/qtscriptfuncs.cpp
M src/qtscriptfuncs.h
M src/structure.cpp
M tools/map/Makefile.am

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/2ccf4e04f51b...02395b3f0258
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 3640b0: Let's not hide error messages, and add more debugg...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 3640b024f28b0fc264e2d33ea516687fc41ffccc
  
https://github.com/Warzone2100/warzone2100/commit/3640b024f28b0fc264e2d33ea516687fc41ffccc
  Author: vexed 
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
M lib/framework/debug.cpp
M src/game.cpp
M src/levels.cpp
M src/main.cpp
M src/mission.cpp

  Log Message:
  ---
  Let's not hide error messages, and add more debugging to track down a few
issues


  Commit: 845903e5b60292d2a15a2f442120122ea1ff90e7
  
https://github.com/Warzone2100/warzone2100/commit/845903e5b60292d2a15a2f442120122ea1ff90e7
  Author: vexed 
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp
M src/multiopt.cpp
M src/multiplay.cpp

  Log Message:
  ---
  And even more log spam to help track down current issues.


  Commit: 64a3cc13deda9a59aae2cf0705c68dbe3eadeaa8
  
https://github.com/Warzone2100/warzone2100/commit/64a3cc13deda9a59aae2cf0705c68dbe3eadeaa8
  Author: safety0ff 
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
M lib/ivis_opengl/screen.cpp

  Log Message:
  ---
  Don't require texture_env_crossbar for shaders.

Refs. #3575.


  Commit: 7e3be754d4daddd771de1e115ed6845652300638
  
https://github.com/Warzone2100/warzone2100/commit/7e3be754d4daddd771de1e115ed6845652300638
  Author: safety0ff 
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M src/frontend.cpp
M src/main.cpp
M src/warzoneconfig.h

  Log Message:
  ---
  Add settings / UI support for shaders without tex_env_crossbar (added in 
64a3cc1).


  Commit: ef2b23681b2840478a4203b8bd3a75b8882bd9f0
  
https://github.com/Warzone2100/warzone2100/commit/ef2b23681b2840478a4203b8bd3a75b8882bd9f0
  Author: safety0ff 
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
M src/main.cpp

  Log Message:
  ---
  Always initialize shader usage setting.


  Commit: 59cb28115cb888fa79d70b90ebcf981cc022c2cc
  
https://github.com/Warzone2100/warzone2100/commit/59cb28115cb888fa79d70b90ebcf981cc022c2cc
  Author: automerge 
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
M lib/framework/debug.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M lib/netplay/netplay.cpp
M src/frontend.cpp
M src/game.cpp
M src/levels.cpp
M src/main.cpp
M src/mission.cpp
M src/multiint.cpp
M src/multiopt.cpp
M src/multiplay.cpp
M src/warzoneconfig.h

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/40fcab0f6c47...59cb28115cb8
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] ab44ea: Bump MAX_TERRAIN_TILES from 100 to 512.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: ab44eafb7bd1daa2d0f4efe367673b4c2985a05d
  
https://github.com/Warzone2100/warzone2100/commit/ab44eafb7bd1daa2d0f4efe367673b4c2985a05d
  Author: Cyp 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M src/map.cpp

  Log Message:
  ---
  Bump MAX_TERRAIN_TILES from 100 to 512.


  Commit: 0cec33c0fceeb65fac3c26412a3d2d3667c04886
  
https://github.com/Warzone2100/warzone2100/commit/0cec33c0fceeb65fac3c26412a3d2d3667c04886
  Author: cybersphinx 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M po/pl.po

  Log Message:
  ---
  Polish translation update by Emdek.

Closes #1347.


  Commit: 44c810bc73ca8f17bdbf8fc28bcbae8ec81233ab
  
https://github.com/Warzone2100/warzone2100/commit/44c810bc73ca8f17bdbf8fc28bcbae8ec81233ab
  Author: cybersphinx 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M po/de.po

  Log Message:
  ---
  German translation update by Kreuvf.

Closes #3564.


  Commit: 875be5fda1b9ecf4aae3ece1fa5639904f3c06ab
  
https://github.com/Warzone2100/warzone2100/commit/875be5fda1b9ecf4aae3ece1fa5639904f3c06ab
  Author: cybersphinx 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3577.


  Commit: 3b261c24d2dfe39eae6f51f3a4827bc3b67e927f
  
https://github.com/Warzone2100/warzone2100/commit/3b261c24d2dfe39eae6f51f3a4827bc3b67e927f
  Author: cybersphinx 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M po/ca_ES.po

  Log Message:
  ---
  Catalan translation update by mecatxis.

Closes #3582.


  Commit: da43686ad35b33850a97ffcb8023c60e5ff55f83
  
https://github.com/Warzone2100/warzone2100/commit/da43686ad35b33850a97ffcb8023c60e5ff55f83
  Author: cybersphinx 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M po/tr.po

  Log Message:
  ---
  Turkish translation update by Ayhan Görgülü.

Closes #3591.


  Commit: 0800da0d25d1b6e509b84435ec80cda176e046c0
  
https://github.com/Warzone2100/warzone2100/commit/0800da0d25d1b6e509b84435ec80cda176e046c0
  Author: cybersphinx 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M icons/warzone2100.desktop

  Log Message:
  ---
  Update custom translations.


  Commit: e370f0f707edfaea8027c9b20e9c97426914e784
  
https://github.com/Warzone2100/warzone2100/commit/e370f0f707edfaea8027c9b20e9c97426914e784
  Author: automerge 
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
M icons/warzone2100.desktop
M po/ca_ES.po
M po/de.po
M po/fr.po
M po/pl.po
M po/tr.po
M src/map.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/aeeec83bd76b...e370f0f707ed
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 64173c: Fix reverse balanced tree lookup

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 64173cbd0826a67dafb9293c9bc2ac3bdf44ff73
  
https://github.com/Warzone2100/warzone2100/commit/64173cbd0826a67dafb9293c9bc2ac3bdf44ff73
  Author: Linus Lüssing 
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
M lib/framework/treap.cpp

  Log Message:
  ---
  Fix reverse balanced tree lookup

"Rechts ist da, wo der Daumen links ist."

Fixes ticket:3589.

Signed-off-by: Linus Lüssing 


  Commit: d2a8a134a6c3a08d20e461425a9714ab52ee78b8
  
https://github.com/Warzone2100/warzone2100/commit/d2a8a134a6c3a08d20e461425a9714ab52ee78b8
  Author: dak180 
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Update png to 1.5.12.


  Commit: 0b4745d4e6328dec49e817beb0966715053f5704
  
https://github.com/Warzone2100/warzone2100/commit/0b4745d4e6328dec49e817beb0966715053f5704
  Author: automerge 
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
M lib/framework/treap.cpp
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/ed671bb6f426...0b4745d4e632
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 64173c: Fix reverse balanced tree lookup

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 64173cbd0826a67dafb9293c9bc2ac3bdf44ff73
  
https://github.com/Warzone2100/warzone2100/commit/64173cbd0826a67dafb9293c9bc2ac3bdf44ff73
  Author: Linus Lüssing 
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
M lib/framework/treap.cpp

  Log Message:
  ---
  Fix reverse balanced tree lookup

"Rechts ist da, wo der Daumen links ist."

Fixes ticket:3589.

Signed-off-by: Linus Lüssing 


  Commit: d2a8a134a6c3a08d20e461425a9714ab52ee78b8
  
https://github.com/Warzone2100/warzone2100/commit/d2a8a134a6c3a08d20e461425a9714ab52ee78b8
  Author: dak180 
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Update png to 1.5.12.


  Commit: aa676c18bbf496fd62485c1b9cf9d8b9eeae87b3
  
https://github.com/Warzone2100/warzone2100/commit/aa676c18bbf496fd62485c1b9cf9d8b9eeae87b3
  Author: automerge 
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
M lib/framework/treap.cpp
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/e370f0f707ed...aa676c18bbf4
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 0bfee1: Fix reported [-Werror=format] issue.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 0bfee185a38c1a354c14b33a064d13d81a03962f
  
https://github.com/Warzone2100/warzone2100/commit/0bfee185a38c1a354c14b33a064d13d81a03962f
  Author: vexed 
  Date:   2012-07-15 (Sun, 15 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix reported [-Werror=format] issue.


  Commit: bb76dbc141027b942cbc00c456e6689a1abb6ec5
  
https://github.com/Warzone2100/warzone2100/commit/bb76dbc141027b942cbc00c456e6689a1abb6ec5
  Author: automerge 
  Date:   2012-07-15 (Sun, 15 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/650229d90537...bb76dbc14102
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 329572: Add last part of net patch (needs updated server c...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 329572779ae2e383b6bd668078ee4ecffe173dc4
  
https://github.com/Warzone2100/warzone2100/commit/329572779ae2e383b6bd668078ee4ecffe173dc4
  Author: vexed 
  Date:   2012-07-15 (Sun, 15 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multiint.cpp

  Log Message:
  ---
  Add last part of net patch (needs updated server code).


  Commit: 646f6d7b8248dedb5686d86199519d4e75a30493
  
https://github.com/Warzone2100/warzone2100/commit/646f6d7b8248dedb5686d86199519d4e75a30493
  Author: vexed 
  Date:   2012-07-15 (Sun, 15 Jul 2012)

  Changed paths:
A data/mp/multiplay/skirmish/nullbot-ge.inc.js
A data/mp/multiplay/skirmish/nullbot-head.inc.js
A data/mp/multiplay/skirmish/nullbot-tail.inc.js
A data/mp/multiplay/skirmish/nullbot.ai
A data/mp/multiplay/skirmish/nullbot.js

  Log Message:
  ---
  NullBot by NoQ


  Commit: 0bfee185a38c1a354c14b33a064d13d81a03962f
  
https://github.com/Warzone2100/warzone2100/commit/0bfee185a38c1a354c14b33a064d13d81a03962f
  Author: vexed 
  Date:   2012-07-15 (Sun, 15 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Fix reported [-Werror=format] issue.


  Commit: 865588631dbaf922befa2ca7b42f6e3010a68a5b
  
https://github.com/Warzone2100/warzone2100/commit/865588631dbaf922befa2ca7b42f6e3010a68a5b
  Author: automerge 
  Date:   2012-07-15 (Sun, 15 Jul 2012)

  Changed paths:
A data/mp/multiplay/skirmish/nullbot-ge.inc.js
A data/mp/multiplay/skirmish/nullbot-head.inc.js
A data/mp/multiplay/skirmish/nullbot-tail.inc.js
A data/mp/multiplay/skirmish/nullbot.ai
A data/mp/multiplay/skirmish/nullbot.js
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multiint.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/aa676c18bbf4...865588631dba
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 62c8c7: Update glew to 1.8.0.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 62c8c727dc1919c35c7f20cc3dc262f9170572f0
  
https://github.com/Warzone2100/warzone2100/commit/62c8c727dc1919c35c7f20cc3dc262f9170572f0
  Author: dak180 
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
M macosx/configs/fetchscripts/GLExtensionWrangler-FetchSource.sh

  Log Message:
  ---
  Update glew to 1.8.0.


  Commit: 95677b02b9959b05372e7dc10286fe184bfd6cdd
  
https://github.com/Warzone2100/warzone2100/commit/95677b02b9959b05372e7dc10286fe184bfd6cdd
  Author: Per Inge Mathisen 
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Fix reading of scavenger parameter in challenge files. Reported by KukY, 
closes ticket:3630


  Commit: ee95d785bdfd72a490863d7cdb3f504f88f9eecd
  
https://github.com/Warzone2100/warzone2100/commit/ee95d785bdfd72a490863d7cdb3f504f88f9eecd
  Author: Cyp 
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Don't rename AI players.

With multiple AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, 
Nexus_3, or similar.


  Commit: 348f53756c2036507a40aad85f59ba47bcd62c10
  
https://github.com/Warzone2100/warzone2100/commit/348f53756c2036507a40aad85f59ba47bcd62c10
  Author: automerge 
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M macosx/configs/fetchscripts/GLExtensionWrangler-FetchSource.sh
M src/multiint.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/bb76dbc14102...348f53756c20
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 62c8c7: Update glew to 1.8.0.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 62c8c727dc1919c35c7f20cc3dc262f9170572f0
  
https://github.com/Warzone2100/warzone2100/commit/62c8c727dc1919c35c7f20cc3dc262f9170572f0
  Author: dak180 
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
M macosx/configs/fetchscripts/GLExtensionWrangler-FetchSource.sh

  Log Message:
  ---
  Update glew to 1.8.0.


  Commit: 95677b02b9959b05372e7dc10286fe184bfd6cdd
  
https://github.com/Warzone2100/warzone2100/commit/95677b02b9959b05372e7dc10286fe184bfd6cdd
  Author: Per Inge Mathisen 
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Fix reading of scavenger parameter in challenge files. Reported by KukY, 
closes ticket:3630


  Commit: ee95d785bdfd72a490863d7cdb3f504f88f9eecd
  
https://github.com/Warzone2100/warzone2100/commit/ee95d785bdfd72a490863d7cdb3f504f88f9eecd
  Author: Cyp 
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Don't rename AI players.

With multiple AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, 
Nexus_3, or similar.


  Commit: 28a2a034447a73edd652ebc7e86d54c0a64ef01a
  
https://github.com/Warzone2100/warzone2100/commit/28a2a034447a73edd652ebc7e86d54c0a64ef01a
  Author: automerge 
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M macosx/configs/fetchscripts/GLExtensionWrangler-FetchSource.sh
M src/multiint.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/865588631dba...28a2a034447a
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 9d82de: Remove dead code

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9d82dea37ae9ed2662ccf26ad1614ed386106972
  
https://github.com/Warzone2100/warzone2100/commit/9d82dea37ae9ed2662ccf26ad1614ed386106972
  Author: Per Inge Mathisen 
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
M src/mission.cpp
M src/missiondef.h

  Log Message:
  ---
  Remove dead code


  Commit: b307efb4dd4ec648328f196c52c299b2517c741c
  
https://github.com/Warzone2100/warzone2100/commit/b307efb4dd4ec648328f196c52c299b2517c741c
  Author: Per Inge Mathisen 
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
M src/mission.cpp
M src/mission.h
M src/missiondef.h

  Log Message:
  ---
  Run astyle over mission code to make it readable.


  Commit: 06f10ca89fb7d020b6b2cac4a6f533b016ac0175
  
https://github.com/Warzone2100/warzone2100/commit/06f10ca89fb7d020b6b2cac4a6f533b016ac0175
  Author: Per Inge Mathisen 
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
M src/transporter.cpp
M src/transporter.h

  Log Message:
  ---
  Run astyle over transport code to make it readable.


  Commit: 298a8891b4b5927a617d47aaeab85f6b90619c5c
  
https://github.com/Warzone2100/warzone2100/commit/298a8891b4b5927a617d47aaeab85f6b90619c5c
  Author: automerge 
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
M src/mission.cpp
M src/mission.h
M src/missiondef.h
M src/transporter.cpp
M src/transporter.h

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/490eedb0d2b5...298a8891b4b5
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 9d82de: Remove dead code

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9d82dea37ae9ed2662ccf26ad1614ed386106972
  
https://github.com/Warzone2100/warzone2100/commit/9d82dea37ae9ed2662ccf26ad1614ed386106972
  Author: Per Inge Mathisen 
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
M src/mission.cpp
M src/missiondef.h

  Log Message:
  ---
  Remove dead code


  Commit: b307efb4dd4ec648328f196c52c299b2517c741c
  
https://github.com/Warzone2100/warzone2100/commit/b307efb4dd4ec648328f196c52c299b2517c741c
  Author: Per Inge Mathisen 
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
M src/mission.cpp
M src/mission.h
M src/missiondef.h

  Log Message:
  ---
  Run astyle over mission code to make it readable.


  Commit: 06f10ca89fb7d020b6b2cac4a6f533b016ac0175
  
https://github.com/Warzone2100/warzone2100/commit/06f10ca89fb7d020b6b2cac4a6f533b016ac0175
  Author: Per Inge Mathisen 
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
M src/transporter.cpp
M src/transporter.h

  Log Message:
  ---
  Run astyle over transport code to make it readable.


  Commit: 70a416977f5368a39a8b2368bdc1f1f795c7b268
  
https://github.com/Warzone2100/warzone2100/commit/70a416977f5368a39a8b2368bdc1f1f795c7b268
  Author: automerge 
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
M src/mission.cpp
M src/mission.h
M src/missiondef.h
M src/transporter.cpp
M src/transporter.h

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/28a2a034447a...70a416977f53
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 398f77: No longer save default map, max players and map ha...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 398f77ede082063bd1bc607d5814e9630f663967
  
https://github.com/Warzone2100/warzone2100/commit/398f77ede082063bd1bc607d5814e9630f663967
  Author: Per Inge Mathisen 
  Date:   2012-08-02 (Thu, 02 Aug 2012)

  Changed paths:
M ChangeLog
M src/configuration.cpp
M src/frontend.cpp

  Log Message:
  ---
  No longer save default map, max players and map hash. Patch originally by 
vexed. Closes ticket:3618


  Commit: 74c153cf7bcc823ce1ace112cb9ce96d527c9f97
  
https://github.com/Warzone2100/warzone2100/commit/74c153cf7bcc823ce1ace112cb9ce96d527c9f97
  Author: Cyp 
  Date:   2012-08-02 (Thu, 02 Aug 2012)

  Changed paths:
M lib/framework/frameresource.cpp

  Log Message:
  ---
  Assert on collision of hashes of resource types or filenames.

This should be a minor improvement over silently retreiving the wrong resource 
on filename hash collisions.


  Commit: e219cd62bf7df7a532c8a52cc6f3ec37445aa0c5
  
https://github.com/Warzone2100/warzone2100/commit/e219cd62bf7df7a532c8a52cc6f3ec37445aa0c5
  Author: automerge 
  Date:   2012-08-02 (Thu, 02 Aug 2012)

  Changed paths:
M ChangeLog
M lib/framework/frameresource.cpp
M src/configuration.cpp
M src/frontend.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/09084588b693...e219cd62bf7d
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] df3283: qt: Use QImage instead of QImageReader to load mou...

[automerge]

96d527c9f97
  Author: Cyp 
  Date:   2012-08-02 (Thu, 02 Aug 2012)

  Changed paths:
M lib/framework/frameresource.cpp

  Log Message:
  ---
  Assert on collision of hashes of resource types or filenames.

This should be a minor improvement over silently retreiving the wrong resource 
on filename hash collisions.


  Commit: 7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb
  
https://github.com/Warzone2100/warzone2100/commit/7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb
  Author: automerge 
  Date:   2012-08-02 (Thu, 02 Aug 2012)

  Changed paths:
M .gitignore
M ChangeLog
R data/mp/multiplay/skirmish/nullbot-ge.inc.js
A data/mp/multiplay/skirmish/nullbot-generic.js.inc
R data/mp/multiplay/skirmish/nullbot-head.inc.js
A data/mp/multiplay/skirmish/nullbot-header.js.inc
A data/mp/multiplay/skirmish/nullbot-main.js.inc
R data/mp/multiplay/skirmish/nullbot-tail.inc.js
M data/mp/multiplay/skirmish/nullbot.js
M lib/framework/frameresource.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/qtgame/wzapp_qt.cpp
M lib/qtgame/wzapp_qt.h
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
A macosx/configs/ResourceRules.plist
M macosx/configs/Warzone-All.xcconfig
R macosx/configs/codesignrules.plist
A macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
M macosx/configs/mkdmgs.sh
M src/configuration.cpp
M src/display.cpp
M src/frontend.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/70a416977f53...7c76d4eaff71
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 087ab8: Fix missing decals in Rocky Mountains tileset that...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 087ab8c5058730925c747dcdf14c8319319b3929
  
https://github.com/Warzone2100/warzone2100/commit/087ab8c5058730925c747dcdf14c8319319b3929
  Author: Per Inge Mathisen 
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
M data/base/tileset/rockiedecals.txt
M data/base/tileset/rockieground.txt
M data/base/tileset/urbanground.txt

  Log Message:
  ---
  Fix missing decals in Rocky Mountains tileset that were specially made for it
but never mentioned in the rockiedecals.txt file. It also fixes the ground
types of certain urban and rocky tiles to resemble the old 2.3 terrain more
exactly. Patch by NoQ. Closes ticket:3621


  Commit: 2216c3a2b1839233e629dc43a9cd0d9988634e82
  
https://github.com/Warzone2100/warzone2100/commit/2216c3a2b1839233e629dc43a9cd0d9988634e82
  Author: Per Inge Mathisen 
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog


  Commit: c6084f43c330d9d1952cce0169981c4e97e70a1f
  
https://github.com/Warzone2100/warzone2100/commit/c6084f43c330d9d1952cce0169981c4e97e70a1f
  Author: automerge 
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
M ChangeLog
M data/base/tileset/rockiedecals.txt
M data/base/tileset/rockieground.txt
M data/base/tileset/urbanground.txt

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/18c2599688cd...c6084f43c330
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] e90f77: Revert "Fix reported [-Werror=format] issue."

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e90f7761685a51807af1f62ed717c03bb950373f
  
https://github.com/Warzone2100/warzone2100/commit/e90f7761685a51807af1f62ed717c03bb950373f
  Author: vexed 
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Revert "Fix reported [-Werror=format] issue."

This reverts commit 0bfee185a38c1a354c14b33a064d13d81a03962f.


  Commit: c9fa97ca809c43b4a411ea41b9e1ea2bba114c7c
  
https://github.com/Warzone2100/warzone2100/commit/c9fa97ca809c43b4a411ea41b9e1ea2bba114c7c
  Author: vexed 
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multiint.cpp

  Log Message:
  ---
  Revert "Add last part of net patch (needs updated server code)."

This reverts commit 329572779ae2e383b6bd668078ee4ecffe173dc4.


  Commit: 5b9a496b1a5dd3f1d63e0f035561bd750266d2da
  
https://github.com/Warzone2100/warzone2100/commit/5b9a496b1a5dd3f1d63e0f035561bd750266d2da
  Author: Cyp 
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
M lib/ivis_opengl/bitimage.cpp

  Log Message:
  ---
  Use std::multiset::iterator instead of std::set::iterator with std::multiset.

Apparently, the iterators were compatible, in some library implementations.


  Commit: 7344958ab39e106287374dfecaf8b2a0469a36c2
  
https://github.com/Warzone2100/warzone2100/commit/7344958ab39e106287374dfecaf8b2a0469a36c2
  Author: automerge 
  Date:   2012-08-12 (Sun, 12 Aug 2012)

  Changed paths:
M lib/ivis_opengl/bitimage.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multiint.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/385b16f41387...7344958ab39e
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] e90f77: Revert "Fix reported [-Werror=format] issue."

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e90f7761685a51807af1f62ed717c03bb950373f
  
https://github.com/Warzone2100/warzone2100/commit/e90f7761685a51807af1f62ed717c03bb950373f
  Author: vexed 
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
M lib/netplay/netplay.cpp

  Log Message:
  ---
  Revert "Fix reported [-Werror=format] issue."

This reverts commit 0bfee185a38c1a354c14b33a064d13d81a03962f.


  Commit: c9fa97ca809c43b4a411ea41b9e1ea2bba114c7c
  
https://github.com/Warzone2100/warzone2100/commit/c9fa97ca809c43b4a411ea41b9e1ea2bba114c7c
  Author: vexed 
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multiint.cpp

  Log Message:
  ---
  Revert "Add last part of net patch (needs updated server code)."

This reverts commit 329572779ae2e383b6bd668078ee4ecffe173dc4.


  Commit: 5b9a496b1a5dd3f1d63e0f035561bd750266d2da
  
https://github.com/Warzone2100/warzone2100/commit/5b9a496b1a5dd3f1d63e0f035561bd750266d2da
  Author: Cyp 
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
M lib/ivis_opengl/bitimage.cpp

  Log Message:
  ---
  Use std::multiset::iterator instead of std::set::iterator with std::multiset.

Apparently, the iterators were compatible, in some library implementations.


  Commit: 5f6323a98dbcadcecc80cec45e04119b916b5825
  
https://github.com/Warzone2100/warzone2100/commit/5f6323a98dbcadcecc80cec45e04119b916b5825
  Author: automerge 
  Date:   2012-08-12 (Sun, 12 Aug 2012)

  Changed paths:
M lib/ivis_opengl/bitimage.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/multiint.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/c6084f43c330...5f6323a98dbc
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 674ca3: French translation update by Amiral JCDG.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 674ca3edd22b74508c49d11cff7bf6b62720657e
  
https://github.com/Warzone2100/warzone2100/commit/674ca3edd22b74508c49d11cff7bf6b62720657e
  Author: cybersphinx 
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3671.


  Commit: 0c9769dd83410ea7f1b9b303fc0957a8111062b7
  
https://github.com/Warzone2100/warzone2100/commit/0c9769dd83410ea7f1b9b303fc0957a8111062b7
  Author: dak180 
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Force code signing to happen last.


  Commit: 5801ca7345c15f2ea05b764949f533ff40e29401
  
https://github.com/Warzone2100/warzone2100/commit/5801ca7345c15f2ea05b764949f533ff40e29401
  Author: automerge 
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
M macosx/configs/mkdmgs.sh
M po/fr.po

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/7587f97b25e8...5801ca7345c1
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 674ca3: French translation update by Amiral JCDG.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 674ca3edd22b74508c49d11cff7bf6b62720657e
  
https://github.com/Warzone2100/warzone2100/commit/674ca3edd22b74508c49d11cff7bf6b62720657e
  Author: cybersphinx 
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3671.


  Commit: 0c9769dd83410ea7f1b9b303fc0957a8111062b7
  
https://github.com/Warzone2100/warzone2100/commit/0c9769dd83410ea7f1b9b303fc0957a8111062b7
  Author: dak180 
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Force code signing to happen last.


  Commit: 1c7a8dcdf7cacdeae58f5de8642bfa8cddfd9da9
  
https://github.com/Warzone2100/warzone2100/commit/1c7a8dcdf7cacdeae58f5de8642bfa8cddfd9da9
  Author: automerge 
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
M macosx/configs/mkdmgs.sh
M po/fr.po

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/77b5da03c1df...1c7a8dcdf7ca
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 0d333a: Update disabled uplink and lassat icons.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 0d333a1a0661244015bb8c825e889135d20fac01
  
https://github.com/Warzone2100/warzone2100/commit/0d333a1a0661244015bb8c825e889135d20fac01
  Author: Berg 
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
M data/base/images/frontend/image_no_lassat.png
M data/base/images/frontend/image_no_uplink.png

  Log Message:
  ---
  Update disabled uplink and lassat icons.


  Commit: 5bac6e4273fbdbd43acaf4a0042b373d4c9dec7c
  
https://github.com/Warzone2100/warzone2100/commit/5bac6e4273fbdbd43acaf4a0042b373d4c9dec7c
  Author: Cyp 
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
M src/multiplay.cpp
M src/multiplay.h
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/research.h

  Log Message:
  ---
  Allow researching topics which labs being upgraded are already researching.

If researching Kittens Mk2 in lab A, then Kittens Mk2 is unavailable for 
research in other labs. If upgrading lab
A, then Kittens Mk2 now becomes available for research in other labs, for the 
duration of lab A's upgrade. If
choosing Kittens Mk2 in lab B, then the research of Kittens Mk2 is cancelled in 
lab A, and the user must manually
select a new research topic for the lab, such as Puppies Mk3. Otherwise, lab A 
continues researching Kittens Mk2
once lab A is done upgrading, as usual. The same applies if lab A is being 
demolished, except that lab A cannot
continue researching after it has been demolished.

This is especially useful in the case of a lab upgrade being delayed due to 
loss of trucks.


  Commit: 590adfd053ffc3fe97789864e9cd37de2ffe165e
  
https://github.com/Warzone2100/warzone2100/commit/590adfd053ffc3fe97789864e9cd37de2ffe165e
  Author: automerge 
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
M data/base/images/frontend/image_no_lassat.png
M data/base/images/frontend/image_no_uplink.png
M src/multiplay.cpp
M src/multiplay.h
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/research.h

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/5801ca7345c1...590adfd053ff
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 0d333a: Update disabled uplink and lassat icons.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 0d333a1a0661244015bb8c825e889135d20fac01
  
https://github.com/Warzone2100/warzone2100/commit/0d333a1a0661244015bb8c825e889135d20fac01
  Author: Berg 
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
M data/base/images/frontend/image_no_lassat.png
M data/base/images/frontend/image_no_uplink.png

  Log Message:
  ---
  Update disabled uplink and lassat icons.


  Commit: 5bac6e4273fbdbd43acaf4a0042b373d4c9dec7c
  
https://github.com/Warzone2100/warzone2100/commit/5bac6e4273fbdbd43acaf4a0042b373d4c9dec7c
  Author: Cyp 
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
M src/multiplay.cpp
M src/multiplay.h
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/research.h

  Log Message:
  ---
  Allow researching topics which labs being upgraded are already researching.

If researching Kittens Mk2 in lab A, then Kittens Mk2 is unavailable for 
research in other labs. If upgrading lab
A, then Kittens Mk2 now becomes available for research in other labs, for the 
duration of lab A's upgrade. If
choosing Kittens Mk2 in lab B, then the research of Kittens Mk2 is cancelled in 
lab A, and the user must manually
select a new research topic for the lab, such as Puppies Mk3. Otherwise, lab A 
continues researching Kittens Mk2
once lab A is done upgrading, as usual. The same applies if lab A is being 
demolished, except that lab A cannot
continue researching after it has been demolished.

This is especially useful in the case of a lab upgrade being delayed due to 
loss of trucks.


  Commit: c55693c436c910ce6bde71f04d7d861b7d0c70fb
  
https://github.com/Warzone2100/warzone2100/commit/c55693c436c910ce6bde71f04d7d861b7d0c70fb
  Author: automerge 
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
M data/base/images/frontend/image_no_lassat.png
M data/base/images/frontend/image_no_uplink.png
M src/multiplay.cpp
M src/multiplay.h
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/research.h

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/444a7afbf207...c55693c436c9
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 11f19f: Fix a bug where the players list vanishes after we...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 11f19fbdb7a8f1ced43fcf24a80857da6eb63225
  
https://github.com/Warzone2100/warzone2100/commit/11f19fbdb7a8f1ced43fcf24a80857da6eb63225
  Author: Subsentient 
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Fix a bug where the players list vanishes after we close our nick chooser.


  Commit: 9a97b48f9297910ed484c7468f8d6c25d0187d41
  
https://github.com/Warzone2100/warzone2100/commit/9a97b48f9297910ed484c7468f8d6c25d0187d41
  Author: vexed 
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Remove unneeded comment.


  Commit: 5b3163b9433604a470a9b4b3758081e2cdbb3755
  
https://github.com/Warzone2100/warzone2100/commit/5b3163b9433604a470a9b4b3758081e2cdbb3755
  Author: Cyp 
  Date:   2012-08-25 (Sat, 25 Aug 2012)

  Changed paths:
M src/structure.cpp
M src/structuredef.h

  Log Message:
  ---
  Change data type of currentBuildPts from SWORD to int32_t, by Kreuvf.

Based on patch by Kreuvf.

Avoids currentBuildPts overflow effect: very long progress bar.

Fixes ticket:3685.


  Commit: fec5a9103b819796eb8375694b31e83322f1c894
  
https://github.com/Warzone2100/warzone2100/commit/fec5a9103b819796eb8375694b31e83322f1c894
  Author: automerge 
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
M src/multimenu.cpp
M src/structure.cpp
M src/structuredef.h

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/590adfd053ff...fec5a9103b81
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 11f19f: Fix a bug where the players list vanishes after we...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 11f19fbdb7a8f1ced43fcf24a80857da6eb63225
  
https://github.com/Warzone2100/warzone2100/commit/11f19fbdb7a8f1ced43fcf24a80857da6eb63225
  Author: Subsentient 
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Fix a bug where the players list vanishes after we close our nick chooser.


  Commit: 9a97b48f9297910ed484c7468f8d6c25d0187d41
  
https://github.com/Warzone2100/warzone2100/commit/9a97b48f9297910ed484c7468f8d6c25d0187d41
  Author: vexed 
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Remove unneeded comment.


  Commit: 5b3163b9433604a470a9b4b3758081e2cdbb3755
  
https://github.com/Warzone2100/warzone2100/commit/5b3163b9433604a470a9b4b3758081e2cdbb3755
  Author: Cyp 
  Date:   2012-08-25 (Sat, 25 Aug 2012)

  Changed paths:
M src/structure.cpp
M src/structuredef.h

  Log Message:
  ---
  Change data type of currentBuildPts from SWORD to int32_t, by Kreuvf.

Based on patch by Kreuvf.

Avoids currentBuildPts overflow effect: very long progress bar.

Fixes ticket:3685.


  Commit: 84baba89acb1dc558afcd87e5e55dd033fc7e99b
  
https://github.com/Warzone2100/warzone2100/commit/84baba89acb1dc558afcd87e5e55dd033fc7e99b
  Author: automerge 
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
M src/multimenu.cpp
M src/structure.cpp
M src/structuredef.h

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/c55693c436c9...84baba89acb1
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 408be7: Warn on apparently buggy PhysFS version 2.0.2.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 408be743f017cce1519cd955767abf0e697ab7f7
  
https://github.com/Warzone2100/warzone2100/commit/408be743f017cce1519cd955767abf0e697ab7f7
  Author: Cyp 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M src/main.cpp

  Log Message:
  ---
  Warn on apparently buggy PhysFS version 2.0.2.

Refs ticket:3700.


  Commit: 8299d11fab753c7ecb7865f2fbe22d8444be35bb
  
https://github.com/Warzone2100/warzone2100/commit/8299d11fab753c7ecb7865f2fbe22d8444be35bb
  Author: cybersphinx 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M po/pl.po

  Log Message:
  ---
  Polish translation update by Emdek.

Closes #1347.


  Commit: 5ae125c40d7f7c9c5ff872dc3a46d068d38cbb68
  
https://github.com/Warzone2100/warzone2100/commit/5ae125c40d7f7c9c5ff872dc3a46d068d38cbb68
  Author: cybersphinx 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M lib/framework/i18n.cpp
M pkg/nsis/warzone2100.nsi
M po/LINGUAS
A po/el.po

  Log Message:
  ---
  New Greek translation by Nikos Papadopoylos.

Closes #3703.


  Commit: a2c7be0febf6e9d154763c6f16804b695878d3f9
  
https://github.com/Warzone2100/warzone2100/commit/a2c7be0febf6e9d154763c6f16804b695878d3f9
  Author: cybersphinx 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M lib/framework/i18n.cpp

  Log Message:
  ---
  Make last commit compiler-readable in addition to human-readable.


  Commit: 0a381b3300a438b2bc0bb4d1fa6653a34deeb2a0
  
https://github.com/Warzone2100/warzone2100/commit/0a381b3300a438b2bc0bb4d1fa6653a34deeb2a0
  Author: dak180 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
A macosx/Resources/wzlocal/el.lproj/InfoPlist.strings

  Log Message:
  ---
  Add a .lproj bundle for Greek.

Refs #3703.


  Commit: fdf9558e5c877d689ee368b77ce4ce04b6ca4882
  
https://github.com/Warzone2100/warzone2100/commit/fdf9558e5c877d689ee368b77ce4ce04b6ca4882
  Author: automerge 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M lib/framework/i18n.cpp
A macosx/Resources/wzlocal/el.lproj/InfoPlist.strings
M pkg/nsis/warzone2100.nsi
M po/LINGUAS
A po/el.po
M po/pl.po
M src/main.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/fec5a9103b81...fdf9558e5c87
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 408be7: Warn on apparently buggy PhysFS version 2.0.2.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 408be743f017cce1519cd955767abf0e697ab7f7
  
https://github.com/Warzone2100/warzone2100/commit/408be743f017cce1519cd955767abf0e697ab7f7
  Author: Cyp 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M src/main.cpp

  Log Message:
  ---
  Warn on apparently buggy PhysFS version 2.0.2.

Refs ticket:3700.


  Commit: 8299d11fab753c7ecb7865f2fbe22d8444be35bb
  
https://github.com/Warzone2100/warzone2100/commit/8299d11fab753c7ecb7865f2fbe22d8444be35bb
  Author: cybersphinx 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M po/pl.po

  Log Message:
  ---
  Polish translation update by Emdek.

Closes #1347.


  Commit: 5ae125c40d7f7c9c5ff872dc3a46d068d38cbb68
  
https://github.com/Warzone2100/warzone2100/commit/5ae125c40d7f7c9c5ff872dc3a46d068d38cbb68
  Author: cybersphinx 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M lib/framework/i18n.cpp
M pkg/nsis/warzone2100.nsi
M po/LINGUAS
A po/el.po

  Log Message:
  ---
  New Greek translation by Nikos Papadopoylos.

Closes #3703.


  Commit: a2c7be0febf6e9d154763c6f16804b695878d3f9
  
https://github.com/Warzone2100/warzone2100/commit/a2c7be0febf6e9d154763c6f16804b695878d3f9
  Author: cybersphinx 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M lib/framework/i18n.cpp

  Log Message:
  ---
  Make last commit compiler-readable in addition to human-readable.


  Commit: 0a381b3300a438b2bc0bb4d1fa6653a34deeb2a0
  
https://github.com/Warzone2100/warzone2100/commit/0a381b3300a438b2bc0bb4d1fa6653a34deeb2a0
  Author: dak180 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
A macosx/Resources/wzlocal/el.lproj/InfoPlist.strings

  Log Message:
  ---
  Add a .lproj bundle for Greek.

Refs #3703.


  Commit: c3ba9625b96fea6ceb036cd387a511a98523bd86
  
https://github.com/Warzone2100/warzone2100/commit/c3ba9625b96fea6ceb036cd387a511a98523bd86
  Author: Cyp 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M autogen.sh
M configure.ac

  Log Message:
  ---
  Check for automake 1.11, for dist-xz support.

If you have 1.11, but the check still fails, then run:
WANT_AUTOMAKE=1.11 ./autogen.sh

See 512ef27f4d4185d004977e0be4b972bfa130c57d.


  Commit: 23ab2996ebe28af867c7736f6a51392bab2db7f1
  
https://github.com/Warzone2100/warzone2100/commit/23ab2996ebe28af867c7736f6a51392bab2db7f1
  Author: automerge 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M autogen.sh
M configure.ac
M lib/framework/i18n.cpp
A macosx/Resources/wzlocal/el.lproj/InfoPlist.strings
M pkg/nsis/warzone2100.nsi
M po/LINGUAS
A po/el.po
M po/pl.po
M src/main.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/84baba89acb1...23ab2996ebe2
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] c3ba96: Check for automake 1.11, for dist-xz support.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: c3ba9625b96fea6ceb036cd387a511a98523bd86
  
https://github.com/Warzone2100/warzone2100/commit/c3ba9625b96fea6ceb036cd387a511a98523bd86
  Author: Cyp 
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
M autogen.sh
M configure.ac

  Log Message:
  ---
  Check for automake 1.11, for dist-xz support.

If you have 1.11, but the check still fails, then run:
WANT_AUTOMAKE=1.11 ./autogen.sh

See 512ef27f4d4185d004977e0be4b972bfa130c57d.


  Commit: a05e8c980bc42fa66ed1b81ae40793645df8efbf
  
https://github.com/Warzone2100/warzone2100/commit/a05e8c980bc42fa66ed1b81ae40793645df8efbf
  Author: dak180 
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Patch PhysFS in the mac build until there is a new release.

Refs #3700.


  Commit: 7720aa641da1a8236029949cad05e8bf985ed6e6
  
https://github.com/Warzone2100/warzone2100/commit/7720aa641da1a8236029949cad05e8bf985ed6e6
  Author: dak180 
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
M macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Add some more .strings files to the mac build.

Also make sure the licence actually makes it into the builds.


  Commit: f3bf40bfa4d4d1c81e15eca82781cbb60ebd5590
  
https://github.com/Warzone2100/warzone2100/commit/f3bf40bfa4d4d1c81e15eca82781cbb60ebd5590
  Author: automerge 
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
M autogen.sh
M configure.ac
M macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/fdf9558e5c87...f3bf40bfa4d4
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] a05e8c: Patch PhysFS in the mac build until there is a new...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: a05e8c980bc42fa66ed1b81ae40793645df8efbf
  
https://github.com/Warzone2100/warzone2100/commit/a05e8c980bc42fa66ed1b81ae40793645df8efbf
  Author: dak180 
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Patch PhysFS in the mac build until there is a new release.

Refs #3700.


  Commit: 7720aa641da1a8236029949cad05e8bf985ed6e6
  
https://github.com/Warzone2100/warzone2100/commit/7720aa641da1a8236029949cad05e8bf985ed6e6
  Author: dak180 
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
M macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Add some more .strings files to the mac build.

Also make sure the licence actually makes it into the builds.


  Commit: f835e7f2a53d4ce985311616a124226d0bb5fb58
  
https://github.com/Warzone2100/warzone2100/commit/f835e7f2a53d4ce985311616a124226d0bb5fb58
  Author: automerge 
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
M macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/23ab2996ebe2...f835e7f2a53d
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 9575cf: Allow setting/clearing game password after game is...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  
https://github.com/Warzone2100/warzone2100/commit/9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  Author: Cyp 
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp

  Log Message:
  ---
  Allow setting/clearing game password after game is hosted.

Also, if typing password and pressing Enter, actually set the password.


  Commit: 5c219f8d855db0e9bbe65c690d1f6177a603ef8c
  
https://github.com/Warzone2100/warzone2100/commit/5c219f8d855db0e9bbe65c690d1f6177a603ef8c
  Author: Cyp 
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Display debug build net usage meter at bottom of player window, independently 
of player window size.

Text no longer covers player 8.

Only affects debug builds.


  Commit: f1f0d2b9f7fd679912d7a8ab0704b913370e5d54
  
https://github.com/Warzone2100/warzone2100/commit/f1f0d2b9f7fd679912d7a8ab0704b913370e5d54
  Author: automerge 
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp
M src/multimenu.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/f3bf40bfa4d4...f1f0d2b9f7fd
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 9575cf: Allow setting/clearing game password after game is...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  
https://github.com/Warzone2100/warzone2100/commit/9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  Author: Cyp 
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp

  Log Message:
  ---
  Allow setting/clearing game password after game is hosted.

Also, if typing password and pressing Enter, actually set the password.


  Commit: 5c219f8d855db0e9bbe65c690d1f6177a603ef8c
  
https://github.com/Warzone2100/warzone2100/commit/5c219f8d855db0e9bbe65c690d1f6177a603ef8c
  Author: Cyp 
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Display debug build net usage meter at bottom of player window, independently 
of player window size.

Text no longer covers player 8.

Only affects debug builds.


  Commit: af649f85fe7e1ee9aa983d3b8e11d59595573561
  
https://github.com/Warzone2100/warzone2100/commit/af649f85fe7e1ee9aa983d3b8e11d59595573561
  Author: automerge 
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp
M src/multimenu.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/f835e7f2a53d...af649f85fe7e
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] b256d9: Improve HOMING-INDIRECT terrain avoidance.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b256d995b8b23bd4742d7cd8d876d6e0655e6d14
  
https://github.com/Warzone2100/warzone2100/commit/b256d995b8b23bd4742d7cd8d876d6e0655e6d14
  Author: Cyp 
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
M src/projectile.cpp

  Log Message:
  ---
  Improve HOMING-INDIRECT terrain avoidance.

In the case of large cliffs, HOMING-INDIRECT projectiles could collide with 
terrain.

Also, if missing, or if the target disappears, home in on the terrain where the 
target was, instead of going in a
straight line (which looked somewhat weird).


  Commit: 47011db59eb0c6254ed1626c4b9c8f32ee5a289c
  
https://github.com/Warzone2100/warzone2100/commit/47011db59eb0c6254ed1626c4b9c8f32ee5a289c
  Author: Cyp 
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
M lib/ivis_opengl/pieblitfunc.cpp
M lib/ivis_opengl/pieblitfunc.h
M src/frontend.cpp

  Log Message:
  ---
  Scale logo to fit box.

Fixes ticket:3667.


  Commit: 4cca382a24b98a7fe3b2437327a5cf4a85c17e6f
  
https://github.com/Warzone2100/warzone2100/commit/4cca382a24b98a7fe3b2437327a5cf4a85c17e6f
  Author: automerge 
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
M lib/ivis_opengl/pieblitfunc.cpp
M lib/ivis_opengl/pieblitfunc.h
M src/frontend.cpp
M src/projectile.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/161f57493da9...4cca382a24b9
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 47011d: Scale logo to fit box.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 47011db59eb0c6254ed1626c4b9c8f32ee5a289c
  
https://github.com/Warzone2100/warzone2100/commit/47011db59eb0c6254ed1626c4b9c8f32ee5a289c
  Author: Cyp 
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
M lib/ivis_opengl/pieblitfunc.cpp
M lib/ivis_opengl/pieblitfunc.h
M src/frontend.cpp

  Log Message:
  ---
  Scale logo to fit box.

Fixes ticket:3667.


  Commit: fd3dc1db22670cf909c2606926e30e96919a26aa
  
https://github.com/Warzone2100/warzone2100/commit/fd3dc1db22670cf909c2606926e30e96919a26aa
  Author: automerge 
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
M lib/ivis_opengl/pieblitfunc.cpp
M lib/ivis_opengl/pieblitfunc.h
M src/frontend.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/b70bc91b4942...fd3dc1db2267
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 667b54: Fix assertion on scavengers with more than 5 facto...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 667b54b402abdd6812b5c24f66e1ed297c111883
  
https://github.com/Warzone2100/warzone2100/commit/667b54b402abdd6812b5c24f66e1ed297c111883
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Fix assertion on scavengers with more than 5 factories.

error [setFlagPositionInc:5048] We have too many factories of type 0, player 10
info  [setFlagPositionInc:5049] Can't set flag!
info  [setFlagPositionInc:5049] Assert in Warzone: ../../src/structure.cpp:5049 
(false), last script event: ''

Maybe introduced in 737b3d9d24ab1634dafd09558fc8b8a5354ffa9c.


  Commit: 0dde269379507a897ef2945ca76f840a8994f04a
  
https://github.com/Warzone2100/warzone2100/commit/0dde269379507a897ef2945ca76f840a8994f04a
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/display3d.cpp
M src/display3d.h
M src/radar.cpp

  Log Message:
  ---
  Fix location of centre of viewport rendered on radar window.

This was wrong in CAM_2A, where scrollMinX and scrollMinY are non-zero.

Fixes ticket:3619.


  Commit: 46936d7bb36e4939c92d3071ea609b187e17360e
  
https://github.com/Warzone2100/warzone2100/commit/46936d7bb36e4939c92d3071ea609b187e17360e
  Author: automerge 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/display3d.cpp
M src/display3d.h
M src/radar.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/50b0ee7d46b0...46936d7bb36e
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 88c1a3: Pathfind to area around queued structure to be bui...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 88c1a3c3703d2ba260a101bb24cde419fe009afe
  
https://github.com/Warzone2100/warzone2100/commit/88c1a3c3703d2ba260a101bb24cde419fe009afe
  Author: Cyp 
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
M src/baseobject.h
M src/fpath.cpp

  Log Message:
  ---
  Pathfind to area around queued structure to be built, instead of to tile 
under structure.

In the following, truck T now pathfinds to x instead of y, when ordered to 
build a bunker at +. (This was already
the case since 0119eda53f11d2aa5d3e3ccc82203c6657812039, for repairing 
something at + or building a derrick at +.)
*
 *+
 x*y
T  *

Fixes ticket:3576.


  Commit: 594b8a6c631b160fda06f9ffca4b9f227c97c3f8
  
https://github.com/Warzone2100/warzone2100/commit/594b8a6c631b160fda06f9ffca4b9f227c97c3f8
  Author: Cyp 
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Don't try to remove unfinished off-world structures.

Fixes constant assertion spam:
info [mapTile:434] mapTile: x value is too big (77,19) in 64x64
info [mapTile:434] Assert in Warzone: ../../src/map.h:434 (x < mapWidth + 1), 
last script event: 'N/A'
info [destroyObject:272] destroyObject: object not found in list
info [destroyObject:272] Assert in Warzone: ../../src/objmem.cpp:272 (psCurr != 
__null), last script event: 'N/A'

Somehow fixes ticket:3653.


  Commit: d37f5276a17bbff963e5d59d1fcb2e744b494ac2
  
https://github.com/Warzone2100/warzone2100/commit/d37f5276a17bbff963e5d59d1fcb2e744b494ac2
  Author: Cyp 
  Date:   2012-09-14 (Fri, 14 Sep 2012)

  Changed paths:
M src/hci.cpp

  Log Message:
  ---
  Never add completed researches to research menu.

Researches would fail to disappear from the research menu when the research was 
complete, if clicking on the
research facility just before the research was complete, since this resulted in 
setting the research to pending,
and the research would still be pending even after being complete (more likely 
with high latency, due to a larger
window to reproduce in).

Fixes ticket:3454.


  Commit: 508f26a174fd356b778419dd7c4eeaacfd27d8ac
  
https://github.com/Warzone2100/warzone2100/commit/508f26a174fd356b778419dd7c4eeaacfd27d8ac
  Author: Per Inge Mathisen 
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Fix crash when placing transporters on the map in a map editor. Closes 
ticket:3714


  Commit: a4d7013049d6a0e3d54c71967e8639e472bd4f7c
  
https://github.com/Warzone2100/warzone2100/commit/a4d7013049d6a0e3d54c71967e8639e472bd4f7c
  Author: Per Inge Mathisen 
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update changelog


  Commit: 667b54b402abdd6812b5c24f66e1ed297c111883
  
https://github.com/Warzone2100/warzone2100/commit/667b54b402abdd6812b5c24f66e1ed297c111883
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Fix assertion on scavengers with more than 5 factories.

error [setFlagPositionInc:5048] We have too many factories of type 0, player 10
info  [setFlagPositionInc:5049] Can't set flag!
info  [setFlagPositionInc:5049] Assert in Warzone: ../../src/structure.cpp:5049 
(false), last script event: ''

Maybe introduced in 737b3d9d24ab1634dafd09558fc8b8a5354ffa9c.


  Commit: 0dde269379507a897ef2945ca76f840a8994f04a
  
https://github.com/Warzone2100/warzone2100/commit/0dde269379507a897ef2945ca76f840a8994f04a
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/display3d.cpp
M src/display3d.h
M src/radar.cpp

  Log Message:
  ---
  Fix location of centre of viewport rendered on radar window.

This was wrong in CAM_2A, where scrollMinX and scrollMinY are non-zero.

Fixes ticket:3619.


  Commit: 69c4474e572972e2a73eedab6672e1fe3523e903
  
https://github.com/Warzone2100/warzone2100/commit/69c4474e572972e2a73eedab6672e1fe3523e903
  Author: automerge 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M ChangeLog
M src/baseobject.h
M src/display3d.cpp
M src/display3d.h
M src/fpath.cpp
M src/game.cpp
M src/hci.cpp
M src/radar.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/fd3dc1db2267...69c4474e5729
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats

[Warzone2100-commits] [Warzone2100/warzone2100] f395be: Do not crash on pressing 'T' with a transporter se...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: f395be71850cf28f7ab03bf235ba221d8eaf6ca1
  
https://github.com/Warzone2100/warzone2100/commit/f395be71850cf28f7ab03bf235ba221d8eaf6ca1
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/intorder.cpp
M src/keybind.cpp
M src/order.cpp

  Log Message:
  ---
  Do not crash on pressing 'T' with a transporter selected.

Fixes ticket:3683.


  Commit: c8b6ac5ca827bc42972dbc62f59f790622ad502b
  
https://github.com/Warzone2100/warzone2100/commit/c8b6ac5ca827bc42972dbc62f59f790622ad502b
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M doc/warzone2100.6.asciidoc

  Log Message:
  ---
  Fix typo in man page.

Fixes ticket:3716.


  Commit: e1178b57e9c53f031139f18d36d8158a27e64f39
  
https://github.com/Warzone2100/warzone2100/commit/e1178b57e9c53f031139f18d36d8158a27e64f39
  Author: Cyp 
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
M src/order.cpp
M src/structure.cpp

  Log Message:
  ---
  Fix commander-related desynch and crash.

Would probably desynch on building anything in a factory assigned to a 
commander.

Would crash if assigning a VTOL factory to a commander, building a transport, 
and trying to unload the transport
(which would appear to contain everything assigned to said commander).

The .psCommander and .psAssemblyPoint should probably be syncronised at some 
point, but for now, are done like
this.

Fixes ticket:1924, ticket:3296 and ticket:3676.


  Commit: 9f7f7c665b70a244509caf211c67e29904e0fbd8
  
https://github.com/Warzone2100/warzone2100/commit/9f7f7c665b70a244509caf211c67e29904e0fbd8
  Author: Cyp 
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
M src/selection.cpp

  Log Message:
  ---
  Select both super transports and cyborg transports with Shift+P.

Fixes ticket:3644.


  Commit: 56001781bcfcbecbd93831499a539d66b50d27d9
  
https://github.com/Warzone2100/warzone2100/commit/56001781bcfcbecbd93831499a539d66b50d27d9
  Author: Cyp 
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
M src/order.cpp

  Log Message:
  ---
  Fix failure to repair commanders on Alt+click.

Selecting a repair droid or cyborg and hovering with Alt over a commander would 
show the repair icon, but do nothing
on click. This was because repair droids would be ordered to do a structure 
repair on the commander, and repair
cyborgs would be ordered to attack the commander. The repair cyborgs were 
smarter.

Fixes ticket:1997.


  Commit: 0773a9ff6cfc344def015f349e39fa62d09fe697
  
https://github.com/Warzone2100/warzone2100/commit/0773a9ff6cfc344def015f349e39fa62d09fe697
  Author: Cyp 
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Do not halt factory production assigned to commanders in skirmish on 
commander limit, or for VTOLs.

Since unlimited VTOLs can be assigned to commanders, do not halt production of 
them.
Since .psCommander is not synchronised, do not depend on it in synchronised 
code in skirmish.

Fixes ticket:2138.


  Commit: 60c235ab3ff835edb60b0e0c020923351c893893
  
https://github.com/Warzone2100/warzone2100/commit/60c235ab3ff835edb60b0e0c020923351c893893
  Author: Cyp 
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
M src/effects.cpp

  Log Message:
  ---
  Fix droid parts not flying away from exploding droids, when above water.

This was due to unsigned comparison with the negative water height.

Fixes ticket:3681.


  Commit: 831d22c7d26930872a9ec766177f8a00b63ace98
  
https://github.com/Warzone2100/warzone2100/commit/831d22c7d26930872a9ec766177f8a00b63ace98
  Author: Cyp 
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Disable game name icon in multiplayer, too; since it doesn't do anything, 
anyway.

Fixes ticket:1231.


  Commit: 4f85a5eaa12ea88d7055e3430577d7dec9391a05
  
https://github.com/Warzone2100/warzone2100/commit/4f85a5eaa12ea88d7055e3430577d7dec9391a05
  Author: Cyp 
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
M src/display.cpp

  Log Message:
  ---
  Only show build cursor over structures for building modules which have been 
researched.

Fixes ticket:3327.


  Commit: c3de482ab69b5c9088d17c3959c9e3b3dc6a7146
  
https://github.com/Warzone2100/warzone2100/commit/c3de482ab69b5c9088d17c3959c9e3b3dc6a7146
  Author: automerge 
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
M doc/warzone2100.6.asciidoc
M src/display.cpp
M src/effects.cpp
M src/intorder.cpp
M src/keybind.cpp
M src/multiint.cpp
M src/order.cpp
M src/selection.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/46

[Warzone2100-commits] [Warzone2100/warzone2100] f395be: Do not crash on pressing 'T' with a transporter se...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: f395be71850cf28f7ab03bf235ba221d8eaf6ca1
  
https://github.com/Warzone2100/warzone2100/commit/f395be71850cf28f7ab03bf235ba221d8eaf6ca1
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M src/intorder.cpp
M src/keybind.cpp
M src/order.cpp

  Log Message:
  ---
  Do not crash on pressing 'T' with a transporter selected.

Fixes ticket:3683.


  Commit: c8b6ac5ca827bc42972dbc62f59f790622ad502b
  
https://github.com/Warzone2100/warzone2100/commit/c8b6ac5ca827bc42972dbc62f59f790622ad502b
  Author: Cyp 
  Date:   2012-09-16 (Sun, 16 Sep 2012)

  Changed paths:
M doc/warzone2100.6.asciidoc

  Log Message:
  ---
  Fix typo in man page.

Fixes ticket:3716.


  Commit: e1178b57e9c53f031139f18d36d8158a27e64f39
  
https://github.com/Warzone2100/warzone2100/commit/e1178b57e9c53f031139f18d36d8158a27e64f39
  Author: Cyp 
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
M src/order.cpp
M src/structure.cpp

  Log Message:
  ---
  Fix commander-related desynch and crash.

Would probably desynch on building anything in a factory assigned to a 
commander.

Would crash if assigning a VTOL factory to a commander, building a transport, 
and trying to unload the transport
(which would appear to contain everything assigned to said commander).

The .psCommander and .psAssemblyPoint should probably be syncronised at some 
point, but for now, are done like
this.

Fixes ticket:1924, ticket:3296 and ticket:3676.


  Commit: 9f7f7c665b70a244509caf211c67e29904e0fbd8
  
https://github.com/Warzone2100/warzone2100/commit/9f7f7c665b70a244509caf211c67e29904e0fbd8
  Author: Cyp 
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
M src/selection.cpp

  Log Message:
  ---
  Select both super transports and cyborg transports with Shift+P.

Fixes ticket:3644.


  Commit: 56001781bcfcbecbd93831499a539d66b50d27d9
  
https://github.com/Warzone2100/warzone2100/commit/56001781bcfcbecbd93831499a539d66b50d27d9
  Author: Cyp 
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
M src/order.cpp

  Log Message:
  ---
  Fix failure to repair commanders on Alt+click.

Selecting a repair droid or cyborg and hovering with Alt over a commander would 
show the repair icon, but do nothing
on click. This was because repair droids would be ordered to do a structure 
repair on the commander, and repair
cyborgs would be ordered to attack the commander. The repair cyborgs were 
smarter.

Fixes ticket:1997.


  Commit: 0773a9ff6cfc344def015f349e39fa62d09fe697
  
https://github.com/Warzone2100/warzone2100/commit/0773a9ff6cfc344def015f349e39fa62d09fe697
  Author: Cyp 
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Do not halt factory production assigned to commanders in skirmish on 
commander limit, or for VTOLs.

Since unlimited VTOLs can be assigned to commanders, do not halt production of 
them.
Since .psCommander is not synchronised, do not depend on it in synchronised 
code in skirmish.

Fixes ticket:2138.


  Commit: 60c235ab3ff835edb60b0e0c020923351c893893
  
https://github.com/Warzone2100/warzone2100/commit/60c235ab3ff835edb60b0e0c020923351c893893
  Author: Cyp 
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
M src/effects.cpp

  Log Message:
  ---
  Fix droid parts not flying away from exploding droids, when above water.

This was due to unsigned comparison with the negative water height.

Fixes ticket:3681.


  Commit: 831d22c7d26930872a9ec766177f8a00b63ace98
  
https://github.com/Warzone2100/warzone2100/commit/831d22c7d26930872a9ec766177f8a00b63ace98
  Author: Cyp 
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Disable game name icon in multiplayer, too; since it doesn't do anything, 
anyway.

Fixes ticket:1231.


  Commit: 4f85a5eaa12ea88d7055e3430577d7dec9391a05
  
https://github.com/Warzone2100/warzone2100/commit/4f85a5eaa12ea88d7055e3430577d7dec9391a05
  Author: Cyp 
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
M src/display.cpp

  Log Message:
  ---
  Only show build cursor over structures for building modules which have been 
researched.

Fixes ticket:3327.


  Commit: efb9ebcb4a19d72a3a86f377713052e3564f30b3
  
https://github.com/Warzone2100/warzone2100/commit/efb9ebcb4a19d72a3a86f377713052e3564f30b3
  Author: automerge 
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
M doc/warzone2100.6.asciidoc
M src/display.cpp
M src/effects.cpp
M src/intorder.cpp
M src/keybind.cpp
M src/multiint.cpp
M src/order.cpp
M src/selection.cpp
M src/structure.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone

[Warzone2100-commits] [Warzone2100/warzone2100] d608f3: Fix bungee-jumping turrets.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: d608f37fadfa969c225fef8149eaa700cc878a46
  
https://github.com/Warzone2100/warzone2100/commit/d608f37fadfa969c225fef8149eaa700cc878a46
  Author: Cyp 
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
M src/action.cpp

  Log Message:
  ---
  Fix bungee-jumping turrets.

Turrets would use the exact muzzle position when firing, but use the base 
position when getting ready to fire. This
would result in a HMG tower pointing in the wrong direction half the time, 
bouncing up and down, if the target was
close. The turret would correctly point down when firing, and revert to 
pointing horizontally between shots.

Not using the exact muzzle position for direction, only for pitch, in case 
other code checks the direction too, and
depends on the result being the same.

Fixes ticket:2789.


  Commit: 240256248c51cfa39c73e7c22703c5500b82f178
  
https://github.com/Warzone2100/warzone2100/commit/240256248c51cfa39c73e7c22703c5500b82f178
  Author: Cyp 
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
M src/droid.cpp
M src/structure.cpp
M src/structure.h

  Log Message:
  ---
  Simplify repair logic, where a droid is repairing a droid or structure.

Repairing structures with 0 hp will no longer risk suddenly destroying the 
structure, although this probably makes
no difference, as structures do not ever have 0 hp. The .actionStarted and 
.actionPoints fields are no longer used
when droids repair stuff.


  Commit: 8c83693ba6b96b1810853448370d62e7023a62a7
  
https://github.com/Warzone2100/warzone2100/commit/8c83693ba6b96b1810853448370d62e7023a62a7
  Author: Cyp 
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
M src/action.cpp
M src/ai.cpp
M src/droid.cpp
M src/droid.h

  Log Message:
  ---
  Make auto-repair work all the time, not just when droids are stopped.

Droids no longer start to retreat and then stop in the middle of the 
battlefield doing nothing, while getting shot
at.


  Commit: 68b1103c7caf02c3c3dc4c1f96fd391aa2feadb1
  
https://github.com/Warzone2100/warzone2100/commit/68b1103c7caf02c3c3dc4c1f96fd391aa2feadb1
  Author: automerge 
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
M src/action.cpp
M src/ai.cpp
M src/droid.cpp
M src/droid.h
M src/structure.cpp
M src/structure.h

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/efb9ebcb4a19...68b1103c7caf
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 2d3c39: Update png to 1.5.13 in the mac build.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 2d3c39e660110f35eb2da0ac5d63f4c2ec9bcea7
  
https://github.com/Warzone2100/warzone2100/commit/2d3c39e660110f35eb2da0ac5d63f4c2ec9bcea7
  Author: dak180 
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Update png to 1.5.13 in the mac build.


  Commit: be50856bc10c763adff347584b29dd43fb2511e8
  
https://github.com/Warzone2100/warzone2100/commit/be50856bc10c763adff347584b29dd43fb2511e8
  Author: automerge 
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
M macosx/configs/fetchscripts/Png-FetchSource.sh

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/a96848f31422...be50856bc10c
--
Got visibility?
Most devs has no idea what their production app looks like.
Find out how fast your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219671;13503038;y?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 7d433f: Update ChangeLog.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 7d433f85d7766c9ed78202b11ee927db620e38fa
  
https://github.com/Warzone2100/warzone2100/commit/7d433f85d7766c9ed78202b11ee927db620e38fa
  Author: Cyp 
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.

Fixes ticket:3725.


  Commit: d672df2049eebb71291e0b4624cda54c5bd0ae6c
  
https://github.com/Warzone2100/warzone2100/commit/d672df2049eebb71291e0b4624cda54c5bd0ae6c
  Author: cybersphinx 
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
M po/es.po

  Log Message:
  ---
  Spanish translation update by Saberuneko.

Closes #3712.


  Commit: c639301412d026c5e7dd21563b2bda72118084b3
  
https://github.com/Warzone2100/warzone2100/commit/c639301412d026c5e7dd21563b2bda72118084b3
  Author: cybersphinx 
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3711.


  Commit: e7e0c4b5efca5770745b1d7672c8bd9fd62e2c49
  
https://github.com/Warzone2100/warzone2100/commit/e7e0c4b5efca5770745b1d7672c8bd9fd62e2c49
  Author: cybersphinx 
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
M po/ru.po

  Log Message:
  ---
  Russian translation update by rustamv.rman.

Closes #3708.


  Commit: a7c376812122e04e91396146e3462fe36b896b60
  
https://github.com/Warzone2100/warzone2100/commit/a7c376812122e04e91396146e3462fe36b896b60
  Author: cybersphinx 
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by Amiral JCDG.

Closes #3706.


  Commit: 858664124de97921a551367656c0ba7cf4aecf3d
  
https://github.com/Warzone2100/warzone2100/commit/858664124de97921a551367656c0ba7cf4aecf3d
  Author: Per Inge Mathisen 
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
M data/mp/addon.lev
A data/mp/multiplay/maps/10c-Emergence.gam
A data/mp/multiplay/maps/10c-Emergence/dinit.bjo
A data/mp/multiplay/maps/10c-Emergence/droid.ini
A data/mp/multiplay/maps/10c-Emergence/feat.bjo
A data/mp/multiplay/maps/10c-Emergence/feature.ini
A data/mp/multiplay/maps/10c-Emergence/game.map
A data/mp/multiplay/maps/10c-Emergence/struct.bjo
A data/mp/multiplay/maps/10c-Emergence/struct.ini
A data/mp/multiplay/maps/10c-Emergence/ttypes.ttp
A data/mp/multiplay/maps/3c-Monocot_i.gam
A data/mp/multiplay/maps/3c-Monocot_i/dinit.bjo
A data/mp/multiplay/maps/3c-Monocot_i/droid.ini
A data/mp/multiplay/maps/3c-Monocot_i/feat.bjo
A data/mp/multiplay/maps/3c-Monocot_i/feature.ini
A data/mp/multiplay/maps/3c-Monocot_i/game.map
A data/mp/multiplay/maps/3c-Monocot_i/struct.bjo
A data/mp/multiplay/maps/3c-Monocot_i/struct.ini
A data/mp/multiplay/maps/3c-Monocot_i/ttypes.ttp
A data/mp/multiplay/maps/5c-bloat.gam
A data/mp/multiplay/maps/5c-bloat/dinit.bjo
A data/mp/multiplay/maps/5c-bloat/droid.ini
A data/mp/multiplay/maps/5c-bloat/feat.bjo
A data/mp/multiplay/maps/5c-bloat/feature.ini
A data/mp/multiplay/maps/5c-bloat/game.map
A data/mp/multiplay/maps/5c-bloat/struct.bjo
A data/mp/multiplay/maps/5c-bloat/struct.ini
A data/mp/multiplay/maps/5c-bloat/ttypes.ttp
A data/mp/multiplay/maps/9c-WindFury.gam
A data/mp/multiplay/maps/9c-WindFury/dinit.bjo
A data/mp/multiplay/maps/9c-WindFury/droid.ini
A data/mp/multiplay/maps/9c-WindFury/feat.bjo
A data/mp/multiplay/maps/9c-WindFury/feature.ini
A data/mp/multiplay/maps/9c-WindFury/game.map
A data/mp/multiplay/maps/9c-WindFury/struct.bjo
A data/mp/multiplay/maps/9c-WindFury/struct.ini
A data/mp/multiplay/maps/9c-WindFury/ttypes.ttp

  Log Message:
  ---
  Add new maps by NoQ: Emergence (10p), Monocot (3p), Bloat (5p) and WindFury 
(9p).


  Commit: 7523d7b9548aee68fc9d119c21fd45f64d56
  
https://github.com/Warzone2100/warzone2100/commit/7523d7b9548aee68fc9d119c21fd45f64d56
  Author: automerge 
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
M ChangeLog
M data/mp/addon.lev
A data/mp/multiplay/maps/10c-Emergence.gam
A data/mp/multiplay/maps/10c-Emergence/dinit.bjo
A data/mp/multiplay/maps/10c-Emergence/droid.ini
A data/mp/multiplay/maps/10c-Emergence/feat.bjo
A data/mp/multiplay/maps/10c-Emergence/feature.ini
A data/mp/multiplay/maps/10c-Emergence/game.map
A data/mp/multiplay/maps/10c-Emergence/struct.bjo
A data/mp/multiplay/maps/10c-Emergence/struct.ini
A data/mp/multiplay/maps/10c-Emergence/ttypes.ttp
A data/mp/multiplay/maps/3c-Monocot_i.gam
A data/mp/multiplay/maps/3c-Monocot_i/dinit.bjo
A data/mp/multiplay/maps/3c-Monocot_i/droid.ini
A data/mp/multiplay/maps/3c-Monocot_i/feat.bjo
A data/mp/multiplay/maps/3c-Monocot_i/feature.ini
A data/mp/multiplay/maps/3c-Monocot_i/game.map
A data/mp

[Warzone2100-commits] [Warzone2100/warzone2100] 984bdb: Remove "#define gameTime2 realTime".

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 984bdbc4a829f01e0b37231b2d276b1fb4995e45
  
https://github.com/Warzone2100/warzone2100/commit/984bdbc4a829f01e0b37231b2d276b1fb4995e45
  Author: Cyp 
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
M lib/gamelib/gtime.h
M lib/netplay/netplay.cpp
M lib/sound/audio.cpp
M lib/widget/button.cpp
M src/console.cpp
M src/display3d.cpp
M src/intdisplay.cpp
M src/mapdisplay.cpp
M src/multilimit.cpp
M src/scores.cpp
M src/warcam.cpp

  Log Message:
  ---
  Remove "#define gameTime2 realTime".

The old gameTime2 name was confusing. This commit is a no-op after 
preprocessing.

Apart from lib/gamelib/gtime.h, this commit is equivalent to:
sed -i 's/gameTime2/realTime/g' src/*.cpp lib/*/*.cpp


  Commit: d969dd7756859b0daea5ac2fe16422511f6876e0
  
https://github.com/Warzone2100/warzone2100/commit/d969dd7756859b0daea5ac2fe16422511f6876e0
  Author: Cyp 
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
M src/template.cpp

  Log Message:
  ---
  Use separate stored-template file for skirmish and campaign.

Fixes ticket:3702.


  Commit: b1a1a8e445d29bc2ea5b1ea8b36d93e80d8c656d
  
https://github.com/Warzone2100/warzone2100/commit/b1a1a8e445d29bc2ea5b1ea8b36d93e80d8c656d
  Author: Cyp 
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
M src/research.cpp

  Log Message:
  ---
  Update visible tiles immediately when researching sensor upgrades.

Droids would previously not see new tiles until moving after an upgrade.
Structures would previously not see new tiles until being partially 
demolished/rebuilt after an upgrade.

Fixes ticket:3450.


  Commit: abfae5ffde5e9226b196d1fb8344e89f84f8d7de
  
https://github.com/Warzone2100/warzone2100/commit/abfae5ffde5e9226b196d1fb8344e89f84f8d7de
  Author: Cyp 
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
M src/display3d.cpp

  Log Message:
  ---
  Fix displayed sensor range of droids.

Upgrades were not taken into account when displaying the sensor range of droids 
(using Shift+F12 to enable).


  Commit: fdf228249f32f498ed97bd81e4784e3b3ed69da0
  
https://github.com/Warzone2100/warzone2100/commit/fdf228249f32f498ed97bd81e4784e3b3ed69da0
  Author: automerge 
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
M lib/gamelib/gtime.h
M lib/netplay/netplay.cpp
M lib/sound/audio.cpp
M lib/widget/button.cpp
M src/console.cpp
M src/display3d.cpp
M src/intdisplay.cpp
M src/mapdisplay.cpp
M src/multilimit.cpp
M src/research.cpp
M src/scores.cpp
M src/template.cpp
M src/warcam.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/3ff86896d130...fdf228249f32
--
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] bd65d5: Make Nexus/Semperfi AIs less snobby.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: bd65d5767d023a2e53aa59fe672247301ce0f60c
  
https://github.com/Warzone2100/warzone2100/commit/bd65d5767d023a2e53aa59fe672247301ce0f60c
  Author: Cyp 
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
M data/mp/multiplay/skirmish/nexus.slo
M data/mp/multiplay/skirmish/semperfi.slo

  Log Message:
  ---
  Make Nexus/Semperfi AIs less snobby.

When asking them for 'help', they no longer say "Bug off" if the beacon isn't 
near your own structures.

Fixes ticket:3383.


  Commit: d30ca235990221473149845d744fdda8cd2548e2
  
https://github.com/Warzone2100/warzone2100/commit/d30ca235990221473149845d744fdda8cd2548e2
  Author: dak180 
  Date:   2012-10-06 (Sat, 06 Oct 2012)

  Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh

  Log Message:
  ---
  Update the mac doc bundle.


  Commit: 8070f6bf7e6805afe55a29c9f8f4533d453db3f4
  
https://github.com/Warzone2100/warzone2100/commit/8070f6bf7e6805afe55a29c9f8f4533d453db3f4
  Author: dak180 
  Date:   2012-10-06 (Sat, 06 Oct 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  ---
  Make sure the mac build does not trip the PhysFS warning.


  Commit: f3e5f9b98b1a3cfd7e9dee516070da018bd5b084
  
https://github.com/Warzone2100/warzone2100/commit/f3e5f9b98b1a3cfd7e9dee516070da018bd5b084
  Author: Per Inge Mathisen 
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  qtscript: pickStructLocation() now returns a full POSITION object,
see http://forums.wz2100.net/posting.php?mode=quote&f=35&p=111712
for discussion.


  Commit: b26d94f55902129a64077e5df454f6a69b1df0cf
  
https://github.com/Warzone2100/warzone2100/commit/b26d94f55902129a64077e5df454f6a69b1df0cf
  Author: Per Inge Mathisen 
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update changelog


  Commit: a9c2db1e8c0b791cd74065fb254d5b3883042132
  
https://github.com/Warzone2100/warzone2100/commit/a9c2db1e8c0b791cd74065fb254d5b3883042132
  Author: automerge 
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
M ChangeLog
M data/mp/multiplay/skirmish/nexus.slo
M data/mp/multiplay/skirmish/semperfi.slo
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/fdf228249f32...a9c2db1e8c0b
--
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] f81230: Don't crash when saving game and pViewData is NULL...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: f81230483e419074a7309990767b6dab35a30567
  
https://github.com/Warzone2100/warzone2100/commit/f81230483e419074a7309990767b6dab35a30567
  Author: Cyp 
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Don't crash when saving game and pViewData is NULL.

Not sure if this is supposed to be able to happen, but it did.


  Commit: ac2dc38d3dda3a6085eac3502008fd2cea5d1788
  
https://github.com/Warzone2100/warzone2100/commit/ac2dc38d3dda3a6085eac3502008fd2cea5d1788
  Author: Cyp 
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Slightly update ChangeLog.


  Commit: 32213d44f01430ef46372d83f9dcc29be6d5c9ad
  
https://github.com/Warzone2100/warzone2100/commit/32213d44f01430ef46372d83f9dcc29be6d5c9ad
  Author: automerge 
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
M ChangeLog
M src/game.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/653d6c51ed83...32213d44f014
--
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 647f5e: Update PhysFS to 2.0.3.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 647f5ed23682f650fad1f23ced693a24258ac7dc
  
https://github.com/Warzone2100/warzone2100/commit/647f5ed23682f650fad1f23ced693a24258ac7dc
  Author: dak180 
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/fetchscripts/PhysFS-FetchSource.sh

  Log Message:
  ---
  Update PhysFS to 2.0.3.

Refs #3700.


  Commit: ad5546c9aa4a6970f99eedb3934ad81b85f4a059
  
https://github.com/Warzone2100/warzone2100/commit/ad5546c9aa4a6970f99eedb3934ad81b85f4a059
  Author: automerge 
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/fetchscripts/PhysFS-FetchSource.sh

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/32213d44f014...ad5546c9aa4a
--
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] a19e41: Fix droid frustrated state. Make AI droids clip th...

[automerge]

0/commit/182e8845528ca1593510112171ea5fdf95bab699
  Author: cybersphinx 
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
M Makefile.am
M src/Makefile.am
M tools/map/Makefile.am

  Log Message:
  ---
  Rename autorevision.tmp to src/autorevision.cache.

Also remove another stray backslash, now make distcheck should work
again.


  Commit: 33ce86fbc42666427a3745aa17c0bd36d961066b
  
https://github.com/Warzone2100/warzone2100/commit/33ce86fbc42666427a3745aa17c0bd36d961066b
  Author: Per Inge Mathisen 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update changelog


  Commit: 6b4dfccb23d97e00bb6c45b0cd3edacdb05013f6
  
https://github.com/Warzone2100/warzone2100/commit/6b4dfccb23d97e00bb6c45b0cd3edacdb05013f6
  Author: Per Inge Mathisen 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Try not to crash if a factory loses its production flag. Workaround for bug 
in ticket:3768.


  Commit: 5997d959c6f3be96005428f3189e5dd19f180b7a
  
https://github.com/Warzone2100/warzone2100/commit/5997d959c6f3be96005428f3189e5dd19f180b7a
  Author: automerge 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M .gitignore
M ChangeLog
M Makefile.am
A build_tools/autorevision
M build_tools/autorevision.bat
R build_tools/autorevision.sh
M macosx/Warzone.xcodeproj/project.pbxproj
A macosx/configs/autorevision.sh
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/Makefile.am
M src/ai.cpp
M src/ai.h
M src/display.cpp
M src/droid.cpp
M src/droiddef.h
M src/game.cpp
M src/move.cpp
M src/qtscriptfuncs.cpp
M src/structure.cpp
M src/version.cpp
M tests/Makefile.am
M tools/map/Makefile.am

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/ad5546c9aa4a...5997d959c6f3
--
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 207248: Add a few forgotten files to the tarball.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 207248f977f58c40b32c6c12df78bb8696a993ce
  
https://github.com/Warzone2100/warzone2100/commit/207248f977f58c40b32c6c12df78bb8696a993ce
  Author: dak180 
  Date:   2012-10-27 (Sat, 27 Oct 2012)

  Changed paths:
M tests/Makefile.am
M tools/map/Makefile.am

  Log Message:
  ---
  Add a few forgotten files to the tarball.


  Commit: 83c71993920c196bcdcc1591b985964514c18da7
  
https://github.com/Warzone2100/warzone2100/commit/83c71993920c196bcdcc1591b985964514c18da7
  Author: dak180 
  Date:   2012-10-28 (Sun, 28 Oct 2012)

  Changed paths:
M .gitignore
M Makefile.am
A build_tools/autorevision
M macosx/Warzone.xcodeproj/project.pbxproj
A macosx/configs/autorevision.sh
M src/Makefile.am
M src/version.cpp

  Log Message:
  ---
  Use the latest version of autorevision.

>From https://github.com/Autorevision/autorevision


  Commit: e8c7ff603abeebb29ba1b43546bd0e4719ef565b
  
https://github.com/Warzone2100/warzone2100/commit/e8c7ff603abeebb29ba1b43546bd0e4719ef565b
  Author: cybersphinx 
  Date:   2012-10-28 (Sun, 28 Oct 2012)

  Changed paths:
M src/Makefile.am
M tests/Makefile.am

  Log Message:
  ---
  Fix the last two commits.


  Commit: c609b5a1524c0e42e0f780d878bd5dc327f09ee1
  
https://github.com/Warzone2100/warzone2100/commit/c609b5a1524c0e42e0f780d878bd5dc327f09ee1
  Author: dak180 
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
M build_tools/autorevision

  Log Message:
  ---
  Update the version of autorevision used.

Refs #3765.


  Commit: a2e49d0da29213d86638b2741a790968c6c4cf14
  
https://github.com/Warzone2100/warzone2100/commit/a2e49d0da29213d86638b2741a790968c6c4cf14
  Author: vexed 
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
M build_tools/autorevision.bat

  Log Message:
  ---
  Fix batch file for new autorevision script in 
83c71993920c196bcdcc1591b985964514c18da7

close ticket:3765


  Commit: 1f1e6c413113619b54e38b922423441886102ac6
  
https://github.com/Warzone2100/warzone2100/commit/1f1e6c413113619b54e38b922423441886102ac6
  Author: dak180 
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
R build_tools/autorevision.sh

  Log Message:
  ---
  Remove outdated and no longer used autorevision script.


  Commit: 85ec3010ca87e4d38233d8f67b9ed795243317c5
  
https://github.com/Warzone2100/warzone2100/commit/85ec3010ca87e4d38233d8f67b9ed795243317c5
  Author: cybersphinx 
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
M Makefile.am

  Log Message:
  ---
  Don't try to ship the removed autorevision.sh.


  Commit: fdce6122589de5a9ba5c5b0a162c541cd64e1da6
  
https://github.com/Warzone2100/warzone2100/commit/fdce6122589de5a9ba5c5b0a162c541cd64e1da6
  Author: cybersphinx 
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Update translations.


  Commit: 182e8845528ca1593510112171ea5fdf95bab699
  
https://github.com/Warzone2100/warzone2100/commit/182e8845528ca1593510112171ea5fdf95bab699
  Author: cybersphinx 
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
M Makefile.am
M src/Makefile.am
M tools/map/Makefile.am

  Log Message:
  ---
  Rename autorevision.tmp to src/autorevision.cache.

Also remove another stray backslash, now make distcheck should work
again.


  Commit: 33ce86fbc42666427a3745aa17c0bd36d961066b
  
https://github.com/Warzone2100/warzone2100/commit/33ce86fbc42666427a3745aa17c0bd36d961066b
  Author: Per Inge Mathisen 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update changelog


  Commit: 6b4dfccb23d97e00bb6c45b0cd3edacdb05013f6
  
https://github.com/Warzone2100/warzone2100/commit/6b4dfccb23d97e00bb6c45b0cd3edacdb05013f6
  Author: Per Inge Mathisen 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M src/structure.cpp

  Log Message:
  ---
  Try not to crash if a factory loses its production flag. Workaround for bug 
in ticket:3768.


  Commit: 40b3e02ffc1c17b25e65f5f75ac6644608f38557
  
https://github.com/Warzone2100/warzone2100/commit/40b3e02ffc1c17b25e65f5f75ac6644608f38557
  Author: automerge 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M .gitignore
M ChangeLog
M Makefile.am
A build_tools/autorevision
M bui

[Warzone2100-commits] [Warzone2100/warzone2100] b5fc70: Update the mac doc bundle.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b5fc703e6f77c5371879520dddf22d329708504e
  
https://github.com/Warzone2100/warzone2100/commit/b5fc703e6f77c5371879520dddf22d329708504e
  Author: dak180 
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh

  Log Message:
  ---
  Update the mac doc bundle.


  Commit: d0c8eb7cd1f7fbce25d83107c772a14ca1a0956e
  
https://github.com/Warzone2100/warzone2100/commit/d0c8eb7cd1f7fbce25d83107c772a14ca1a0956e
  Author: Per Inge Mathisen 
  Date:   2012-11-03 (Sat, 03 Nov 2012)

  Changed paths:
M ChangeLog
M data/mp/multiplay/skirmish/semperfi.js
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  qtscript: Rename getStructureCount to countStruct. Add countDroid(player) as 
well.
Backport the ALL_PLAYERS, ENEMIES and ALLIES defines from master.


  Commit: 64a3ec20beb0756a30048334b4a7858777d978f3
  
https://github.com/Warzone2100/warzone2100/commit/64a3ec20beb0756a30048334b4a7858777d978f3
  Author: Per Inge Mathisen 
  Date:   2012-11-03 (Sat, 03 Nov 2012)

  Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh

  Log Message:
  ---
  Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes


  Commit: 13b07b78dd85da1889843164d390ccb9d0a8f62b
  
https://github.com/Warzone2100/warzone2100/commit/13b07b78dd85da1889843164d390ccb9d0a8f62b
  Author: Per Inge Mathisen 
  Date:   2012-11-03 (Sat, 03 Nov 2012)

  Changed paths:
M src/game.cpp

  Log Message:
  ---
  Factories are no longer becoming more powerful with each save/load cycle. 
Fixes part of ticket:3732


  Commit: def9fb81c34a7c6d3c343c659507ed1b6f40f5ee
  
https://github.com/Warzone2100/warzone2100/commit/def9fb81c34a7c6d3c343c659507ed1b6f40f5ee
  Author: Per Inge Mathisen 
  Date:   2012-11-04 (Sun, 04 Nov 2012)

  Changed paths:
M data/mp/multiplay/skirmish/semperfi.js
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  qtscript: Change countDroid function to countDroid(droid type[, player]. Type 
can
be one of DROID_ANY, DROID_CONSTRUCT or DROID_COMMAND. Make use of it in 
semperfi-js.


  Commit: f8c38a6365293f08dc7b92154d3d8eea58cba021
  
https://github.com/Warzone2100/warzone2100/commit/f8c38a6365293f08dc7b92154d3d8eea58cba021
  Author: Per Inge Mathisen 
  Date:   2012-11-04 (Sun, 04 Nov 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update changelog


  Commit: b782d21b5ed1d9b293e59317b99e09ac0786aa09
  
https://github.com/Warzone2100/warzone2100/commit/b782d21b5ed1d9b293e59317b99e09ac0786aa09
  Author: Per Inge Mathisen 
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
M src/droiddef.h
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  qtscript: Add DROID_ANY enum, for use with countDroid().


  Commit: 584fb55c99ed46a14b2e302e9991b03fb3c00863
  
https://github.com/Warzone2100/warzone2100/commit/584fb55c99ed46a14b2e302e9991b03fb3c00863
  Author: automerge 
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
M ChangeLog
M data/mp/multiplay/skirmish/semperfi.js
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M src/droiddef.h
M src/game.cpp
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/5997d959c6f3...584fb55c99ed
--
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] b8bff8: qtscript: Fix origin player in countDroid and coun...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b8bff89841db06aecca47264bb43dd7ac5cdaf9a
  
https://github.com/Warzone2100/warzone2100/commit/b8bff89841db06aecca47264bb43dd7ac5cdaf9a
  Author: Per Inge Mathisen 
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  qtscript: Fix origin player in countDroid and countStruct for enum parameters.


  Commit: a2e69a8a2e14c7173d615a78455464a6f264b3a3
  
https://github.com/Warzone2100/warzone2100/commit/a2e69a8a2e14c7173d615a78455464a6f264b3a3
  Author: Per Inge Mathisen 
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
M data/mp/multiplay/skirmish/nullbot-generic.js.inc
M data/mp/multiplay/skirmish/nullbot-header.js.inc
M data/mp/multiplay/skirmish/nullbot-main.js.inc

  Log Message:
  ---
  Update NoQ's NullBot to latest version.


  Commit: 0f7ce13ad2d70c17b5cfb252891c8e6ee3157bc8
  
https://github.com/Warzone2100/warzone2100/commit/0f7ce13ad2d70c17b5cfb252891c8e6ee3157bc8
  Author: automerge 
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
M data/mp/multiplay/skirmish/nullbot-generic.js.inc
M data/mp/multiplay/skirmish/nullbot-header.js.inc
M data/mp/multiplay/skirmish/nullbot-main.js.inc

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/fdf2db19fcb5...0f7ce13ad2d7
--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] b8bff8: qtscript: Fix origin player in countDroid and coun...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b8bff89841db06aecca47264bb43dd7ac5cdaf9a
  
https://github.com/Warzone2100/warzone2100/commit/b8bff89841db06aecca47264bb43dd7ac5cdaf9a
  Author: Per Inge Mathisen 
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  qtscript: Fix origin player in countDroid and countStruct for enum parameters.


  Commit: a2e69a8a2e14c7173d615a78455464a6f264b3a3
  
https://github.com/Warzone2100/warzone2100/commit/a2e69a8a2e14c7173d615a78455464a6f264b3a3
  Author: Per Inge Mathisen 
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
M data/mp/multiplay/skirmish/nullbot-generic.js.inc
M data/mp/multiplay/skirmish/nullbot-header.js.inc
M data/mp/multiplay/skirmish/nullbot-main.js.inc

  Log Message:
  ---
  Update NoQ's NullBot to latest version.


  Commit: 217c5cd459f4710d552baf157a688878ac097965
  
https://github.com/Warzone2100/warzone2100/commit/217c5cd459f4710d552baf157a688878ac097965
  Author: automerge 
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
M data/mp/multiplay/skirmish/nullbot-generic.js.inc
M data/mp/multiplay/skirmish/nullbot-header.js.inc
M data/mp/multiplay/skirmish/nullbot-main.js.inc
M src/qtscriptfuncs.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/584fb55c99ed...217c5cd459f4
--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] ffda8b: Brazilian translation update by Tucalipe.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: ffda8b2103249c3956dc5f42bb75c2cc3084ecf7
  
https://github.com/Warzone2100/warzone2100/commit/ffda8b2103249c3956dc5f42bb75c2cc3084ecf7
  Author: cybersphinx 
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
M po/pt_BR.po

  Log Message:
  ---
  Brazilian translation update by Tucalipe.

Closes #3785.


  Commit: 9bddcfd4b2fc4515e169020fa7d3d20d535305e4
  
https://github.com/Warzone2100/warzone2100/commit/9bddcfd4b2fc4515e169020fa7d3d20d535305e4
  Author: automerge 
  Date:   2012-11-18 (Sun, 18 Nov 2012)

  Changed paths:
M po/pt_BR.po

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/b017fd546c6c...9bddcfd4b2fc
--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] ffda8b: Brazilian translation update by Tucalipe.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: ffda8b2103249c3956dc5f42bb75c2cc3084ecf7
  
https://github.com/Warzone2100/warzone2100/commit/ffda8b2103249c3956dc5f42bb75c2cc3084ecf7
  Author: cybersphinx 
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
M po/pt_BR.po

  Log Message:
  ---
  Brazilian translation update by Tucalipe.

Closes #3785.


  Commit: 85caeb106c55c6bf74b945949bb7fd78c368a917
  
https://github.com/Warzone2100/warzone2100/commit/85caeb106c55c6bf74b945949bb7fd78c368a917
  Author: automerge 
  Date:   2012-11-18 (Sun, 18 Nov 2012)

  Changed paths:
M po/pt_BR.po

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/217c5cd459f4...85caeb106c55
--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 978ed8: Abort autogen.sh when automake 1.12+ is found.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 978ed8f1f90544162c327f334bd590cd7b944ce1
  
https://github.com/Warzone2100/warzone2100/commit/978ed8f1f90544162c327f334bd590cd7b944ce1
  Author: cybersphinx 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M autogen.sh

  Log Message:
  ---
  Abort autogen.sh when automake 1.12+ is found.

Refs #3538.


  Commit: 8029fc5d8587ee496c29b960869632f231ad296f
  
https://github.com/Warzone2100/warzone2100/commit/8029fc5d8587ee496c29b960869632f231ad296f
  Author: cybersphinx 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3802.


  Commit: 3f1d0abc7ec8b315afbe46fc76a706a5a0b8b430
  
https://github.com/Warzone2100/warzone2100/commit/3f1d0abc7ec8b315afbe46fc76a706a5a0b8b430
  Author: cybersphinx 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M po/de.po

  Log Message:
  ---
  German translation update by Kreuvf.

Closes #3808.


  Commit: b5588d8eb37b52d4159644cc63c06be3875ff468
  
https://github.com/Warzone2100/warzone2100/commit/b5588d8eb37b52d4159644cc63c06be3875ff468
  Author: automerge 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M autogen.sh
M po/de.po
M po/hu.po

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/f71447663846...b5588d8eb37b
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 978ed8: Abort autogen.sh when automake 1.12+ is found.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 978ed8f1f90544162c327f334bd590cd7b944ce1
  
https://github.com/Warzone2100/warzone2100/commit/978ed8f1f90544162c327f334bd590cd7b944ce1
  Author: cybersphinx 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M autogen.sh

  Log Message:
  ---
  Abort autogen.sh when automake 1.12+ is found.

Refs #3538.


  Commit: 8029fc5d8587ee496c29b960869632f231ad296f
  
https://github.com/Warzone2100/warzone2100/commit/8029fc5d8587ee496c29b960869632f231ad296f
  Author: cybersphinx 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M po/hu.po

  Log Message:
  ---
  Hungarian translation update by mtomi78.

Closes #3802.


  Commit: 3f1d0abc7ec8b315afbe46fc76a706a5a0b8b430
  
https://github.com/Warzone2100/warzone2100/commit/3f1d0abc7ec8b315afbe46fc76a706a5a0b8b430
  Author: cybersphinx 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M po/de.po

  Log Message:
  ---
  German translation update by Kreuvf.

Closes #3808.


  Commit: 1ee70ff4e323141df132e81f5bc39b2cb7e5ba18
  
https://github.com/Warzone2100/warzone2100/commit/1ee70ff4e323141df132e81f5bc39b2cb7e5ba18
  Author: automerge 
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
M autogen.sh
M po/de.po
M po/hu.po

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/65ae74261d63...1ee70ff4e323
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 1fd703: Replace unix-style paths with platform-specific pa...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 1fd7036f25949dfd465e8ac2e694f7c32c63f6cf
  
https://github.com/Warzone2100/warzone2100/commit/1fd7036f25949dfd465e8ac2e694f7c32c63f6cf
  Author: Per Inge Mathisen 
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
M src/init.cpp

  Log Message:
  ---
  Replace unix-style paths with platform-specific paths when adding
mapmod paths to search paths. This should fix ticket:3759. Patch
by crabster, modified by me.


  Commit: 06d971e0e3018da85fcc7137379a1055e4219b7b
  
https://github.com/Warzone2100/warzone2100/commit/06d971e0e3018da85fcc7137379a1055e4219b7b
  Author: Per Inge Mathisen 
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
M src/frontend.cpp

  Log Message:
  ---
  Fix menu small text alignment issues. Had to remove some explanatory
text from front menu. Changed screaming caps to sane capitalization.


  Commit: d6983eb5f76cc9b7d454a1f73ed4bb45c2ba2bec
  
https://github.com/Warzone2100/warzone2100/commit/d6983eb5f76cc9b7d454a1f73ed4bb45c2ba2bec
  Author: Per Inge Mathisen 
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update changelog


  Commit: ec12de48886b14574201374cd40d1c362a5234a0
  
https://github.com/Warzone2100/warzone2100/commit/ec12de48886b14574201374cd40d1c362a5234a0
  Author: Per Inge Mathisen 
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
M tests/Makefile.am

  Log Message:
  ---
  Remove qtscript test from 'make check' for now. Closes ticket:3500.


  Commit: 1263eb28557ae3ef4f7da578a28d0a596ea753d0
  
https://github.com/Warzone2100/warzone2100/commit/1263eb28557ae3ef4f7da578a28d0a596ea753d0
  Author: mastersharp 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M src/objmem.cpp

  Log Message:
  ---
  Commanders are now loaded properly from a savegame.

Fixes #3571


  Commit: ca899f8f2b845188fbd9018eccbb19bd7b81f24d
  
https://github.com/Warzone2100/warzone2100/commit/ca899f8f2b845188fbd9018eccbb19bd7b81f24d
  Author: vexed 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Prevent (possible) array overflow


  Commit: c3babeb85984746ee55f4cf79227646753c3e5fe
  
https://github.com/Warzone2100/warzone2100/commit/c3babeb85984746ee55f4cf79227646753c3e5fe
  Author: vexed 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  May help in debugging physfs issues, this is right when we tell the game to 
launch. (--debug=wz needed to show the output)


  Commit: 7866823c3cda3eca251f706d80770eee20db5dd2
  
https://github.com/Warzone2100/warzone2100/commit/7866823c3cda3eca251f706d80770eee20db5dd2
  Author: vexed 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Time to release 3.1.0


  Commit: acdc3a2db17f5a6539167b4a15d9d63d5a276c6b
  
https://github.com/Warzone2100/warzone2100/commit/acdc3a2db17f5a6539167b4a15d9d63d5a276c6b
  Author: dak180 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh

  Log Message:
  ---
  Update the mac doc bundle.


  Commit: 5d7a773917b618ec675016deb896531e77c6376a
  
https://github.com/Warzone2100/warzone2100/commit/5d7a773917b618ec675016deb896531e77c6376a
  Author: automerge 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M ChangeLog
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M src/frontend.cpp
M src/init.cpp
M src/multiint.cpp
M src/objmem.cpp
M tests/Makefile.am

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/5b35820ba9de...5d7a773917b6
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] acdc3a: Update the mac doc bundle.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: acdc3a2db17f5a6539167b4a15d9d63d5a276c6b
  
https://github.com/Warzone2100/warzone2100/commit/acdc3a2db17f5a6539167b4a15d9d63d5a276c6b
  Author: dak180 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh

  Log Message:
  ---
  Update the mac doc bundle.


  Commit: 41eac5ecbf22e65f3bef2a22517d371a4d2d2907
  
https://github.com/Warzone2100/warzone2100/commit/41eac5ecbf22e65f3bef2a22517d371a4d2d2907
  Author: automerge 
  Date:   2012-12-09 (Sun, 09 Dec 2012)

  Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/c93e41431078...41eac5ecbf22
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] b2c7d4: Also check if vertex array is supported on restori...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b2c7d45ceee294cf7a2696e1c3e57a9a8863ecc6
  
https://github.com/Warzone2100/warzone2100/commit/b2c7d45ceee294cf7a2696e1c3e57a9a8863ecc6
  Author: Per Inge Mathisen 
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
M 3rdparty/quesoglc/misc.c

  Log Message:
  ---
  Also check if vertex array is supported on restoring GL state, not just 
saving it.
This removes OpenGL errors reported repeatedly, and closes ticket:3834.


  Commit: 9b080d78d34cf1831f39aaab0a3da9774cdf5ed5
  
https://github.com/Warzone2100/warzone2100/commit/9b080d78d34cf1831f39aaab0a3da9774cdf5ed5
  Author: automerge 
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/8fd88edcc2ad...9b080d78d34c
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] b2c7d4: Also check if vertex array is supported on restori...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b2c7d45ceee294cf7a2696e1c3e57a9a8863ecc6
  
https://github.com/Warzone2100/warzone2100/commit/b2c7d45ceee294cf7a2696e1c3e57a9a8863ecc6
  Author: Per Inge Mathisen 
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
M 3rdparty/quesoglc/misc.c

  Log Message:
  ---
  Also check if vertex array is supported on restoring GL state, not just 
saving it.
This removes OpenGL errors reported repeatedly, and closes ticket:3834.


  Commit: c7c23e5a27880bed56abebdb809b0c1d0c9bb2e3
  
https://github.com/Warzone2100/warzone2100/commit/c7c23e5a27880bed56abebdb809b0c1d0c9bb2e3
  Author: automerge 
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
M 3rdparty/quesoglc/misc.c

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/019007d58501...c7c23e5a2788
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 840321: Clean up a few scripts.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 840321dc342e7a67e6bc40555f0b62ad9a705278
  
https://github.com/Warzone2100/warzone2100/commit/840321dc342e7a67e6bc40555f0b62ad9a705278
  Author: dak180 
  Date:   2012-12-21 (Fri, 21 Dec 2012)

  Changed paths:
M .gitignore
M macosx/configs/autorevision.sh
M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Clean up a few scripts.


  Commit: 27d9546f81374af73c600b159275b05e79ecc6e5
  
https://github.com/Warzone2100/warzone2100/commit/27d9546f81374af73c600b159275b05e79ecc6e5
  Author: dak180 
  Date:   2012-12-22 (Sat, 22 Dec 2012)

  Changed paths:
M macosx/configs/Project-All.xcconfig

  Log Message:
  ---
  Future proof building on later xcodes.


  Commit: 4e2f4bbf3cd5e03e58b9b67fcf370bff088e6d91
  
https://github.com/Warzone2100/warzone2100/commit/4e2f4bbf3cd5e03e58b9b67fcf370bff088e6d91
  Author: Cyp 
  Date:   2012-12-23 (Sun, 23 Dec 2012)

  Changed paths:
M data/base/images/intfac/image_ord_repair1down.png
M data/base/images/intfac/image_ord_repair1up.png
M data/base/images/intfac/image_ord_repair2down.png
M data/base/images/intfac/image_ord_repair2up.png

  Log Message:
  ---
  images: Make retreat setting buttons show colours of health bars.

New images by aubergine.


  Commit: 0540be80580789d379ae456c3eb31c471f688bab
  
https://github.com/Warzone2100/warzone2100/commit/0540be80580789d379ae456c3eb31c471f688bab
  Author: automerge 
  Date:   2012-12-23 (Sun, 23 Dec 2012)

  Changed paths:
M .gitignore
M data/base/images/intfac/image_ord_repair1down.png
M data/base/images/intfac/image_ord_repair1up.png
M data/base/images/intfac/image_ord_repair2down.png
M data/base/images/intfac/image_ord_repair2up.png
M macosx/configs/Project-All.xcconfig
M macosx/configs/autorevision.sh
M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/3b766d7043d6...0540be805807
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 840321: Clean up a few scripts.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 840321dc342e7a67e6bc40555f0b62ad9a705278
  
https://github.com/Warzone2100/warzone2100/commit/840321dc342e7a67e6bc40555f0b62ad9a705278
  Author: dak180 
  Date:   2012-12-21 (Fri, 21 Dec 2012)

  Changed paths:
M .gitignore
M macosx/configs/autorevision.sh
M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Clean up a few scripts.


  Commit: 27d9546f81374af73c600b159275b05e79ecc6e5
  
https://github.com/Warzone2100/warzone2100/commit/27d9546f81374af73c600b159275b05e79ecc6e5
  Author: dak180 
  Date:   2012-12-22 (Sat, 22 Dec 2012)

  Changed paths:
M macosx/configs/Project-All.xcconfig

  Log Message:
  ---
  Future proof building on later xcodes.


  Commit: 4e2f4bbf3cd5e03e58b9b67fcf370bff088e6d91
  
https://github.com/Warzone2100/warzone2100/commit/4e2f4bbf3cd5e03e58b9b67fcf370bff088e6d91
  Author: Cyp 
  Date:   2012-12-23 (Sun, 23 Dec 2012)

  Changed paths:
M data/base/images/intfac/image_ord_repair1down.png
M data/base/images/intfac/image_ord_repair1up.png
M data/base/images/intfac/image_ord_repair2down.png
M data/base/images/intfac/image_ord_repair2up.png

  Log Message:
  ---
  images: Make retreat setting buttons show colours of health bars.

New images by aubergine.


  Commit: 340bb5248c662ddec14c132c0aeecc4834741779
  
https://github.com/Warzone2100/warzone2100/commit/340bb5248c662ddec14c132c0aeecc4834741779
  Author: automerge 
  Date:   2012-12-23 (Sun, 23 Dec 2012)

  Changed paths:
M .gitignore
M data/base/images/intfac/image_ord_repair1down.png
M data/base/images/intfac/image_ord_repair1up.png
M data/base/images/intfac/image_ord_repair2down.png
M data/base/images/intfac/image_ord_repair2up.png
M macosx/configs/Project-All.xcconfig
M macosx/configs/autorevision.sh
M macosx/configs/mkdmgs.sh

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/c7c23e5a2788...340bb5248c66
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] bf5834: Do not update autorevision.h's time stamp if the c...

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: bf5834bb480b86df460c3510895541eed62a1bbb
  
https://github.com/Warzone2100/warzone2100/commit/bf5834bb480b86df460c3510895541eed62a1bbb
  Author: dak180 
  Date:   2013-01-03 (Thu, 03 Jan 2013)

  Changed paths:
M macosx/configs/autorevision.sh

  Log Message:
  ---
  Do not update autorevision.h's time stamp if the content has not changed.

Also rewrite the driving script for more clarity.


  Commit: 4fbbeb5a1004041fa42aa5f0ffb55e4ddcc9fb6d
  
https://github.com/Warzone2100/warzone2100/commit/4fbbeb5a1004041fa42aa5f0ffb55e4ddcc9fb6d
  Author: automerge 
  Date:   2013-01-03 (Thu, 03 Jan 2013)

  Changed paths:
M macosx/configs/autorevision.sh

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/57cc1f4f3b47...4fbbeb5a1004
--
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] bf5834: Do not update autorevision.h's time stamp if the c...

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: bf5834bb480b86df460c3510895541eed62a1bbb
  
https://github.com/Warzone2100/warzone2100/commit/bf5834bb480b86df460c3510895541eed62a1bbb
  Author: dak180 
  Date:   2013-01-03 (Thu, 03 Jan 2013)

  Changed paths:
M macosx/configs/autorevision.sh

  Log Message:
  ---
  Do not update autorevision.h's time stamp if the content has not changed.

Also rewrite the driving script for more clarity.


  Commit: e122f8bc555678a66b63389bec26676ff4392f48
  
https://github.com/Warzone2100/warzone2100/commit/e122f8bc555678a66b63389bec26676ff4392f48
  Author: automerge 
  Date:   2013-01-03 (Thu, 03 Jan 2013)

  Changed paths:
M macosx/configs/autorevision.sh

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/340bb5248c66...e122f8bc5556
--
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 40cbe8: cleanup: Remove some unused defines.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 40cbe8067b4b6d68e3a0d71a2fdf8ccd1101a44a
  
https://github.com/Warzone2100/warzone2100/commit/40cbe8067b4b6d68e3a0d71a2fdf8ccd1101a44a
  Author: Cyp 
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
M lib/framework/frameresource.cpp
M lib/framework/frameresource.h
M lib/framework/macros.h
M lib/gamelib/anim.h
M lib/gamelib/animobj.cpp
M lib/gamelib/gtime.cpp
M lib/ivis_opengl/imd.h
M lib/ivis_opengl/pieblitfunc.h
M lib/ivis_opengl/piedraw.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/script/script.cpp
M lib/widget/editbox.cpp
M lib/widget/widgbase.h
M src/action.cpp
M src/atmos.cpp
M src/combat.cpp
M src/design.cpp
M src/design.h
M src/display.h
M src/display3d.h
M src/display3ddef.h
M src/droiddef.h
M src/effects.cpp
M src/feature.cpp
M src/game.h
M src/hci.h
M src/ingameop.h
M src/intdisplay.cpp
M src/intdisplay.h
M src/intelmap.cpp
M src/intelmap.h
M src/keymap.h
M src/lighting.h
M src/map.cpp
M src/mission.cpp
M src/move.cpp
M src/multiint.h
M src/multimenu.cpp
M src/multimenu.h
M src/scores.cpp
M src/seqdisp.h
M src/statsdef.h
M src/structure.cpp
M src/structure.h
M src/texture.cpp
M src/transporter.cpp
M src/visibility.cpp
M src/warcam.cpp

  Log Message:
  ---
  cleanup: Remove some unused defines.


  Commit: 781a81c94bb0df46f4475ca409e43f40a22e95c9
  
https://github.com/Warzone2100/warzone2100/commit/781a81c94bb0df46f4475ca409e43f40a22e95c9
  Author: Subsentient 
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Fix GUI bug where scav button pretends to be clickable even when not the host.


  Commit: d24719344d05d178e542f6746acc8b010f679f12
  
https://github.com/Warzone2100/warzone2100/commit/d24719344d05d178e542f6746acc8b010f679f12
  Author: automerge 
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
M lib/framework/frameresource.cpp
M lib/framework/frameresource.h
M lib/framework/macros.h
M lib/gamelib/anim.h
M lib/gamelib/animobj.cpp
M lib/gamelib/gtime.cpp
M lib/ivis_opengl/imd.h
M lib/ivis_opengl/pieblitfunc.h
M lib/ivis_opengl/piedraw.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/script/script.cpp
M lib/widget/editbox.cpp
M lib/widget/widgbase.h
M src/action.cpp
M src/atmos.cpp
M src/combat.cpp
M src/design.cpp
M src/design.h
M src/display.h
M src/display3d.h
M src/display3ddef.h
M src/droiddef.h
M src/effects.cpp
M src/feature.cpp
M src/game.h
M src/hci.h
M src/ingameop.h
M src/intdisplay.cpp
M src/intdisplay.h
M src/intelmap.cpp
M src/intelmap.h
M src/keymap.h
M src/lighting.h
M src/map.cpp
M src/mission.cpp
M src/move.cpp
M src/multiint.cpp
M src/multiint.h
M src/multimenu.cpp
M src/multimenu.h
M src/scores.cpp
M src/seqdisp.h
M src/statsdef.h
M src/structure.cpp
M src/structure.h
M src/texture.cpp
M src/transporter.cpp
M src/visibility.cpp
M src/warcam.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/348cdfcda829...d24719344d05
--
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] 40cbe8: cleanup: Remove some unused defines.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 40cbe8067b4b6d68e3a0d71a2fdf8ccd1101a44a
  
https://github.com/Warzone2100/warzone2100/commit/40cbe8067b4b6d68e3a0d71a2fdf8ccd1101a44a
  Author: Cyp 
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
M lib/framework/frameresource.cpp
M lib/framework/frameresource.h
M lib/framework/macros.h
M lib/gamelib/anim.h
M lib/gamelib/animobj.cpp
M lib/gamelib/gtime.cpp
M lib/ivis_opengl/imd.h
M lib/ivis_opengl/pieblitfunc.h
M lib/ivis_opengl/piedraw.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/script/script.cpp
M lib/widget/editbox.cpp
M lib/widget/widgbase.h
M src/action.cpp
M src/atmos.cpp
M src/combat.cpp
M src/design.cpp
M src/design.h
M src/display.h
M src/display3d.h
M src/display3ddef.h
M src/droiddef.h
M src/effects.cpp
M src/feature.cpp
M src/game.h
M src/hci.h
M src/ingameop.h
M src/intdisplay.cpp
M src/intdisplay.h
M src/intelmap.cpp
M src/intelmap.h
M src/keymap.h
M src/lighting.h
M src/map.cpp
M src/mission.cpp
M src/move.cpp
M src/multiint.h
M src/multimenu.cpp
M src/multimenu.h
M src/scores.cpp
M src/seqdisp.h
M src/statsdef.h
M src/structure.cpp
M src/structure.h
M src/texture.cpp
M src/transporter.cpp
M src/visibility.cpp
M src/warcam.cpp

  Log Message:
  ---
  cleanup: Remove some unused defines.


  Commit: 781a81c94bb0df46f4475ca409e43f40a22e95c9
  
https://github.com/Warzone2100/warzone2100/commit/781a81c94bb0df46f4475ca409e43f40a22e95c9
  Author: Subsentient 
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
M src/multiint.cpp

  Log Message:
  ---
  Fix GUI bug where scav button pretends to be clickable even when not the host.


  Commit: 63f8e6e0c76b41ce4014e5c3b686d90a0d9a36cc
  
https://github.com/Warzone2100/warzone2100/commit/63f8e6e0c76b41ce4014e5c3b686d90a0d9a36cc
  Author: automerge 
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
M lib/framework/frameresource.cpp
M lib/framework/frameresource.h
M lib/framework/macros.h
M lib/gamelib/anim.h
M lib/gamelib/animobj.cpp
M lib/gamelib/gtime.cpp
M lib/ivis_opengl/imd.h
M lib/ivis_opengl/pieblitfunc.h
M lib/ivis_opengl/piedraw.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/script/script.cpp
M lib/widget/editbox.cpp
M lib/widget/widgbase.h
M src/action.cpp
M src/atmos.cpp
M src/combat.cpp
M src/design.cpp
M src/design.h
M src/display.h
M src/display3d.h
M src/display3ddef.h
M src/droiddef.h
M src/effects.cpp
M src/feature.cpp
M src/game.h
M src/hci.h
M src/ingameop.h
M src/intdisplay.cpp
M src/intdisplay.h
M src/intelmap.cpp
M src/intelmap.h
M src/keymap.h
M src/lighting.h
M src/map.cpp
M src/mission.cpp
M src/move.cpp
M src/multiint.cpp
M src/multiint.h
M src/multimenu.cpp
M src/multimenu.h
M src/scores.cpp
M src/seqdisp.h
M src/statsdef.h
M src/structure.cpp
M src/structure.h
M src/texture.cpp
M src/transporter.cpp
M src/visibility.cpp
M src/warcam.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/eb62730d7846...63f8e6e0c76b
--
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] cb2b66: Remove shadow parts from a few models.

[automerge]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: cb2b66f3a812394fcf662e63a5cf155ac55fcd80
  
https://github.com/Warzone2100/warzone2100/commit/cb2b66f3a812394fcf662e63a5cf155ac55fcd80
  Author: cybersphinx 
  Date:   2013-01-12 (Sat, 12 Jan 2013)

  Changed paths:
M data/base/features/blbrhut1.pie
M data/base/features/blfactrd.pie
M data/base/features/blware1.pie
M data/base/features/blware2.pie
M data/base/features/blware3.pie
M data/base/features/mioil.pie
M data/base/features/mioiltow.pie
M data/base/features/miwatow.pie

  Log Message:
  ---
  Remove shadow parts from a few models.


  Commit: 7d928f109c600e51a6eb72da463a35f4d9e3f78d
  
https://github.com/Warzone2100/warzone2100/commit/7d928f109c600e51a6eb72da463a35f4d9e3f78d
  Author: cybersphinx 
  Date:   2013-01-12 (Sat, 12 Jan 2013)

  Changed paths:
M data/base/features/micrane.pie

  Log Message:
  ---
  Remove another "shadow".


  Commit: c855c90c8135f217079dc4c3c379951eae5bbb70
  
https://github.com/Warzone2100/warzone2100/commit/c855c90c8135f217079dc4c3c379951eae5bbb70
  Author: dak180 
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
M lib/sound/oggvorbis.cpp
M macosx/configs/Warzone-All.xcconfig

  Log Message:
  ---
  Move the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.


  Commit: ccc2a07bd3b7c91a1ea398c17b092ed45b07d988
  
https://github.com/Warzone2100/warzone2100/commit/ccc2a07bd3b7c91a1ea398c17b092ed45b07d988
  Author: automerge 
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
M data/base/features/blbrhut1.pie
M data/base/features/blfactrd.pie
M data/base/features/blware1.pie
M data/base/features/blware2.pie
M data/base/features/blware3.pie
M data/base/features/micrane.pie
M data/base/features/mioil.pie
M data/base/features/mioiltow.pie
M data/base/features/miwatow.pie
M lib/sound/oggvorbis.cpp
M macosx/configs/Warzone-All.xcconfig

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/2b31f828a65e...ccc2a07bd3b7
--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

[Warzone2100-commits] [Warzone2100/warzone2100] cb2b66: Remove shadow parts from a few models.

[automerge]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: cb2b66f3a812394fcf662e63a5cf155ac55fcd80
  
https://github.com/Warzone2100/warzone2100/commit/cb2b66f3a812394fcf662e63a5cf155ac55fcd80
  Author: cybersphinx 
  Date:   2013-01-12 (Sat, 12 Jan 2013)

  Changed paths:
M data/base/features/blbrhut1.pie
M data/base/features/blfactrd.pie
M data/base/features/blware1.pie
M data/base/features/blware2.pie
M data/base/features/blware3.pie
M data/base/features/mioil.pie
M data/base/features/mioiltow.pie
M data/base/features/miwatow.pie

  Log Message:
  ---
  Remove shadow parts from a few models.


  Commit: 7d928f109c600e51a6eb72da463a35f4d9e3f78d
  
https://github.com/Warzone2100/warzone2100/commit/7d928f109c600e51a6eb72da463a35f4d9e3f78d
  Author: cybersphinx 
  Date:   2013-01-12 (Sat, 12 Jan 2013)

  Changed paths:
M data/base/features/micrane.pie

  Log Message:
  ---
  Remove another "shadow".


  Commit: c855c90c8135f217079dc4c3c379951eae5bbb70
  
https://github.com/Warzone2100/warzone2100/commit/c855c90c8135f217079dc4c3c379951eae5bbb70
  Author: dak180 
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
M lib/sound/oggvorbis.cpp
M macosx/configs/Warzone-All.xcconfig

  Log Message:
  ---
  Move the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.


  Commit: 9ce5be67962c18bd64273ba73c43c9c593f2c133
  
https://github.com/Warzone2100/warzone2100/commit/9ce5be67962c18bd64273ba73c43c9c593f2c133
  Author: automerge 
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
M data/base/features/blbrhut1.pie
M data/base/features/blfactrd.pie
M data/base/features/blware1.pie
M data/base/features/blware2.pie
M data/base/features/blware3.pie
M data/base/features/micrane.pie
M data/base/features/mioil.pie
M data/base/features/mioiltow.pie
M data/base/features/miwatow.pie
M lib/sound/oggvorbis.cpp
M macosx/configs/Warzone-All.xcconfig

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/63f8e6e0c76b...9ce5be67962c
--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits