Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 451201e89a076cc5e839c126921bc1929b555b5e
      
https://github.com/Warzone2100/warzone2100/commit/451201e89a076cc5e839c126921bc1929b555b5e
  Author: vexed <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
  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: 83f7adecc9ec6d769f10ee4df2e7f8c75a84ecb8
      
https://github.com/Warzone2100/warzone2100/commit/83f7adecc9ec6d769f10ee4df2e7f8c75a84ecb8
  Author: Cyp <[email protected]>
  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: 466880e1cdbc5830210dc8eaaed5a2d0b7781d76
      
https://github.com/Warzone2100/warzone2100/commit/466880e1cdbc5830210dc8eaaed5a2d0b7781d76
  Author: cybersphinx <[email protected]>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M data/mp/multiplay/skirmish/rules.js

  Log Message:
  -----------
  Disable unit design when HQ gets destroyed in mp.

Fixes #3342.


  Commit: d0fc1e580d7fc57a5c10efabc764085835f45e51
      
https://github.com/Warzone2100/warzone2100/commit/d0fc1e580d7fc57a5c10efabc764085835f45e51
  Author: cybersphinx <[email protected]>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M data/mp/multiplay/skirmish/rules.js

  Log Message:
  -----------
  Make unit design/radar depend on the existence of an HQ, not the base setting.


  Commit: 183bb533609702f4cebcf02abfa994ca847edc2b
      
https://github.com/Warzone2100/warzone2100/commit/183bb533609702f4cebcf02abfa994ca847edc2b
  Author: cybersphinx <[email protected]>
  Date:   2012-03-26 (Mon, 26 Mar 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/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: a018ecdbb200dc6f83fc45f326ab82b60a78bdb1
      
https://github.com/Warzone2100/warzone2100/commit/a018ecdbb200dc6f83fc45f326ab82b60a78bdb1
  Author: cybersphinx <[email protected]>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M po/es.po

  Log Message:
  -----------
  Spanish translation update by Saberuneko.

Closes #3361.


  Commit: fad926f03bf05e2fda409930156753cde1c5c52a
      
https://github.com/Warzone2100/warzone2100/commit/fad926f03bf05e2fda409930156753cde1c5c52a
  Author: cybersphinx <[email protected]>
  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: 5e1740adf7c82a6ab203b3c88f8b65bbc2fae767
      
https://github.com/Warzone2100/warzone2100/commit/5e1740adf7c82a6ab203b3c88f8b65bbc2fae767
  Author: cybersphinx <[email protected]>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ChangeLog
  M configure.ac
  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 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/cheat.cpp
  M src/display.cpp
  M src/frend.h
  M src/keybind.cpp
  M src/keybind.h
  M src/loop.cpp
  M src/map.cpp
  M src/multiint.cpp
  M src/qtscriptfuncs.cpp

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

* bugfixes: (22 commits)
  Actually use the include from our included quesoglc.
  Spanish translation update by Saberuneko.
  Update translations.
  Make unit design/radar depend on the existence of an HQ, not the base setting.
  Disable unit design when HQ gets destroyed in mp.
  Avoid mixing up droid orders during lag.
  Don't bother even checking to send maps if not host.
  Handle host drop errors. Restart the background screen on errors (instead of 
looking at a small map preview)
  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 & ...
  Subtract closed slots from displayed max players.
  Distinguish between wrong version, wrong mod and full game.
  Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD.
  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.
  Try to fix the output of netlogs.
  Fix border on tooltips
  Try to switch to windowed mode if user is in FS mode on LOG_FATAL errors. 
This may, or may not work on some platforms. 
(http://www.libsdl.org/docs/html/sdlwmtogglefullscreen.html) "Toggles the 
application between windowed and fullscreen mode, if supported."
  Don't display repair icon if we are hovering the mouse over ourselves, and we 
are damaged.
  Update changelog
  Fix problem with continent generation, where rightmost and bottommost tiles 
would be treated as passable. Closes ticket:3269. Thanks to NoQ for debugging.
  Fix problem with trucks not being available before HQ. This closes 
ticket:3344 and closes ticket:3337 and adds new qtscript function 
enableTemplate(). Original patch by vexed.
  ...


Compare: https://github.com/Warzone2100/warzone2100/compare/951abc1...5e1740a
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to