Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b6834d18cb7a42a60675379ca99ae241cb65374e
      
https://github.com/Warzone2100/warzone2100/commit/b6834d18cb7a42a60675379ca99ae241cb65374e
  Author: Cyp <c...@wz2100.net>
  Date:   2012-04-22 (Sun, 22 Apr 2012)

  Changed paths:
    M src/move.cpp

  Log Message:
  -----------
  Add oil barrels on all clients.

Fixes desynch 10 minutes after picking up an oil barrel.

Introduced in 29966c5da299f944a0e52ab579d2b3a7ed8d3063.

Fixes ticket:3396 and ticket:3413.


  Commit: 5f7b477a4855e3dd8bd7c00e612b6ead8c4501e5
      
https://github.com/Warzone2100/warzone2100/commit/5f7b477a4855e3dd8bd7c00e612b6ead8c4501e5
  Author: Cyp <c...@wz2100.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/netplay/netplay.cpp

  Log Message:
  -----------
  Only send 2 desynch logs per player on desynch.

Reset desynch count between games.

Since sending 2 logs instead of 5, it should take less time for players to 
figure out
what is going on, when people have slow connections.


  Commit: a8f3d1ac50c67664699e39c079ef2f3996227328
      
https://github.com/Warzone2100/warzone2100/commit/a8f3d1ac50c67664699e39c079ef2f3996227328
  Author: Cyp <c...@wz2100.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/netplay/netsocket.cpp

  Log Message:
  -----------
  Add assertion against duplicate file descriptors.

Probably can't happen, but no idea why the send() call blocks when it shouldn't.


  Commit: 3dc5d8d79685a1ac1178f534b8b13c4c22f3046f
      
https://github.com/Warzone2100/warzone2100/commit/3dc5d8d79685a1ac1178f534b8b13c4c22f3046f
  Author: cybersphinx <chr....@gmx.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M icons/warzone2100.desktop

  Log Message:
  -----------
  Update custom translations.


  Commit: 01e38ca88cd0b95bff7697e3786d48ff84c4c220
      
https://github.com/Warzone2100/warzone2100/commit/01e38ca88cd0b95bff7697e3786d48ff84c4c220
  Author: cybersphinx <chr....@gmx.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    A po/generate-statistics-html.py
    A po/generate-statistics-text.sh

  Log Message:
  -----------
  Add scripts to generate translation statistics.

Text version by me, html version by Emdek. The CSS and flag images used
by the latter are in
https://github.com/Warzone2100/wz2100.net/blob/master/static.wz2100.net/htdocs/css/wztrac.css
and
https://github.com/Warzone2100/wz2100.net/tree/master/static.wz2100.net/htdocs/img/flags.


  Commit: cf77b27cac88231a321b7e9a45322516b798f0c4
      
https://github.com/Warzone2100/warzone2100/commit/cf77b27cac88231a321b7e9a45322516b798f0c4
  Author: cybersphinx <chr....@gmx.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M icons/warzone2100.desktop
    M lib/netplay/netplay.cpp
    M lib/netplay/netsocket.cpp
    A po/generate-statistics-html.py
    A po/generate-statistics-text.sh
    M src/move.cpp

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

* bugfixes:
  Add scripts to generate translation statistics.
  Update custom translations.
  Add assertion against duplicate file descriptors.
  Only send 2 desynch logs per player on desynch.
  Add oil barrels on all clients.


Compare: https://github.com/Warzone2100/warzone2100/compare/42024d9...cf77b27
------------------------------------------------------------------------------
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

Reply via email to