Branch: refs/heads/master
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: 613b75c5baf4a54e5d014fcc307bd437c0543a61
https://github.com/Warzone2100/warzone2100/commit/613b75c5baf4a54e5d014fcc307bd437c0543a61
Author: automerge <[email protected]>
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
