Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: df32833ab8b17e6db5815b7eca9f5fe01a5b7f8f
https://github.com/Warzone2100/warzone2100/commit/df32833ab8b17e6db5815b7eca9f5fe01a5b7f8f
Author: Cyp <[email protected]>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M lib/qtgame/wzapp_qt.cpp
M lib/qtgame/wzapp_qt.h
Log Message:
-----------
qt: Use QImage instead of QImageReader to load mouse cursor images.
Some combination of QImageReader, QImage, QPixmap, QCursor and the wzfs wz::
virtual file system apparently doesn't
work in Qt 4.8.2 (but works in Qt 4.8.1).
The following error was printed (multiple times) to the shell:
QCursor: Cannot create bitmap cursor; invalid bitmap(s)
Fixes ticket:3562.
Commit: fdb1c0b52153d3368ae79e8f0befdd2744b43692
https://github.com/Warzone2100/warzone2100/commit/fdb1c0b52153d3368ae79e8f0befdd2744b43692
Author: Per Inge Mathisen <[email protected]>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
Log Message:
-----------
Do not use std::string in a memory structure that is memset().
Patch by tnmurphy, closes ticket:3620
Commit: feb7476af63d0715cf989b8174babced8f3d7eda
https://github.com/Warzone2100/warzone2100/commit/feb7476af63d0715cf989b8174babced8f3d7eda
Author: Per Inge Mathisen <[email protected]>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
R data/mp/multiplay/skirmish/nullbot-ge.inc.js
A data/mp/multiplay/skirmish/nullbot-generic.js.inc
R data/mp/multiplay/skirmish/nullbot-head.inc.js
A data/mp/multiplay/skirmish/nullbot-header.js.inc
A data/mp/multiplay/skirmish/nullbot-main.js.inc
R data/mp/multiplay/skirmish/nullbot-tail.inc.js
M data/mp/multiplay/skirmish/nullbot.js
Log Message:
-----------
Update nullbot to latest version. Rename nullbot include files to avoid
spurious qslint errors.
Commit: bf0d92dab49e029044156014f35614522214e004
https://github.com/Warzone2100/warzone2100/commit/bf0d92dab49e029044156014f35614522214e004
Author: Per Inge Mathisen <[email protected]>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update the changelog
Commit: c4edfed60de7edf88a5bbf334c85beef6d3c813a
https://github.com/Warzone2100/warzone2100/commit/c4edfed60de7edf88a5bbf334c85beef6d3c813a
Author: dak180 <[email protected]>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M .gitignore
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
A macosx/configs/ResourceRules.plist
M macosx/configs/Warzone-All.xcconfig
R macosx/configs/codesignrules.plist
M macosx/configs/mkdmgs.sh
Log Message:
-----------
Use codesigning for the mac builds.
Requires the presence of 'macosx/configs/CS-ID.xcconfig' containing a valid
codesign id listed in a CODE_SIGN_IDENTITY property.
Commit: 93f54a45316d76e3505e66143f5c84369ec665c1
https://github.com/Warzone2100/warzone2100/commit/93f54a45316d76e3505e66143f5c84369ec665c1
Author: dak180 <[email protected]>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
A macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
M macosx/configs/mkdmgs.sh
Log Message:
-----------
Make improvements to the case where there is no codesign id.
Commit: 44947ad4a831f4bc31fe3abc526175f37b539456
https://github.com/Warzone2100/warzone2100/commit/44947ad4a831f4bc31fe3abc526175f37b539456
Author: Per Inge Mathisen <[email protected]>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M src/display.cpp
Log Message:
-----------
Remove unused lines of code from display.cpp
Commit: 2c2822664f752b38b36a84e33c3f76a897e0fd23
https://github.com/Warzone2100/warzone2100/commit/2c2822664f752b38b36a84e33c3f76a897e0fd23
Author: Per Inge Mathisen <[email protected]>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M .gitignore
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
A macosx/configs/ResourceRules.plist
M macosx/configs/Warzone-All.xcconfig
R macosx/configs/codesignrules.plist
A macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
M macosx/configs/mkdmgs.sh
Log Message:
-----------
Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes
Commit: 398f77ede082063bd1bc607d5814e9630f663967
https://github.com/Warzone2100/warzone2100/commit/398f77ede082063bd1bc607d5814e9630f663967
Author: Per Inge Mathisen <[email protected]>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ChangeLog
M src/configuration.cpp
M src/frontend.cpp
Log Message:
-----------
No longer save default map, max players and map hash. Patch originally by
vexed. Closes ticket:3618
Commit: 74c153cf7bcc823ce1ace112cb9ce96d527c9f97
https://github.com/Warzone2100/warzone2100/commit/74c153cf7bcc823ce1ace112cb9ce96d527c9f97
Author: Cyp <[email protected]>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M lib/framework/frameresource.cpp
Log Message:
-----------
Assert on collision of hashes of resource types or filenames.
This should be a minor improvement over silently retreiving the wrong resource
on filename hash collisions.
Commit: 7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb
https://github.com/Warzone2100/warzone2100/commit/7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb
Author: automerge <[email protected]>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M .gitignore
M ChangeLog
R data/mp/multiplay/skirmish/nullbot-ge.inc.js
A data/mp/multiplay/skirmish/nullbot-generic.js.inc
R data/mp/multiplay/skirmish/nullbot-head.inc.js
A data/mp/multiplay/skirmish/nullbot-header.js.inc
A data/mp/multiplay/skirmish/nullbot-main.js.inc
R data/mp/multiplay/skirmish/nullbot-tail.inc.js
M data/mp/multiplay/skirmish/nullbot.js
M lib/framework/frameresource.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M lib/qtgame/wzapp_qt.cpp
M lib/qtgame/wzapp_qt.h
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
A macosx/configs/ResourceRules.plist
M macosx/configs/Warzone-All.xcconfig
R macosx/configs/codesignrules.plist
A macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
M macosx/configs/mkdmgs.sh
M src/configuration.cpp
M src/display.cpp
M src/frontend.cpp
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
Compare:
https://github.com/Warzone2100/warzone2100/compare/70a416977f53...7c76d4eaff71
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
