Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: 8149dc94c0b61117982281cdaf2aac1bec2525e9
https://github.com/Warzone2100/warzone2100/commit/8149dc94c0b61117982281cdaf2aac1bec2525e9
Author: per <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/design.cpp
M src/design.h
M src/qtscriptfuncs.cpp
M src/scriptfuncs.cpp
M src/template.cpp
Log Message:
-----------
Fix bug that made droids produced by scripts get human player's upgrades.
Commit: 07ad2b7b001294525240f44f370a3af8d04a5861
https://github.com/Warzone2100/warzone2100/commit/07ad2b7b001294525240f44f370a3af8d04a5861
Author: Cyp <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/hci.cpp
M src/intdisplay.cpp
M src/research.cpp
M src/research.h
Log Message:
-----------
allyresearch: Simplify logic for display of ally research.
Commit: 423e358b6715c12dda70ff5f6f2bd0348c09f699
https://github.com/Warzone2100/warzone2100/commit/423e358b6715c12dda70ff5f6f2bd0348c09f699
Author: Cyp <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/hci.cpp
M src/intdisplay.cpp
M src/research.cpp
M src/research.h
Log Message:
-----------
allyresearch: Keep showing allied research even while facilities are upgraded.
Commit: b6b6265e4e430486ea44a200bce870b115dfc37f
https://github.com/Warzone2100/warzone2100/commit/b6b6265e4e430486ea44a200bce870b115dfc37f
Author: Cyp <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/hci.cpp
M src/hci.h
Log Message:
-----------
allyresearch: Also show in the bottom menu, if allies are researching the
same as us.
Commit: 47a6d6d4684b993d15e378f6d0877fa043b26ca0
https://github.com/Warzone2100/warzone2100/commit/47a6d6d4684b993d15e378f6d0877fa043b26ca0
Author: Cyp <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M configure.ac
Log Message:
-----------
Fix compile error on *BSD systems.
Patch by [email protected].
Fixes ticket:3845.
Commit: b84767f7f6b63419dc7700c5cfc79f54d18a0ed0
https://github.com/Warzone2100/warzone2100/commit/b84767f7f6b63419dc7700c5cfc79f54d18a0ed0
Author: Dmitry Marakasov <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M build_tools/autorevision
Log Message:
-----------
Update autorevision with latest, portable, version from git
Commit: 6a3ed31e8891ca4f6a33168358bd2dc11c55c1b5
https://github.com/Warzone2100/warzone2100/commit/6a3ed31e8891ca4f6a33168358bd2dc11c55c1b5
Author: dak180 <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M macosx/configs/fetchscripts/Png-FetchSource.sh
Log Message:
-----------
Update the mac build's png to 1.5.14.
Commit: 2dd788c38c2e0a23e4b724f63d5fe2678dca2350
https://github.com/Warzone2100/warzone2100/commit/2dd788c38c2e0a23e4b724f63d5fe2678dca2350
Author: automerge <[email protected]>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M build_tools/autorevision
M configure.ac
M macosx/configs/fetchscripts/Png-FetchSource.sh
M src/design.cpp
M src/design.h
M src/hci.cpp
M src/hci.h
M src/intdisplay.cpp
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/research.h
M src/scriptfuncs.cpp
M src/template.cpp
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
Compare:
https://github.com/Warzone2100/warzone2100/compare/f91cdbc1d9f1...2dd788c38c2e
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
