Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: e9273ffdd66fdef69b3d6211259891b4910a9cff
https://github.com/Warzone2100/warzone2100/commit/e9273ffdd66fdef69b3d6211259891b4910a9cff
Author: cybersphinx <[email protected]>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M src/message.cpp
Log Message:
-----------
Reduce log spam for unknown messages.
Commit: e97a298155fa4422042be6a528c1a50cf57cc7f2
https://github.com/Warzone2100/warzone2100/commit/e97a298155fa4422042be6a528c1a50cf57cc7f2
Author: cybersphinx <[email protected]>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
A tools/conversion/rmsg2ini.php
Log Message:
-----------
Add .rmsg to .ini converter by Emdek.
Commit: c8dd2f173bda1469dbd20921ba0fab940e73037c
https://github.com/Warzone2100/warzone2100/commit/c8dd2f173bda1469dbd20921ba0fab940e73037c
Author: cybersphinx <[email protected]>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
A data/mp/messages/resmessages1.rmsg
A data/mp/messages/resmessages12.rmsg
A data/mp/messages/resmessages2.rmsg
A data/mp/messages/resmessages23.rmsg
A data/mp/messages/resmessages3.rmsg
A data/mp/messages/resmessagesall.rmsg
M src/research.cpp
Log Message:
-----------
Readd skirmish/mp research messages, converted to .ini.
Removed in 82f4369beffd89431b743492abb04a0684c67aec. Fixes #3085.
Commit: eefadf727ae4b0399e69b48f78268748ef10dfbd
https://github.com/Warzone2100/warzone2100/commit/eefadf727ae4b0399e69b48f78268748ef10dfbd
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M src/structure.cpp
Log Message:
-----------
Add syncDebug on changing factory commander.
Commit: fbc600ecdf9246a34038f58063baa2b460f6c984
https://github.com/Warzone2100/warzone2100/commit/fbc600ecdf9246a34038f58063baa2b460f6c984
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M src/mapgrid.h
M src/move.cpp
Log Message:
-----------
Fix gridStartIterate in moveCalcDroidSlide clobbered by the one in
moveShuffleDroid.
This caused crashes and probably general weird behaviour.
Introduced due to horrible grid system API involving global variables in
0b7605c4ee9464f5966a31d6523fb7e248f4323a.
Fixes ticket:3287 and ticket:3301.
Commit: 2b3362bd0e21d3909becde31aeb3055e2a4e743d
https://github.com/Warzone2100/warzone2100/commit/2b3362bd0e21d3909becde31aeb3055e2a4e743d
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M lib/netplay/netsocket.cpp
Log Message:
-----------
Initialise zlib input data to nothing on socket flush.
Fixes possible crash in zlib deflate routines when flushing sockets before any
data has
been written to the socket.
Seems to be reproducible if applying the following tmp queue commit, hosting a
game, and
joining it.
Commit: 2d67521f8413c63bfd131b25ecb845329e4bd602
https://github.com/Warzone2100/warzone2100/commit/2d67521f8413c63bfd131b25ecb845329e4bd602
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/netplay/nettypes.cpp
Log Message:
-----------
Allow using NETbeginEncode()/NETend() with tmp queues.
Clients actually get a game full message instead of a host has dropped
connection
message.
Don't double-pop NET_REJECTED messages when joining (which were sent to a
random socket
other than the joining client, anyway, due to being attempted to being sent to
tmp
queues). To reproduce, apply this patch to the host but not to the client.
Hopefully fixes ticket:3245 and ticket:3300.
Commit: b96a983fc9d94258841b6e0be3d2dacbc09cb5f2
https://github.com/Warzone2100/warzone2100/commit/b96a983fc9d94258841b6e0be3d2dacbc09cb5f2
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M lib/netplay/netplay.cpp
Log Message:
-----------
Set »ingame.JoiningInProgress[i] = false;« in NET_InitPlayer().
Avoids players seeing only flags, no player names or ready buttons, when
joining a
re-hosted game. The issue was MultiPlayerJoin() failing to send a NET_OPTIONS
message
via sendOptions().
Avoids the "Waiting for players" screen in single-player mode, after nearly
starting a
single-player skirmish game, going back, and loading a game instead.
Fixes ticket:3309.
Commit: 96258083c70ec7c877d3859f72b6d6ca4ae13660
https://github.com/Warzone2100/warzone2100/commit/96258083c70ec7c877d3859f72b6d6ca4ae13660
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M src/display3d.cpp
Log Message:
-----------
Show health as well as build progress when selecting incomplete enemy
structures.
Fixes ticket:3256.
Commit: f54529ae0a62b76db6c2bc65a74e60bb021a09e8
https://github.com/Warzone2100/warzone2100/commit/f54529ae0a62b76db6c2bc65a74e60bb021a09e8
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M src/transporter.cpp
Log Message:
-----------
Update droid height after unloading specific droid from transport.
For some weird reason, there are two completely different code paths for
unloading
all droids at once, or unloading one droid at a time. In the latter case, the
droid
height stayed as was whatever it was when it was loaded onto the transport. This
lead to levitating droids or droidmarines.
Fixes ticket:3169.
Commit: 8a964f12afbda6d6db25fad69ae1778ce7d3f841
https://github.com/Warzone2100/warzone2100/commit/8a964f12afbda6d6db25fad69ae1778ce7d3f841
Author: Cyp <[email protected]>
Date: 2012-03-16 (Fri, 16 Mar 2012)
Changed paths:
M src/display3d.cpp
M src/qtscriptfuncs.cpp
M src/structure.cpp
M src/structuredef.h
Log Message:
-----------
Remove unused SS_BEING_DEMOLISHED.
Structures being demolished had status SS_BEING_BUILT, not SS_BEING_DEMOLISHED.
Commit: 4d0b5d749bf0a845d16f6edb9d631b05ce0ac8b4
https://github.com/Warzone2100/warzone2100/commit/4d0b5d749bf0a845d16f6edb9d631b05ce0ac8b4
Author: Cyp <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/multiint.cpp
M src/multiplay.cpp
Log Message:
-----------
Show correct AI names, even when AI list differs from the host's.
Fixes ticket:3226.
Commit: c9a618cd821d02b47315c24f4fe0cacecbe04ecc
https://github.com/Warzone2100/warzone2100/commit/c9a618cd821d02b47315c24f4fe0cacecbe04ecc
Author: Cyp <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/astar.cpp
Log Message:
-----------
Fix suboptimal paths on multiple droids pathfinding to same location.
On finding the optimal path for a droid, pathfinding was immediately
terminated, on
reaching the droid, without considering paths crossing the droid's tile. The
next droid
to pathfind to the same location would re-use the pathfinding map, which has a
hole
around where the previous droid was, which could lead to long detours (or not
finding a
path) if the previous droid/droids was/were in a 1-tile-wide/narrow passage.
Commit: 47ab46d0b7e2723abc8941dcb9f73f3d244e616b
https://github.com/Warzone2100/warzone2100/commit/47ab46d0b7e2723abc8941dcb9f73f3d244e616b
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M lib/exceptionhandler/exceptionhandler.vcxproj
M lib/framework/framework.vcxproj
M lib/gamelib/gamelib.vcxproj
M lib/ivis_opengl/ivis_opengl.vcxproj
M lib/netplay/netplay.vcxproj
M lib/qtgame/qtgame.vcxproj
M lib/script/script.vcxproj
M lib/sdl/SDL.vcxproj
M lib/sequence/sequence.vcxproj
M lib/sound/sound.vcxproj
M lib/widget/widget.vcxproj
M src/Warzone2100.vcxproj
M src/Warzone2100.vcxproj.filters
Log Message:
-----------
update MSVC solution file Disable mimimalRebuild since it was slower than
doing /Mp
Commit: da6eda254c6dcf4c955a8253710b5058e0df1535
https://github.com/Warzone2100/warzone2100/commit/da6eda254c6dcf4c955a8253710b5058e0df1535
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/function.cpp
Log Message:
-----------
Fix Assert to check for Super Transporter as well
Commit: 24d9ca8166b4e99487e3c9ee40348feaa2ac3d07
https://github.com/Warzone2100/warzone2100/commit/24d9ca8166b4e99487e3c9ee40348feaa2ac3d07
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/multiint.h
Log Message:
-----------
Fix spacing a bit for host lobby screen
Commit: e8cf431a1eb6028f0c11d81cc5aa1745f742d293
https://github.com/Warzone2100/warzone2100/commit/e8cf431a1eb6028f0c11d81cc5aa1745f742d293
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/configuration.cpp
Log Message:
-----------
Change defaults to window mode & 640x480, so people can see the system dialog
popups if something goes wrong on init.
Commit: a154c0bdaf6cf095e72ca6d599f124c9024fd91d
https://github.com/Warzone2100/warzone2100/commit/a154c0bdaf6cf095e72ca6d599f124c9024fd91d
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/cheat.cpp
Log Message:
-----------
When debug mode is enabled also enable the flag
Commit: 4eeecf546fd05681ceaa3fccf82e7d5ade617ec6
https://github.com/Warzone2100/warzone2100/commit/4eeecf546fd05681ceaa3fccf82e7d5ade617ec6
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/display.cpp
Log Message:
-----------
Change it so you can deconstruct anything but blueprints. Fixes ticket:3312
Commit: 20e6311b215b9f62f537ac58ff67967d58f5ca18
https://github.com/Warzone2100/warzone2100/commit/20e6311b215b9f62f537ac58ff67967d58f5ca18
Author: vexed <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M lib/framework/debug.cpp
M lib/framework/debug.h
Log Message:
-----------
Add __LINE__ to debug() routines to show exact line it is being called from.
On LOG_WARNING, only ouput the warning one time and supress the rest.
Commit: d5a97c039912b4b29b34f8df6bbd925f684aa835
https://github.com/Warzone2100/warzone2100/commit/d5a97c039912b4b29b34f8df6bbd925f684aa835
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M data/mp/multiplay/skirmish/rules.js
Log Message:
-----------
Properly disable unit design/radar without HQ in mp/sk.
Fixes #3305.
Commit: c041fb3dab50bb6a6348fd9340bf0d61902e3c4d
https://github.com/Warzone2100/warzone2100/commit/c041fb3dab50bb6a6348fd9340bf0d61902e3c4d
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/game.cpp
Log Message:
-----------
Load and save factory numbers.
Hopefully fixes #3244.
Commit: f1e38830fd6ab7242a0078db53c9c2dfcb72ff33
https://github.com/Warzone2100/warzone2100/commit/f1e38830fd6ab7242a0078db53c9c2dfcb72ff33
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M po/fr.po
Log Message:
-----------
French translation update by Amiral JCDG.
Closes #3311.
Commit: dc1c7ca57db1cb02446e77edde7eaf0a26c19fb7
https://github.com/Warzone2100/warzone2100/commit/dc1c7ca57db1cb02446e77edde7eaf0a26c19fb7
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/hci.cpp
Log Message:
-----------
cleanup: Remove some useless code.
Commit: acaf8a22a3ac8ff4968b415a73ca38f8415fd6b6
https://github.com/Warzone2100/warzone2100/commit/acaf8a22a3ac8ff4968b415a73ca38f8415fd6b6
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/hci.cpp
Log Message:
-----------
Improve factory selection.
Always select a factory, either by clicking on it, or clicking on the
top or bottom icon in the bottom panel, and only mark one factory as
selected.
Commit: 13948783de173df140d74456a64f89a4dc287222
https://github.com/Warzone2100/warzone2100/commit/13948783de173df140d74456a64f89a4dc287222
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 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
M src/frontend.cpp
Log Message:
-----------
Use the same text for the unit colour options everywhere.
Yay for duplication! Fixes #3324.
Commit: 969608e012dc7b9cd1ca4c92c5c66c8768f825be
https://github.com/Warzone2100/warzone2100/commit/969608e012dc7b9cd1ca4c92c5c66c8768f825be
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
M src/frontend.cpp
Log Message:
-----------
Don't change radar option when clicking on scanlines.
Fixes #3326.
Commit: c9529eccd214794fdc2992320bf8d87c2830adcd
https://github.com/Warzone2100/warzone2100/commit/c9529eccd214794fdc2992320bf8d87c2830adcd
Author: cybersphinx <[email protected]>
Date: 2012-03-17 (Sat, 17 Mar 2012)
Changed paths:
A data/mp/messages/resmessages1.rmsg
A data/mp/messages/resmessages12.rmsg
A data/mp/messages/resmessages2.rmsg
A data/mp/messages/resmessages23.rmsg
A data/mp/messages/resmessages3.rmsg
A data/mp/messages/resmessagesall.rmsg
M data/mp/multiplay/skirmish/rules.js
M lib/exceptionhandler/exceptionhandler.vcxproj
M lib/framework/debug.cpp
M lib/framework/debug.h
M lib/framework/framework.vcxproj
M lib/gamelib/gamelib.vcxproj
M lib/ivis_opengl/ivis_opengl.vcxproj
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/netplay/netplay.vcxproj
M lib/netplay/netsocket.cpp
M lib/netplay/nettypes.cpp
M lib/qtgame/qtgame.vcxproj
M lib/script/script.vcxproj
M lib/sdl/SDL.vcxproj
M lib/sequence/sequence.vcxproj
M lib/sound/sound.vcxproj
M lib/widget/widget.vcxproj
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/Warzone2100.vcxproj
M src/Warzone2100.vcxproj.filters
M src/astar.cpp
M src/cheat.cpp
M src/configuration.cpp
M src/display.cpp
M src/display3d.cpp
M src/frontend.cpp
M src/function.cpp
M src/game.cpp
M src/hci.cpp
M src/mapgrid.h
M src/message.cpp
M src/move.cpp
M src/multiint.cpp
M src/multiint.h
M src/multiplay.cpp
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/structure.cpp
M src/structuredef.h
M src/transporter.cpp
A tools/conversion/rmsg2ini.php
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
* bugfixes: (27 commits)
Don't change radar option when clicking on scanlines.
Use the same text for the unit colour options everywhere.
Improve factory selection.
cleanup: Remove some useless code.
French translation update by Amiral JCDG.
Load and save factory numbers.
Properly disable unit design/radar without HQ in mp/sk.
Add __LINE__ to debug() routines to show exact line it is being called from.
On LOG_WARNING, only ouput the warning one time and supress the rest.
Change it so you can deconstruct anything but blueprints. Fixes ticket:3312
When debug mode is enabled also enable the flag
Change defaults to window mode & 640x480, so people can see the system dialog
popups if something goes wrong on init.
Fix spacing a bit for host lobby screen
Fix Assert to check for Super Transporter as well
update MSVC solution file Disable mimimalRebuild since it was slower than
doing /Mp
Fix suboptimal paths on multiple droids pathfinding to same location.
Show correct AI names, even when AI list differs from the host's.
Remove unused SS_BEING_DEMOLISHED.
Update droid height after unloading specific droid from transport.
Show health as well as build progress when selecting incomplete enemy
structures.
Set »ingame.JoiningInProgress[i] = false;« in NET_InitPlayer().
...
Compare: https://github.com/Warzone2100/warzone2100/compare/5f06516...c9529ec
------------------------------------------------------------------------------
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
