Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: 93c18a2385f3525b261452d8690730cc9162650f
https://github.com/Warzone2100/warzone2100/commit/93c18a2385f3525b261452d8690730cc9162650f
Author: vexed <[email protected]>
Date: 2014-11-12 (Wed, 12 Nov 2014)
Changed paths:
M src/action.cpp
M src/ai.cpp
M src/component.cpp
M src/display.cpp
M src/display3d.cpp
M src/drive.cpp
M src/droid.cpp
M src/droid.h
M src/function.cpp
M src/game.cpp
M src/group.cpp
M src/hci.cpp
M src/intdisplay.cpp
M src/intorder.cpp
M src/keybind.cpp
M src/mission.cpp
M src/move.cpp
M src/multigifts.cpp
M src/objmem.cpp
M src/order.cpp
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/scriptai.cpp
M src/scriptfuncs.cpp
M src/selection.cpp
M src/structure.cpp
M src/transporter.cpp
Log Message:
-----------
Transporter cleanup.
Using isTransporter() instead of psDroid->droidType == DROID_TRANSPORTER ||
psDroid->droidType == DROID_SUPERTRANSPORTER.
There should be no logic changes in this patch.
closes ticket:4246
Commit: b3f6e760428759e8c36236eb44fc8ad2132f8834
https://github.com/Warzone2100/warzone2100/commit/b3f6e760428759e8c36236eb44fc8ad2132f8834
Author: vexed <[email protected]>
Date: 2014-11-12 (Wed, 12 Nov 2014)
Changed paths:
M src/action.cpp
M src/ai.cpp
M src/component.cpp
M src/display.cpp
M src/display3d.cpp
M src/drive.cpp
M src/droid.cpp
M src/droid.h
M src/game.cpp
M src/group.cpp
M src/hci.cpp
M src/intdisplay.cpp
M src/intorder.cpp
M src/keybind.cpp
M src/mission.cpp
M src/move.cpp
M src/multigifts.cpp
M src/objmem.cpp
M src/order.cpp
M src/qtscriptfuncs.cpp
M src/research.cpp
M src/scriptai.cpp
M src/scriptfuncs.cpp
M src/structure.cpp
M src/transporter.cpp
Log Message:
-----------
Merge branch 'bugfixes'
Conflicts:
src/component.cpp
src/drive.cpp
src/droid.cpp
src/function.cpp
src/hci.cpp
src/intdisplay.cpp
src/order.cpp
src/qtscriptfuncs.cpp
src/research.cpp
src/scriptai.cpp
src/scriptfuncs.cpp
src/selection.cpp
src/transporter.cpp
Compare:
https://github.com/Warzone2100/warzone2100/compare/b62ce3bfa017...b3f6e7604287------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
