From 699b9c365f0728bddfc7d4828e9582079df08306 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 30 Apr 2014 13:05:40 +0200 Subject: [PATCH 1/6] Remove graft tag --- .hgtags | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.hgtags b/.hgtags index b2e9ddbcf..872521985 100644 --- a/.hgtags +++ b/.hgtags @@ -3,10 +3,4 @@ a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0 0000000000000000000000000000000000000000 ryzomcore_0_8_0 0000000000000000000000000000000000000000 ryzomcore_0_8_0 4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0 -2e439cca8c3746df8ea64e1aab2d4d2ab9ca95d8 latest-default-graft -2e439cca8c3746df8ea64e1aab2d4d2ab9ca95d8 latest-default-graft -e4680cd1f1ce24747c4db73eeb4b107f6f6c45d4 latest-default-graft -e4680cd1f1ce24747c4db73eeb4b107f6f6c45d4 latest-default-graft -8162b598e9e233ce0886d3b8b41151f12a7bff01 latest-default-graft -8162b598e9e233ce0886d3b8b41151f12a7bff01 latest-default-graft -5f0b297fb908985504cef899469bfca9a9f9816c latest-default-graft + From fe6c9d7ba2cb4be935f3b73dd2ea01ee90bc1f3d Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 30 Apr 2014 13:06:48 +0200 Subject: [PATCH 2/6] Added tag latest-graft-to-default for changeset 950d650ca92e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 872521985..60ba2662d 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0 0000000000000000000000000000000000000000 ryzomcore_0_8_0 4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0 +950d650ca92e6041611258d7e5131ccf661e4ec2 latest-graft-to-default From db1f8221c30793038f81ff32c229eb3a4de5e9e3 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 30 Apr 2014 13:07:12 +0200 Subject: [PATCH 3/6] Added tag latest-merge-from-default for changeset 950d650ca92e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 60ba2662d..cb11e3e8b 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0 4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0 950d650ca92e6041611258d7e5131ccf661e4ec2 latest-graft-to-default +950d650ca92e6041611258d7e5131ccf661e4ec2 latest-merge-from-default From d7c9608d837f47559b2752154f5eb8ff9d1095c3 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 9 May 2014 19:18:56 +0200 Subject: [PATCH 4/6] Fixed: Compilation error --- code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp b/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp index d4850a5aa..8178a3ed3 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp @@ -19,6 +19,3 @@ // stdafx.obj will contain the pre-compiled type information #include "stdafx.h" - - -void foo_std_afx_to_remove_warning() {}; From b57755b9ee49ddbd429193e06edd32e0859bad5d Mon Sep 17 00:00:00 2001 From: botanic Date: Sat, 10 May 2014 09:15:00 -0700 Subject: [PATCH 5/6] Fix for bug from de6f606 --- .../ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php index e51dc1872..2901918e2 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php @@ -56,6 +56,7 @@ if (!isset($_POST['function'])) { //require the pages that are being needed. require_once( '../config.default.php' ); + require_once( $AMS_LIB.'/libinclude.php' ); ini_set( "display_errors", true ); error_reporting( E_ALL ); From 46e5c39e74b8a43c955fb8815fa27f90e8b9699b Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 13 May 2014 09:29:45 +0200 Subject: [PATCH 6/6] Changed: Replaced some spaces by tabulations --- code/ryzom/client/src/init.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index d603be4a3..aa18cee6a 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -333,8 +333,8 @@ void ExitClientError (const char *format, ...) // Exit extern void quitCrashReport (); quitCrashReport (); - NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated - // so don't want to fire an assert here + NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated + // so don't want to fire an assert here exit (EXIT_FAILURE); } @@ -558,11 +558,11 @@ static std::string replaceApplicationDirToken(const std::string &dir) { #ifdef NL_OS_MAC - // if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory - if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/') - { - return getAppBundlePath() + "/Contents/Resources/" + dir; - } + // if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory + if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/') + { + return getAppBundlePath() + "/Contents/Resources/" + dir; + } #else static const std::string token = ""; std::string::size_type pos = dir.find(token); @@ -695,7 +695,7 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress) { NLMISC::TTime initPaths = ryzomGetLocalTime (); H_AUTO(InitRZAddSearchPaths) - for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++) + for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++) { progress.progress ((float)i/(float)ClientCfg.PreDataPath.size()); progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size()); @@ -771,7 +771,7 @@ void prelogInit() NLMISC_REGISTER_CLASS(CNamedEntityPositionState); NLMISC_REGISTER_CLASS(CAnimalPositionState); - // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); + // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); // Init XML Lib allocator // Due to Bug #906, we disable the stl xml allocation @@ -924,9 +924,9 @@ void prelogInit() // For login phase, MUST be in windowed UDriver::CMode mode; - mode.Width = 1024; - mode.Height = 768; - mode.Windowed = true; + mode.Width = 1024; + mode.Height = 768; + mode.Windowed = true; // Disable Hardware Vertex Program. if(ClientCfg.DisableVtxProgram) @@ -944,7 +944,7 @@ void prelogInit() else Driver->setSwapVBLInterval(0); - if (StereoDisplay) // VR_CONFIG // VR_DRIVER + if (StereoDisplay) // VR_CONFIG // VR_DRIVER { // override mode TODO } @@ -1000,7 +1000,7 @@ void prelogInit() // check if an icon is present in registered paths if(CPath::exists("ryzom.png")) - filenames.push_back(CPath::lookup("ryzom.png")); + filenames.push_back(CPath::lookup("ryzom.png")); vector bitmaps;