Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: dafc192da4de005e06b372aa87d92c70e3c12069
https://github.com/Warzone2100/warzone2100/commit/dafc192da4de005e06b372aa87d92c70e3c12069
Author: per <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/design.cpp
Log Message:
-----------
Add check to prevent scripts from building VTOLs with non-VTOL weapons in
factories.
Commit: 1d3bc332ff8d436d5d864adf45353a6017d33f50
https://github.com/Warzone2100/warzone2100/commit/1d3bc332ff8d436d5d864adf45353a6017d33f50
Author: per <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/qtscriptfuncs.cpp
Log Message:
-----------
qtscript: Fix propulsion id in droid game type. Fix getWeaponInfo() - now it
actually returns something, and hopefully something correct.
Commit: 1ce83f364d94a8830b59038145a7e02f45a1626d
https://github.com/Warzone2100/warzone2100/commit/1ce83f364d94a8830b59038145a7e02f45a1626d
Author: per <[email protected]>
Date: 2013-01-21 (Mon, 21 Jan 2013)
Changed paths:
M src/qtscriptfuncs.cpp
Log Message:
-----------
qtscript: In enumDroid(), make sure we match for our simplified droid types.
In enumRange(), make sure we convert range to map coordinates.
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: 13dbbf1b4d419e94621732d5a30b1cee3fc5a32c
https://github.com/Warzone2100/warzone2100/commit/13dbbf1b4d419e94621732d5a30b1cee3fc5a32c
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:
-----------
Merge remote-tracking branch 'origin/bugfixes'
Conflicts:
src/qtscriptfuncs.cpp
src/scriptfuncs.cpp
Compare:
https://github.com/Warzone2100/warzone2100/compare/f9ad00be241e...13dbbf1b4d41
------------------------------------------------------------------------------
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. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
