Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: af5f329fa2315e567e45a648603fbefd8d51277e
https://github.com/Warzone2100/warzone2100/commit/af5f329fa2315e567e45a648603fbefd8d51277e
Author: Cyp <[email protected]>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M lib/netplay/netplay.cpp
Log Message:
-----------
Check sender/receiver.
Commit: 42017f5e12a29f21dd31e7b595a7158168efb063
https://github.com/Warzone2100/warzone2100/commit/42017f5e12a29f21dd31e7b595a7158168efb063
Author: Cyp <[email protected]>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M src/ai.cpp
Log Message:
-----------
When targetting using sensors, use action target of droids doing
DACTION_OBSERVE.
Previous behaviour was to use order target, independently of whether the droid
was doing DORDER_OBSERVE.
Artillery no longer shoots at oil barrels being picked up by sensor tanks.
Fixes ticket:1281.
Commit: f6ddbf1878ff2a387c4be95449d8a7835c18ebd8
https://github.com/Warzone2100/warzone2100/commit/f6ddbf1878ff2a387c4be95449d8a7835c18ebd8
Author: Cyp <[email protected]>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M src/structure.cpp
Log Message:
-----------
Make destroyed half built structures burn half time.
Except in the case of derricks, or in the case of adding oil wells in debug
mode where
the structure was, this is just a visual change.
Clean up destroyStruct() slightly.
Commit: 2985840f5596597467e1aa5abce9f3ab7e2c68fa
https://github.com/Warzone2100/warzone2100/commit/2985840f5596597467e1aa5abce9f3ab7e2c68fa
Author: Cyp <[email protected]>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M src/template.cpp
Log Message:
-----------
Return power on changing template in production.
If changing a template which was currently in production, the production was
cancelled
without returning the power.
Fixes ticket:3266.
Commit: 8949148a9ddbf92ecc3fb2b4ddcd0e74d849be5c
https://github.com/Warzone2100/warzone2100/commit/8949148a9ddbf92ecc3fb2b4ddcd0e74d849be5c
Author: Cyp <[email protected]>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M src/move.cpp
Log Message:
-----------
Let AIs pick up barrels and artifacts if using DORDER_RECOVER.
Fixes ticket:3251.
Commit: d1675c4087540ce9578053b0ebb9f31f352b9880
https://github.com/Warzone2100/warzone2100/commit/d1675c4087540ce9578053b0ebb9f31f352b9880
Author: Cyp <[email protected]>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M src/effects.cpp
Log Message:
-----------
Fix divide-by-0 in updateFire() on effect with zero lifespan.
Probably triggered by f6ddbf1878ff2a387c4be95449d8a7835c18ebd8 on destruction
of 0%-built
derrick.
Commit: a94bd6629d17f50df9b3a58b97bb3f8cd734e12b
https://github.com/Warzone2100/warzone2100/commit/a94bd6629d17f50df9b3a58b97bb3f8cd734e12b
Author: Cyp <[email protected]>
Date: 2012-03-11 (Sun, 11 Mar 2012)
Changed paths:
M src/combat.cpp
Log Message:
-----------
Disable target prediction for droids that are trying to drive through stuff.
This implies that if the droid suddenly figures out how to tunnel through the
wall it
was trying to drive through for the last half hour, the shot will miss.
Commit: da9d427e5def9b82ab95c99b42ec8e2049bfcd12
https://github.com/Warzone2100/warzone2100/commit/da9d427e5def9b82ab95c99b42ec8e2049bfcd12
Author: Cyp <[email protected]>
Date: 2012-03-11 (Sun, 11 Mar 2012)
Changed paths:
M src/game.cpp
M src/research.cpp
Log Message:
-----------
Try to avoid pointers to stack getting saved.
Also, fix a harmless out of bounds »myUnusedPointer =
&myVector[myVector.size()]«.
Introduced in d818ff5a195d9e010edf9dd060c9553a07dfec5c.
Hopefully fixes ticket:3200.
Commit: fc0348a5d1fc66b3c7196b3a7805d62673ebba7b
https://github.com/Warzone2100/warzone2100/commit/fc0348a5d1fc66b3c7196b3a7805d62673ebba7b
Author: Michał Dutkiewicz <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/frontend.h
Log Message:
-----------
Squeeze out additional 50 pixels for menu texts (preserving 640x480
compatibility)
Refs #2650.
Commit: d364a00b7f76f798dae72f2826ebc55ba5a55913
https://github.com/Warzone2100/warzone2100/commit/d364a00b7f76f798dae72f2826ebc55ba5a55913
Author: Michał Dutkiewicz <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/keyedit.cpp
Log Message:
-----------
Make keyboard mapping editor more consistent with menu
Commit: f24ce24dc0fee84731687222f9ed1672f825d798
https://github.com/Warzone2100/warzone2100/commit/f24ce24dc0fee84731687222f9ed1672f825d798
Author: Michał Dutkiewicz <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/ingameop.cpp
M src/ingameop.h
Log Message:
-----------
Make in game options a bit wider (to give more room for translations) and
improve sound options margins
Refs #2650.
Commit: 4a6be03ffb69863b14ac934877d71a1bfd851f0a
https://github.com/Warzone2100/warzone2100/commit/4a6be03ffb69863b14ac934877d71a1bfd851f0a
Author: Michał Dutkiewicz <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/frontend.cpp
M src/frontend.h
Log Message:
-----------
Better descriptions for the unit colour options.
Also moves the rotating radar option into graphics options.
unitcolouroptions5.diff, closes #3265.
Commit: 2c093a6ff96bce87f2edc1d1a7c10369a2f78c58
https://github.com/Warzone2100/warzone2100/commit/2c093a6ff96bce87f2edc1d1a7c10369a2f78c58
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M po/fr.po
Log Message:
-----------
French translation update by Amiral JCDG.
Closes #3276.
Commit: c363c6285b662491e3e7afc6830583c71f9f3e3f
https://github.com/Warzone2100/warzone2100/commit/c363c6285b662491e3e7afc6830583c71f9f3e3f
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 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/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: 8c034fee8b11c6813fdc330f218af6571e285fd2
https://github.com/Warzone2100/warzone2100/commit/8c034fee8b11c6813fdc330f218af6571e285fd2
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/display3d.cpp
M src/display3d.h
M src/main.cpp
Log Message:
-----------
Clear out blueprints when ending a game.
Fixes #3181.
Commit: 6e0c364c99f8c85b5be96087059db7f627c2d3bc
https://github.com/Warzone2100/warzone2100/commit/6e0c364c99f8c85b5be96087059db7f627c2d3bc
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/loop.cpp
Log Message:
-----------
Don't let the radar handle already processed events.
Fixes #3179.
Commit: f05142c7ebb3bf7a961a4908478be4787201270c
https://github.com/Warzone2100/warzone2100/commit/f05142c7ebb3bf7a961a4908478be4787201270c
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/keybind.cpp
Log Message:
-----------
Display game speed as decimals, not fractions.
Also add 0.5. Refs #3277.
Commit: 589b5abbe8bb0d3141684343dd70999ef6ef4ffe
https://github.com/Warzone2100/warzone2100/commit/589b5abbe8bb0d3141684343dd70999ef6ef4ffe
Author: vexed <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M data/base/texpages/page-100-rock-earth-rockies.png
M data/base/texpages/page-101-cliff-rockies.png
M data/base/texpages/page-102-bottom-rockies.png
M data/base/texpages/page-103-tiles-rockies.png
M data/base/texpages/page-104-snowgrass-rockies.png
M data/base/texpages/page-105-snow-rockies.png
M data/base/texpages/page-106-snowrock-rockies.png
M data/base/texpages/page-107-brown-earth-rockies.png
M data/base/texpages/page-108-snowcliff-rockies.png
M data/base/texpages/page-80-water-1.png
M data/base/texpages/page-81-water-2.png
M data/base/texpages/page-82-yellow-sand-arizona.png
M data/base/texpages/page-83-red-earth-arizona.png
M data/base/texpages/page-84-tiles-arizona.png
M data/base/texpages/page-85-cliff-arizona.png
M data/base/texpages/page-86-bottom-arizona.png
M data/base/texpages/page-87-mud-arizona.png
M data/base/texpages/page-88-grass-arizona.png
M data/base/texpages/page-89-gray-rubble-urban.png
M data/base/texpages/page-90-green-urban.png
M data/base/texpages/page-91-tiles-urban.png
M data/base/texpages/page-92-medium-tiles-urban.png
M data/base/texpages/page-93-big-tiles-urban.png
M data/base/texpages/page-94-cliffs-urban.png
M data/base/texpages/page-95-brown-rocks-urban.png
M data/base/texpages/page-96-burned-ground-urban.png
M data/base/texpages/page-97-burned-tiles-urban.png
M data/base/texpages/page-98-bottom-urban.png
M data/base/texpages/page-99-grass-rockies.png
Log Message:
-----------
Use lower-res textures as default.
Commit: 5d69236edaeb4fedfc068cc3f088729afe84475b
https://github.com/Warzone2100/warzone2100/commit/5d69236edaeb4fedfc068cc3f088729afe84475b
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: ddd61cb6e397fb6e9a8b7ac1675ca125e5d20e03
https://github.com/Warzone2100/warzone2100/commit/ddd61cb6e397fb6e9a8b7ac1675ca125e5d20e03
Author: dak180 <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M tests/Tests.xcodeproj/project.pbxproj
M tests/configs/qslint-All.xcconfig
Log Message:
-----------
Get rid of useless warnings, take 2.
Commit: 7f6ad1dafff3b70ac0408c093b46dbfc540245d9
https://github.com/Warzone2100/warzone2100/commit/7f6ad1dafff3b70ac0408c093b46dbfc540245d9
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M src/intdisplay.cpp
Log Message:
-----------
Properly scale the transports in the research list.
Refs #3277.
Commit: 071885640bceb716b8332f68130ca3681fa02d81
https://github.com/Warzone2100/warzone2100/commit/071885640bceb716b8332f68130ca3681fa02d81
Author: cybersphinx <[email protected]>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ChangeLog
M data/base/texpages/page-100-rock-earth-rockies.png
M data/base/texpages/page-101-cliff-rockies.png
M data/base/texpages/page-102-bottom-rockies.png
M data/base/texpages/page-103-tiles-rockies.png
M data/base/texpages/page-104-snowgrass-rockies.png
M data/base/texpages/page-105-snow-rockies.png
M data/base/texpages/page-106-snowrock-rockies.png
M data/base/texpages/page-107-brown-earth-rockies.png
M data/base/texpages/page-108-snowcliff-rockies.png
M data/base/texpages/page-80-water-1.png
M data/base/texpages/page-81-water-2.png
M data/base/texpages/page-82-yellow-sand-arizona.png
M data/base/texpages/page-83-red-earth-arizona.png
M data/base/texpages/page-84-tiles-arizona.png
M data/base/texpages/page-85-cliff-arizona.png
M data/base/texpages/page-86-bottom-arizona.png
M data/base/texpages/page-87-mud-arizona.png
M data/base/texpages/page-88-grass-arizona.png
M data/base/texpages/page-89-gray-rubble-urban.png
M data/base/texpages/page-90-green-urban.png
M data/base/texpages/page-91-tiles-urban.png
M data/base/texpages/page-92-medium-tiles-urban.png
M data/base/texpages/page-93-big-tiles-urban.png
M data/base/texpages/page-94-cliffs-urban.png
M data/base/texpages/page-95-brown-rocks-urban.png
M data/base/texpages/page-96-burned-ground-urban.png
M data/base/texpages/page-97-burned-tiles-urban.png
M data/base/texpages/page-98-bottom-urban.png
M data/base/texpages/page-99-grass-rockies.png
M lib/netplay/netplay.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/ai.cpp
M src/combat.cpp
M src/display3d.cpp
M src/display3d.h
M src/effects.cpp
M src/frontend.cpp
M src/frontend.h
M src/game.cpp
M src/ingameop.cpp
M src/ingameop.h
M src/intdisplay.cpp
M src/keybind.cpp
M src/keyedit.cpp
M src/loop.cpp
M src/main.cpp
M src/move.cpp
M src/research.cpp
M src/structure.cpp
M src/template.cpp
M tests/Tests.xcodeproj/project.pbxproj
M tests/configs/qslint-All.xcconfig
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
Compare: https://github.com/Warzone2100/warzone2100/compare/a0b35f7...0718856
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
