Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: 759b4cc38de09660ccd2c22d48cafc44b60cf809
https://github.com/Warzone2100/warzone2100/commit/759b4cc38de09660ccd2c22d48cafc44b60cf809
Author: Giel van Schijndel <m...@mortis.eu>
Date: 2013-01-04 (Fri, 04 Jan 2013)
Changed paths:
M tools/map/map2preview.cpp
Log Message:
-----------
map2preview: handle unknown tilesets
Signed-off-by: Giel van Schijndel <m...@mortis.eu>
Commit: 0dae748d63bba0e8ea9a9986a7ec147fc27a7664
https://github.com/Warzone2100/warzone2100/commit/0dae748d63bba0e8ea9a9986a7ec147fc27a7664
Author: Giel van Schijndel <m...@mortis.eu>
Date: 2013-01-04 (Fri, 04 Jan 2013)
Changed paths:
M src/power.cpp
Log Message:
-----------
Prevent out-of-bounds array access
GCC actually gives a warning for this.
Signed-off-by: Giel van Schijndel <m...@mortis.eu>
Commit: 3042d5872a2458722bf271a6a4022ae62480bf0b
https://github.com/Warzone2100/warzone2100/commit/3042d5872a2458722bf271a6a4022ae62480bf0b
Author: Giel van Schijndel <m...@mortis.eu>
Date: 2013-01-04 (Fri, 04 Jan 2013)
Changed paths:
M src/Makefile.am
Log Message:
-----------
Prevent updating autorevision.h's timestamp when its contents haven't changed
Signed-off-by: Giel van Schijndel <m...@mortis.eu>
Commit: 60b33a16b83bc2f562edf21585f8fb0d3863478a
https://github.com/Warzone2100/warzone2100/commit/60b33a16b83bc2f562edf21585f8fb0d3863478a
Author: Giel van Schijndel <m...@mortis.eu>
Date: 2013-01-04 (Fri, 04 Jan 2013)
Changed paths:
M src/Makefile.am
M src/power.cpp
M tools/map/map2preview.cpp
Log Message:
-----------
Merge branch 'build-problems' into bugfixes
Signed-off-by: Giel van Schijndel <m...@mortis.eu>
Commit: 3bada3ce4fa2157c788d0fdc27287c84291676bd
https://github.com/Warzone2100/warzone2100/commit/3bada3ce4fa2157c788d0fdc27287c84291676bd
Author: Cyp <c...@wz2100.net>
Date: 2013-01-05 (Sat, 05 Jan 2013)
Changed paths:
M src/wrappers.cpp
Log Message:
-----------
stats: Actually save stats, so players aren't stuck with the pacifier forever.
Stats were only saved in multiGameShutdown(), which apparently never gets
called if closing the game.
Commit: fc894f31335fbdf328984ad595accdd0c8467c3f
https://github.com/Warzone2100/warzone2100/commit/fc894f31335fbdf328984ad595accdd0c8467c3f
Author: Cyp <c...@wz2100.net>
Date: 2013-01-05 (Sat, 05 Jan 2013)
Changed paths:
M src/multiint.cpp
Log Message:
-----------
stats: Use actual number of games played when drawing medals.
Players are no longer stuck with the pacifier forever.
Commit: 1a35223e8aeef2f65299301370789157701d314e
https://github.com/Warzone2100/warzone2100/commit/1a35223e8aeef2f65299301370789157701d314e
Author: Per <p...@wz2100.net>
Date: 2013-01-05 (Sat, 05 Jan 2013)
Changed paths:
M src/loop.cpp
Log Message:
-----------
stats: Prevent double-counting of wins/losses.
Fixes ticket:3855.
Commit: 33ec6eee1aea9059261a16bc035b130d154b8932
https://github.com/Warzone2100/warzone2100/commit/33ec6eee1aea9059261a16bc035b130d154b8932
Author: dak180 <dak...@users.sourceforge.net>
Date: 2013-01-05 (Sat, 05 Jan 2013)
Changed paths:
A macosx/Resources/wz2100requirement.rqset
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
A macosx/configs/frameworkrequirement.sh
M macosx/configs/mkdmgs.sh
Log Message:
-----------
Do not rely on the default Designated Requirements.
Also, sign the frameworks earlier.
Commit: 767c19e1b650655aeff66baafb93248271cdfd71
https://github.com/Warzone2100/warzone2100/commit/767c19e1b650655aeff66baafb93248271cdfd71
Author: dak180 <dak...@users.sourceforge.net>
Date: 2013-01-05 (Sat, 05 Jan 2013)
Changed paths:
M macosx/configs/mkdmgs.sh
Log Message:
-----------
Emit warnings on improperly / unsigned frameworks.
Commit: c6e66959c9febd57f54d4e7b25ba9ff847b23727
https://github.com/Warzone2100/warzone2100/commit/c6e66959c9febd57f54d4e7b25ba9ff847b23727
Author: dak180 <dak...@users.sourceforge.net>
Date: 2013-01-05 (Sat, 05 Jan 2013)
Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
Log Message:
-----------
Update the default layout for CS-ID.xcconfig.
Commit: 20cefacef6e859421e83578d127e44a541c62f20
https://github.com/Warzone2100/warzone2100/commit/20cefacef6e859421e83578d127e44a541c62f20
Author: cybersphinx <chr....@gmx.net>
Date: 2013-01-06 (Sun, 06 Jan 2013)
Changed paths:
M configure.ac
Log Message:
-----------
Make configure fail if it doesn't find flex.
Fixes #3859.
Commit: eb62730d7846b67e0ac9fd07a63f599d43eaa78e
https://github.com/Warzone2100/warzone2100/commit/eb62730d7846b67e0ac9fd07a63f599d43eaa78e
Author: dak180 <dak...@users.sourceforge.net>
Date: 2013-01-07 (Mon, 07 Jan 2013)
Changed paths:
M configure.ac
A macosx/Resources/wz2100requirement.rqset
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Base-Framework.xcconfig
M macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
A macosx/configs/frameworkrequirement.sh
M macosx/configs/mkdmgs.sh
M src/Makefile.am
M src/loop.cpp
M src/multiint.cpp
M src/power.cpp
M src/wrappers.cpp
M tools/map/map2preview.cpp
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
* topic/bugfixes:
Make configure fail if it doesn't find flex.
Update the default layout for CS-ID.xcconfig.
Emit warnings on improperly / unsigned frameworks.
Do not rely on the default Designated Requirements.
stats: Prevent double-counting of wins/losses.
stats: Use actual number of games played when drawing medals.
stats: Actually save stats, so players aren't stuck with the pacifier forever.
Prevent updating autorevision.h's timestamp when its contents haven't changed
Prevent out-of-bounds array access
map2preview: handle unknown tilesets
Conflicts:
macosx/configs/mkdmgs.sh
Compare:
https://github.com/Warzone2100/warzone2100/compare/766ca7eb2628...eb62730d7846
------------------------------------------------------------------------------
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
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
