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

2012-05-07 Thread automerge
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 887eea8e704f39ef98cb6264484cb2612fb1dcce
  
https://github.com/Warzone2100/warzone2100/commit/887eea8e704f39ef98cb6264484cb2612fb1dcce
  Author: cybersphinx chr@gmx.net
  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 ve...@wz2100.net
  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 ve...@wz2100.net
  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 c...@wz2100.net
  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 c...@wz2100.net
  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 ve...@wz2100.net
  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 ve...@wz2100.net
  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 c...@wz2100.net
  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

2012-05-07 Thread automerge
  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c
  
https://github.com/Warzone2100/warzone2100/commit/c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c
  Author: vexed ve...@wz2100.net
  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 ve...@wz2100.net
  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 c...@wz2100.net
  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 c...@wz2100.net
  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 ve...@wz2100.net
  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 ve...@wz2100.net
  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 c...@wz2100.net
  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.

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

  Changed paths:
M po/hu.po

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

Closes #3458.



--
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] e36cdf: Fix tcmask on Plasmite Flamer, Sunburst AA and AA ...

2012-05-07 Thread Cyp
  Branch: refs/heads/bugfixes
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e36cdf11e827e85c79cbd9319507809c1fae838b
  
https://github.com/Warzone2100/warzone2100/commit/e36cdf11e827e85c79cbd9319507809c1fae838b
  Author: Cyp c...@wz2100.net
  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.



--
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