Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: 45cf49cfee59e92f9ea248f91fb050dc6b2f3311
https://github.com/Warzone2100/warzone2100/commit/45cf49cfee59e92f9ea248f91fb050dc6b2f3311
Author: dak180 <[email protected]>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M macosx/configs/fetchscripts/GLExtensionWrangler-FetchSource.sh
Log Message:
-----------
Update to glew 1.10.0 for the mac builds.
Note: other builds may want to test to ensure that they do not build against
glew 1.9.0 since it can cause crashes.
Commit: 874df70e1f6a41df65abeeb402099b98bf740b27
https://github.com/Warzone2100/warzone2100/commit/874df70e1f6a41df65abeeb402099b98bf740b27
Author: dak180 <[email protected]>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M macosx/configs/fetchscripts/Png-FetchSource.sh
Log Message:
-----------
Update png to 1.5.17.
Commit: c31cf2693ef8d11b6213afcf64057f82b73d1188
https://github.com/Warzone2100/warzone2100/commit/c31cf2693ef8d11b6213afcf64057f82b73d1188
Author: dak180 <[email protected]>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
A 3rdparty/texinputs/underscore.sty
M macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
Log Message:
-----------
Fix ups.
* Add underscore.sty into 3rdparty
* Use a quoted here doc in CS-ID
* Try not to blowup quite so spectacularly building the docs without a network
connection.
Commit: afdd27b87716d613c7d89cb809558556edee2075
https://github.com/Warzone2100/warzone2100/commit/afdd27b87716d613c7d89cb809558556edee2075
Author: dak180 <[email protected]>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
Log Message:
-----------
Update the xcode project file to the 3.2 format.
Commit: 65a0201ef4f48ef1099be1228c387dbafdbb3840
https://github.com/Warzone2100/warzone2100/commit/65a0201ef4f48ef1099be1228c387dbafdbb3840
Author: dak180 <[email protected]>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M macosx/configs/Fribidi-All.xcconfig
Log Message:
-----------
Eliminate a few warnings in 3rdparty code.
Commit: 10652103259ace901aa4958887de5dff5d5a1d92
https://github.com/Warzone2100/warzone2100/commit/10652103259ace901aa4958887de5dff5d5a1d92
Author: dak180 <[email protected]>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M macosx/configs/fetchscripts/Ogg-FetchSource.sh
Log Message:
-----------
Update ogg to 1.3.1 for the mac build.
Commit: 37f91cd68891bc8e10b39b4c4979e3f7ee4c479b
https://github.com/Warzone2100/warzone2100/commit/37f91cd68891bc8e10b39b4c4979e3f7ee4c479b
Author: dak180 <[email protected]>
Date: 2013-08-12 (Mon, 12 Aug 2013)
Changed paths:
M build_tools/autorevision
Log Message:
-----------
Update autorevision to 1.5.
Commit: 7ec1c973854ec727e6190b704145ab78410e0557
https://github.com/Warzone2100/warzone2100/commit/7ec1c973854ec727e6190b704145ab78410e0557
Author: dak180 <[email protected]>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
Log Message:
-----------
Use Gist as the primary location for the vorbis patch.
Commit: 2e5d5515aa2d739e12185f376c2f7d4ab3a0b976
https://github.com/Warzone2100/warzone2100/commit/2e5d5515aa2d739e12185f376c2f7d4ab3a0b976
Author: dak180 <[email protected]>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M macosx/Warzone.xcodeproj/project.pbxproj
Log Message:
-----------
Check Moc after downloading Qt.
Commit: 3db05df6ffb9b74d76ea4629d53b923d2fd124e1
https://github.com/Warzone2100/warzone2100/commit/3db05df6ffb9b74d76ea4629d53b923d2fd124e1
Author: dak180 <[email protected]>
Date: 2013-08-29 (Thu, 29 Aug 2013)
Changed paths:
M build_tools/autorevision
Log Message:
-----------
Update autorevision to 1.6.
Commit: d13bc0de7dd0588351af24dc45d55110d0eed6e8
https://github.com/Warzone2100/warzone2100/commit/d13bc0de7dd0588351af24dc45d55110d0eed6e8
Author: vexed <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M .gitignore
M autogen.sh
M configure.ac
M lib/framework/Makefile.am
M lib/framework/framework.vcxproj
M lib/framework/framework.vcxproj.filters
A lib/framework/resource_lexer.cpp
A lib/framework/resource_parser.cpp
A lib/framework/resource_parser.h
A lib/framework/strres_lexer.cpp
A lib/framework/strres_parser.cpp
A lib/framework/strres_parser.h
M lib/gamelib/Makefile.am
A lib/gamelib/audp_lexer.cpp
A lib/gamelib/audp_parser.cpp
A lib/gamelib/audp_parser.h
M lib/gamelib/gamelib.vcxproj
M lib/gamelib/gamelib.vcxproj.filters
M lib/script/Makefile.am
A lib/script/chat_lexer.cpp
A lib/script/chat_parser.cpp
A lib/script/chat_parser.h
M lib/script/script.vcxproj
M lib/script/script.vcxproj.filters
A lib/script/script_lexer.cpp
A lib/script/script_parser.cpp
A lib/script/script_parser.h
M src/Makefile.am
M src/Warzone2100.vcxproj
M src/Warzone2100.vcxproj.filters
A src/level_lexer.cpp
A src/scriptvals_lexer.cpp
A src/scriptvals_parser.cpp
A src/scriptvals_parser.h
R win32/MSVCdelparser.bat
Log Message:
-----------
Simplify build process by getting rid of bison/flex dependencies.
Fixes both MSVC and autotools (automake 1.12+).
Revert "Abort autogen.sh when automake 1.12+ is found."
This reverts commit 978ed8f1f90544162c327f334bd590cd7b944ce1.
Should now work with automake 1.11+
fixes ticket:3887
fixes ticket:3538
closes ticket:3950
(cherry picked from commit 372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f)
Forgot to push these changes for commit 372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f
(cherry picked from commit e397b24d4724d835d6cdc39a92800e64c0551dab)
Out of tree builds ? Who needs them. :P
refs: 372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f
(cherry picked from commit 20317c2a6f2c700042a727c6d719056ab3c90dcb)
Commit: 989b3e7fb59ea2d42db57ffdbfbb506f31df43c4
https://github.com/Warzone2100/warzone2100/commit/989b3e7fb59ea2d42db57ffdbfbb506f31df43c4
Author: cybersphinx <[email protected]>
Date: 2013-09-20 (Fri, 20 Sep 2013)
Changed paths:
M .gitignore
A 3rdparty/texinputs/underscore.sty
M build_tools/autorevision
M configure.ac
M lib/framework/Makefile.am
M lib/framework/framework.vcxproj
M lib/framework/framework.vcxproj.filters
A lib/framework/resource_lexer.cpp
A lib/framework/resource_parser.cpp
A lib/framework/resource_parser.h
A lib/framework/strres_lexer.cpp
A lib/framework/strres_parser.cpp
A lib/framework/strres_parser.h
M lib/gamelib/Makefile.am
A lib/gamelib/audp_lexer.cpp
A lib/gamelib/audp_parser.cpp
A lib/gamelib/audp_parser.h
M lib/gamelib/gamelib.vcxproj
M lib/gamelib/gamelib.vcxproj.filters
M lib/script/Makefile.am
A lib/script/chat_lexer.cpp
A lib/script/chat_parser.cpp
A lib/script/chat_parser.h
M lib/script/script.vcxproj
M lib/script/script.vcxproj.filters
A lib/script/script_lexer.cpp
A lib/script/script_parser.cpp
A lib/script/script_parser.h
M macosx/Warzone.xcodeproj/project.pbxproj
M macosx/configs/Fribidi-All.xcconfig
M macosx/configs/fetchscripts/GLExtensionWrangler-FetchSource.sh
M macosx/configs/fetchscripts/Ogg-FetchSource.sh
M macosx/configs/fetchscripts/Png-FetchSource.sh
M macosx/configs/fetchscripts/SetupPrebuiltComponents-CS-ID.sh
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M src/Makefile.am
M src/Warzone2100.vcxproj
M src/Warzone2100.vcxproj.filters
A src/level_lexer.cpp
A src/scriptvals_lexer.cpp
A src/scriptvals_parser.cpp
A src/scriptvals_parser.h
R win32/MSVCdelparser.bat
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
* bugfixes:
Simplify build process by getting rid of bison/flex dependencies.
Update autorevision to 1.6.
Check Moc after downloading Qt.
Use Gist as the primary location for the vorbis patch.
Update autorevision to 1.5.
Update ogg to 1.3.1 for the mac build.
Eliminate a few warnings in 3rdparty code.
Update the xcode project file to the 3.2 format.
Fix ups.
Update png to 1.5.17.
Update to glew 1.10.0 for the mac builds.
Compare:
https://github.com/Warzone2100/warzone2100/compare/a67c9ed3c607...989b3e7fb59e
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
