Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: 845d423cb28cfb1818d92719e759a40a61f27d9f
https://github.com/Warzone2100/warzone2100/commit/845d423cb28cfb1818d92719e759a40a61f27d9f
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M src/hci.h
M src/intdisplay.cpp
Log Message:
---
Add a 'Need more resources' indicator in the power bar when needed.
Commit: b5ab238e23b5efdce21c4ed818076fbe1c8edeeb
https://github.com/Warzone2100/warzone2100/commit/b5ab238e23b5efdce21c4ed818076fbe1c8edeeb
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M src/display3d.cpp
Log Message:
---
Tone down the text color of the level name/time
Commit: abd869b0796275f6dcbbcdad66b42232073047ee
https://github.com/Warzone2100/warzone2100/commit/abd869b0796275f6dcbbcdad66b42232073047ee
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M src/multisync.cpp
Log Message:
---
Clean up includes from 24db01ae102e99d848bec402aadc06abe32935c2
Commit: db74b52388325c511cbcf8c0f420693bb16890f1
https://github.com/Warzone2100/warzone2100/commit/db74b52388325c511cbcf8c0f420693bb16890f1
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M src/feature.cpp
Log Message:
---
Make sure we clear the tile with the feature on it after it has been
destroyed.
Not really a cherry-pick (functions changed), however, it is the same logic so
wanted
to keep track of the cherry-pick.
fixes ticket:3155
2.3: Make sure we clear the tile with the feature on it after it has been
destroyed.
refs ticket:2534
(cherry picked from commit d1c93494dee2f1b929776edadc3bad1f7d364491)
Conflicts:
src/feature.c
Commit: b18b76ea8a553b06c4f7258fc8432c7db280b9aa
https://github.com/Warzone2100/warzone2100/commit/b18b76ea8a553b06c4f7258fc8432c7db280b9aa
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M src/qtscript.cpp
Log Message:
---
Don't hide possible misnamed or non-existent function calls in qtscript's
backend. We now give a LOG_WARNING to notify us of the possible error. NOTE:
might be better to promote this to LOG_ERROR, so we can tell in-game that we
have issues instead of parsing log files.
Commit: 9a66b4e0d64a1d95e466b0347ec65b79adef42c1
https://github.com/Warzone2100/warzone2100/commit/9a66b4e0d64a1d95e466b0347ec65b79adef42c1
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M src/cheat.h
M src/multiplay.cpp
M src/multirecv.h
Log Message:
---
Correctly define the function for compilers that aren't broken enough to
allow bool blah() == void blah() which should throw a error since we don't
overload it.
Broken in 68639f734fd3d5a8b5f29b0becd7dc03b5ca0c1f
Commit: 001ef35faf1b1207db0e45ed18fbf072356372f6
https://github.com/Warzone2100/warzone2100/commit/001ef35faf1b1207db0e45ed18fbf072356372f6
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M data/mp/multiplay/skirmish/rules.js
M src/cluster.cpp
Log Message:
---
Play the correct sounds when we are getting attacked.
Broken in f35de0d51304f68e104d1673d4e284e335472f99
NOTE: see aforementioned commit b18b76ea8a553b06c4f7258fc8432c7db280b9aa
on why we should be spitting out warnings/errors, not ignore these issues.
Fixes ticket:3102
Commit: 12f7188cb864f3421b610430801c70628c820ed3
https://github.com/Warzone2100/warzone2100/commit/12f7188cb864f3421b610430801c70628c820ed3
Author: vexed
Date: 2012-02-15 (Wed, 15 Feb 2012)
Changed paths:
M data/mp/multiplay/skirmish/rules.js
M src/cheat.h
M src/cluster.cpp
M src/display3d.cpp
M src/feature.cpp
M src/hci.h
M src/intdisplay.cpp
M src/multiplay.cpp
M src/multirecv.h
M src/multisync.cpp
M src/qtscript.cpp
Log Message:
---
Merge branch 'bugfixes'
Compare: https://github.com/Warzone2100/warzone2100/compare/d78970c...12f7188
--
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
