From: GitHub <no...@gi...> - 2012-01-09 00:17:18
|
Branch: refs/heads/master Home: https://github.com/Warzone2100/warzone2100 Commit: 9cb0afa9b80141bc24c859ddb0fda9f25cc943b6 https://github.com/Warzone2100/warzone2100/commit/9cb0afa9b80141bc24c859ddb0fda9f25cc943b6 Author: safety0ff <saf...@us...> Date: 2012-01-08 (Sun, 08 Jan 2012) Changed paths: A 3rdparty/quesoglc/GL/glc.h A 3rdparty/quesoglc/Makefile.am A 3rdparty/quesoglc/context.c A 3rdparty/quesoglc/database.c A 3rdparty/quesoglc/except.c A 3rdparty/quesoglc/except.h A 3rdparty/quesoglc/font.c A 3rdparty/quesoglc/global.c A 3rdparty/quesoglc/internal.h A 3rdparty/quesoglc/master.c A 3rdparty/quesoglc/measure.c A 3rdparty/quesoglc/misc.c A 3rdparty/quesoglc/oarray.c A 3rdparty/quesoglc/oarray.h A 3rdparty/quesoglc/ocharmap.c A 3rdparty/quesoglc/ocharmap.h A 3rdparty/quesoglc/ocontext.c A 3rdparty/quesoglc/ocontext.h A 3rdparty/quesoglc/ofacedesc.c A 3rdparty/quesoglc/ofacedesc.h A 3rdparty/quesoglc/ofont.c A 3rdparty/quesoglc/ofont.h A 3rdparty/quesoglc/oglyph.c A 3rdparty/quesoglc/oglyph.h A 3rdparty/quesoglc/omaster.c A 3rdparty/quesoglc/omaster.h A 3rdparty/quesoglc/qglc_config.h A 3rdparty/quesoglc/render.c A 3rdparty/quesoglc/scalable.c A 3rdparty/quesoglc/texture.c A 3rdparty/quesoglc/texture.h A 3rdparty/quesoglc/transform.c A 3rdparty/quesoglc/unicode.c A 3rdparty/quesoglc/win32/ocharmap.c A 3rdparty/quesoglc/win32/ocontext.c A 3rdparty/quesoglc/win32/omaster.c M Makefile.am M configure.ac A m4/acx_pthread.m4 A m4/ax_tls.m4 M src/Makefile.am Log Message: ----------- Integrate QuesoGLC. Since no fixed release is out at the moment, always use ours. Closes #2828. Commit: ac550acd58b9f65bf0a4f68b02131b0f108d1021 https://github.com/Warzone2100/warzone2100/commit/ac550acd58b9f65bf0a4f68b02131b0f108d1021 Author: vexed <ve...@wz...> Date: 2012-01-08 (Sun, 08 Jan 2012) Changed paths: M configure.ac M data/Makefile.am R data/base/cacert.org-class3.pem R data/base/cacert.org-root.pem M lib/framework/debug.cpp M lib/framework/debug.h M lib/netplay/Makefile.am A lib/netplay/netjoin_stub.cpp R lib/netplay/netlobby.cpp R lib/netplay/netlobby.h M lib/netplay/netplay.cpp M lib/netplay/netplay.h M lib/netplay/netplay.vcxproj M lib/netplay/netplay.vcxproj.filters M macosx/Warzone.xcodeproj/project.pbxproj R macosx/configs/QJson-All.xcconfig R macosx/configs/QJson-Debug.xcconfig R macosx/configs/QJson-Release.xcconfig M src/Makefile.am M src/configuration.cpp M src/frontend.cpp M src/frontend.h M src/main.cpp M src/multiint.cpp M src/multiint.h M src/multijoin.cpp M src/multijoin.h M src/wrappers.cpp Log Message: ----------- Revert the new bsonlobby. Closes #3040. Revert "Remove bson from project files." This reverts commit 5c24f7b71688c64bef5427be3bbe91db365bedcd. Conflicts: lib/netplay/netlobby.h lib/netplay/netplay.vcxproj.filters src/Warzone2100.vcxproj Revert "Merge branch 'refs/heads/topic/QJson'" This reverts commit 6dd85baedfc6bb8b50d48d49a7f5e05ca6dfe798, reversing changes made to 7d349eb214c9492a21ef63c13f64d18d94f6dd16. Conflicts: Makefile.am lib/netplay/netlobby.cpp macosx/Warzone.xcodeproj/project.pbxproj src/Makefile.am Revert "Fix various build issues for both 'qtgame' and the bson /new lobby stuff" This reverts commit f76e960f7db1bee47e8d6bde9e4253d5806a7d73. Conflicts: lib/framework/framework.vcxproj lib/gamelib/gamelib.vcxproj lib/gamelib/gtime.cpp lib/netplay/netplay.vcxproj lib/netplay/netplay.vcxproj.filters src/Warzone2100.vcxproj win32/Warzone2100.sln Revert "Fix SSL errors on the Macs." This reverts commit 4c387a199b8ea73c92c87208218aa4bf9f5638c3. Revert "Merge branch 'bsonlobby' into master" This reverts commit 793c30a862627427282630bed87af8a3774bf719, reversing changes made to 5fa33b72096cb7402534cd5d0f16ab11d2622dcc. Conflicts: data/makefile.win32 lib/netplay/netlobby.cpp lib/netplay/netlobby.h lib/netplay/netplay.cpp lib/widget/label.cpp macosx/Warzone.xcodeproj/project.pbxproj po/POTFILES.in src/configuration.cpp src/frontend.h src/multiint.cpp Commit: d75706902375057604a8e5f32299d3c41b98554f https://github.com/Warzone2100/warzone2100/commit/d75706902375057604a8e5f32299d3c41b98554f Author: cybersphinx <ch...@gm...> Date: 2012-01-08 (Sun, 08 Jan 2012) Changed paths: M lib/netplay/netplay.cpp Log Message: ----------- Increase major netcode version. Commit: 9387b398fe4f79919fa2c4dd437aca8adf89b8ca https://github.com/Warzone2100/warzone2100/commit/9387b398fe4f79919fa2c4dd437aca8adf89b8ca Author: vexed <ve...@wz...> Date: 2012-01-08 (Sun, 08 Jan 2012) Changed paths: M lib/qtgame/main_qt.cpp M lib/sdl/main_sdl.cpp M src/main.cpp M src/version.cpp Log Message: ----------- Show the backend we are using in the version string and also in the crash report file. Closes #3034. Compare: https://github.com/Warzone2100/warzone2100/compare/95d09c1...9387b39 |