diff --git a/.hgignore b/.hgignore new file mode 100644 index 000000000..c8c4c2605 --- /dev/null +++ b/.hgignore @@ -0,0 +1,93 @@ +syntax: glob + +# Various build directories +bin +obj +Debug +Release +ReleaseDebug +DebugFast +ReleaseDebugStatic +DebugFastStatic + +# Test and application directories +screenshots +release +test +Temp + +# NeL cache +*.packed_sheets + +# Windows compile +*.exe +*.dll +*.lib +*.obj + +# Linux compile +*.a +*.la +*.o +*_debug + +# Log dump files +report_refused +report_failed +exception_catched +*.stat +*.log +log.txt + +# Max plugin extensions +*.dlx +*.dlm +*.dlu + +# Linux garbage +Makefile.in +aclocal.m4 +config.guess +config.sub +configure +depcomp +nelconfig.h.in +install-sh +ltmain.sh +missing +ylwrap +*.config +*.creator +*.files +*.includes +*.mk + +# Visual Studio garbage +*.opensdf +UpgradeLog*.XML +_UpgradeReport_Files +BuildLog.htm +mt.dep +ipch +*.suo +*.ncb +*.user +*.ilk +*.pdb +*.aps +*.exp +*.idb +*.sdf + +# Python cache +*.pyd +*.pyc + +# Qt compiler +moc_*.cpp +*.moc + +# Misc garbage +*.cachefile +*.cache +*.7z diff --git a/code/nel/include/nel/misc/types_nl.h b/code/nel/include/nel/misc/types_nl.h index 694fc968c..d6b735a39 100644 --- a/code/nel/include/nel/misc/types_nl.h +++ b/code/nel/include/nel/misc/types_nl.h @@ -52,9 +52,11 @@ # if _MSC_VER >= 1500 # define NL_COMP_VC9 # include // This way we know about _HAS_TR1 :O -# if defined(_HAS_TR1) && (_HAS_TR1 + 0) // VC9 TR1 feature pack -# define NL_ISO_STDTR1_AVAILABLE -# define NL_ISO_STDTR1_HEADER(header)
+# ifndef _STLPORT_VERSION // STLport doesn't depend on MS STL features +# if defined(_HAS_TR1) && (_HAS_TR1 + 0) // VC9 TR1 feature pack +# define NL_ISO_STDTR1_AVAILABLE +# define NL_ISO_STDTR1_HEADER(header)
+# endif # endif # elif _MSC_VER >= 1400 # define NL_COMP_VC8 @@ -262,14 +264,18 @@ typedef unsigned int uint; // at least 32bits (depend of processor) #ifndef NL_ISO_STDTR1_AVAILABLE # include # include -# if defined(NL_COMP_VC7) || defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) // VC7 through 9 -# define CHashMap stdext::hash_map -# define CHashSet stdext::hash_set -# define CHashMultiMap stdext::hash_multimap -# else // MSVC6 +# ifdef _STLP_HASH_MAP # define CHashMap ::std::hash_map # define CHashSet ::std::hash_set # define CHashMultiMap ::std::hash_multimap +# pragma message("Using STLport") +# elif defined(NL_COMP_VC7) || defined(NL_COMP_VC71) || defined(NL_COMP_VC8) || defined(NL_COMP_VC9) // VC7 through 9 +# define CHashMap stdext::hash_map +# define CHashSet stdext::hash_set +# define CHashMultiMap stdext::hash_multimap +# pragma message("Using MS STL") +# else +# pragma error("You need to update your compiler") # endif #endif // NL_ISO_STDTR1_AVAILABLE @@ -331,6 +337,7 @@ template<> struct hash # define CHashMap std::tr1::unordered_map # define CHashSet std::tr1::unordered_set # define CHashMultiMap std::tr1::unordered_multimap +# pragma message("Using TR1 extensions") #endif /** diff --git a/code/nel/tools/3d/plugin_max/nel_export/nelexport_r.exp b/code/nel/tools/3d/plugin_max/nel_export/nelexport_r.exp deleted file mode 100644 index 0cbbb7368..000000000 Binary files a/code/nel/tools/3d/plugin_max/nel_export/nelexport_r.exp and /dev/null differ diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nelconvertpatch_r.exp b/code/nel/tools/3d/plugin_max/nel_patch_converter/nelconvertpatch_r.exp deleted file mode 100644 index 61b49a1bd..000000000 Binary files a/code/nel/tools/3d/plugin_max/nel_patch_converter/nelconvertpatch_r.exp and /dev/null differ diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nelpaintpatch_r.exp b/code/nel/tools/3d/plugin_max/nel_patch_paint/nelpaintpatch_r.exp deleted file mode 100644 index 75c4d8aeb..000000000 Binary files a/code/nel/tools/3d/plugin_max/nel_patch_paint/nelpaintpatch_r.exp and /dev/null differ diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint.vcproj b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint.vcproj index 7eee397a7..61fd98897 100644 --- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint.vcproj +++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint.vcproj @@ -1,514 +1,234 @@ - + + ProjectGUID="{680F9C48-975D-425A-89DF-D7AC3C093968}" + RootNamespace="vertex_tree_paint" + TargetFrameworkVersion="0" + > + Name="Win32" + /> + + - - - - - - - - - - - - - - - + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + + /> + Name="VCCLCompilerTool" + Optimization="4" + InlineFunctionExpansion="1" + PreprocessorDefinitions="LIBXML_STATIC;WIN32;_DEBUG;_USRDLL" + StringPooling="true" + ExceptionHandling="2" + BasicRuntimeChecks="3" + SmallerTypeCheck="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> - + Name="VCManagedResourceCompilerTool" + /> + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + AdditionalDependencies="maxscrpt.lib helpsys.lib winmm.lib libxml2.lib comctl32.lib delayimp.lib bmm.lib core.lib edmodel.lib geom.lib gfx.lib mesh.lib mnmath.lib paramblk2.lib maxutil.lib acap.lib version.lib freetype.lib ws2_32.lib" + OutputFile="..\plugins\$(ProjectName)_d.dlm" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrt" + ModuleDefinitionFile="$(RootNamespace).def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" + ImportLibrary="$(ProjectName)_d.lib" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + /> - - - - - - - - + Name="VCPreLinkEventTool" + /> + AdditionalDependencies="maxscrpt.lib helpsys.lib winmm.lib libxml2.lib comctl32.lib delayimp.lib bmm.lib core.lib edmodel.lib geom.lib gfx.lib mesh.lib mnmath.lib paramblk2.lib maxutil.lib acap.lib version.lib freetype.lib ws2_32.lib" + OutputFile="..\plugins\$(ProjectName)_r.dlm" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd" + ModuleDefinitionFile="$(RootNamespace).def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(ProjectName)_r.lib" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - - - - - - - - - - - - - - - - - + Name="VCPostBuildEventTool" + /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/nel/tools/3d/plugin_max/plugin_max_public.sln b/code/nel/tools/3d/plugin_max/plugin_max_public.sln index b7d0e3960..38f9d99ed 100644 --- a/code/nel/tools/3d/plugin_max/plugin_max_public.sln +++ b/code/nel/tools/3d/plugin_max/plugin_max_public.sln @@ -154,6 +154,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nel_patch_edit", "nel_patch {CDFC60B0-9D01-4822-ACAD-B66F7130FCAD} = {CDFC60B0-9D01-4822-ACAD-B66F7130FCAD} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nel_vertex_tree_paint", "nel_vertex_tree_paint\nel_vertex_tree_paint.vcproj", "{680F9C48-975D-425A-89DF-D7AC3C093968}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -256,6 +258,10 @@ Global {53B9D9A1-AE6B-4E39-82B2-E8EE01075EEC}.Debug|Win32.Build.0 = Debug|Win32 {53B9D9A1-AE6B-4E39-82B2-E8EE01075EEC}.Release|Win32.ActiveCfg = Release|Win32 {53B9D9A1-AE6B-4E39-82B2-E8EE01075EEC}.Release|Win32.Build.0 = Release|Win32 + {680F9C48-975D-425A-89DF-D7AC3C093968}.Debug|Win32.ActiveCfg = Debug|Win32 + {680F9C48-975D-425A-89DF-D7AC3C093968}.Debug|Win32.Build.0 = Debug|Win32 + {680F9C48-975D-425A-89DF-D7AC3C093968}.Release|Win32.ActiveCfg = Release|Win32 + {680F9C48-975D-425A-89DF-D7AC3C093968}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/code/nel/tools/3d/plugin_max/tile_utility/neltileutility_r.exp b/code/nel/tools/3d/plugin_max/tile_utility/neltileutility_r.exp deleted file mode 100644 index a8c27b2db..000000000 Binary files a/code/nel/tools/3d/plugin_max/tile_utility/neltileutility_r.exp and /dev/null differ diff --git a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings_r.exp b/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings_r.exp deleted file mode 100644 index 3c870cfb7..000000000 Binary files a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings_r.exp and /dev/null differ diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 167283fa3..dea96674c 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -981,7 +981,7 @@ TInterfaceState globalMenu() while (PlayerWantToGoInGame == false) { - #ifdef NL_DEBUG + #if defined(NL_OS_WINDOWS) && defined(NL_DEBUG) // tmp for debug if (::GetAsyncKeyState(VK_SPACE)) { @@ -1064,7 +1064,7 @@ TInterfaceState globalMenu() nlSleep(ClientCfg.Sleep); } - #ifdef NL_DEBUG + #if defined(NL_OS_WINDOWS) && defined(NL_DEBUG) if (::GetAsyncKeyState(VK_CONTROL)) { pIM->displayUIViewBBoxs(""); diff --git a/code/ryzom/client/src/libwww.cpp b/code/ryzom/client/src/libwww.cpp index 8f01e8440..aa95339a4 100644 --- a/code/ryzom/client/src/libwww.cpp +++ b/code/ryzom/client/src/libwww.cpp @@ -406,7 +406,7 @@ int requestTerminater (HTRequest * request, HTResponse * /* response */, // the parameter is actually an uint32 if (param != 0) { - CGroupHTML::TGroupHtmlByUIDMap::iterator it= CGroupHTML::_GroupHtmlByUID.find((uint32)param); + CGroupHTML::TGroupHtmlByUIDMap::iterator it= CGroupHTML::_GroupHtmlByUID.find((uint32)(size_t)param); if(it!=CGroupHTML::_GroupHtmlByUID.end()) { // get the pointer. NB: the refptr should not be NULL diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index 343945446..47a75d97f 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -1197,7 +1197,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de // file not found, delete local file throw Exception ("curl init failed"); } - curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, downloadProgressFunc); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) progress); curl_easy_setopt(curl, CURLOPT_URL, source.c_str()); diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/emotes/list.emot b/code/ryzom/common/data_leveldesign/leveldesign/game_element/emotes/list.emot new file mode 100644 index 000000000..5088d4a41 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/emotes/list.emot @@ -0,0 +1,13 @@ + +
+ + + + + + + + + + + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/emotes/list.text_emotes b/code/ryzom/common/data_leveldesign/leveldesign/game_element/emotes/list.text_emotes new file mode 100644 index 000000000..8dc793bab --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/emotes/list.text_emotes @@ -0,0 +1,13 @@ + +
+ + + + + + + + + + + diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/action_success_for_difficulty_table.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/action_success_for_difficulty_table.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/action_success_for_difficulty_table.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/break_cast_resist.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/break_cast_resist.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/break_cast_resist.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/craft.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/craft.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/craft.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/curative_magic.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/curative_magic.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/curative_magic.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/default.action_xp_factor b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/default.action_xp_factor new file mode 100644 index 000000000..bf5f18ea0 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/default.action_xp_factor @@ -0,0 +1,13 @@ + +
+ + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/dodge_parry.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/dodge_parry.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/dodge_parry.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/dodge_parry_ai.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/dodge_parry_ai.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/dodge_parry_ai.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/extracting.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/extracting.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/extracting.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/fight_phrase.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/fight_phrase.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/fight_phrase.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/magic_resist.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/magic_resist.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/magic_resist.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/magic_resist_link.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/magic_resist_link.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/magic_resist_link.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/offensive_magic.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/offensive_magic.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/offensive_magic.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/prospecting.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/prospecting.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/prospecting.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/shield_use.succes_chances_table b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/shield_use.succes_chances_table new file mode 100644 index 000000000..15ffc8604 --- /dev/null +++ b/code/ryzom/common/data_leveldesign/leveldesign/game_element/xp_table/shield_use.succes_chances_table @@ -0,0 +1,315 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp b/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp index b239d5c5a..c590e4d5a 100644 --- a/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp +++ b/code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp @@ -247,7 +247,7 @@ bool CLogAnalyserService::getQueryResult(uint32 queryId, std::string& result, si page = numpage-1; uint lmin = page*linePerPage; - uint lmax = std::min((uint)(lmin+linePerPage), _Finished[i]->Result.size()); + uint lmax = std::min((uint)(lmin+linePerPage), (uint)_Finished[i]->Result.size()); uint l; result.clear(); @@ -329,7 +329,7 @@ bool CLogAnalyserService::getQueryResult(uint32 queryId, std::string& result, si page = numpage-1; uint lmin = page*linePerPage; - uint lmax = std::min((uint)(lmin+linePerPage), matchingLines.size()); + uint lmax = std::min((uint)(lmin+linePerPage), (uint)matchingLines.size()); result.clear(); diff --git a/code/ryzom/tools/server/sql/ryzom_default_data.sql b/code/ryzom/tools/server/sql/ryzom_default_data.sql index 562338477..7d470df6c 100644 --- a/code/ryzom/tools/server/sql/ryzom_default_data.sql +++ b/code/ryzom/tools/server/sql/ryzom_default_data.sql @@ -4,7 +4,7 @@ # Server version: 5.1.37-1ubuntu5.1 # Server OS: debian-linux-gnu # HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 15:22:21 +# Date/time: 2010-05-08 15:31:21 # -------------------------------------------------------- /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; @@ -13,12 +13,12 @@ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; # Dumping data for table nel.domain: 8 rows /*!40000 ALTER TABLE `domain` DISABLE KEYS */; -REPLACE INTO `domain` (`domain_id`, `domain_name`, `status`, `patch_version`, `backup_patch_url`, `patch_urls`, `login_address`, `session_manager_address`, `ring_db_name`, `web_host`, `web_host_php`, `description`) VALUES (12, 'ryzom_open', 'ds_open', 610, 'http://open.ryzom.com:23001', NULL, 'open.ryzom.com:49998', 'open.ryzom.com:49999', 'ring_open', 'open.ryzom.com:30000', 'open.ryzom.com:40916', 'Open Domain'); +INSERT IGNORE INTO `domain` (`domain_id`, `domain_name`, `status`, `patch_version`, `backup_patch_url`, `patch_urls`, `login_address`, `session_manager_address`, `ring_db_name`, `web_host`, `web_host_php`, `description`) VALUES (12, 'ryzom_open', 'ds_open', 610, 'http://open.ryzom.com:23001', NULL, 'open.ryzom.com:49998', 'open.ryzom.com:49999', 'ring_open', 'open.ryzom.com:30000', 'open.ryzom.com:40916', 'Open Domain'); /*!40000 ALTER TABLE `domain` ENABLE KEYS */; # Dumping data for table nel.shard: 17 rows /*!40000 ALTER TABLE `shard` DISABLE KEYS */; -REPLACE INTO `shard` (`ShardId`, `domain_id`, `WsAddr`, `NbPlayers`, `Name`, `Online`, `ClientApplication`, `Version`, `PatchURL`, `DynPatchURL`, `FixedSessionId`, `State`, `MOTD`, `prim`) VALUES (302, 12, 'open.ryzom.com', 0, 'Open Shard', 0, 'ryzom_open', '', '', '', 0, 'ds_dev', '', 30); +INSERT IGNORE INTO `shard` (`ShardId`, `domain_id`, `WsAddr`, `NbPlayers`, `Name`, `Online`, `ClientApplication`, `Version`, `PatchURL`, `DynPatchURL`, `FixedSessionId`, `State`, `MOTD`, `prim`) VALUES (302, 12, 'open.ryzom.com', 0, 'Open Shard', 0, 'ryzom_open', '', '', '', 0, 'ds_dev', '', 30); /*!40000 ALTER TABLE `shard` ENABLE KEYS */; # -------------------------------------------------------- # Host: 94.23.202.75 @@ -26,7 +26,7 @@ REPLACE INTO `shard` (`ShardId`, `domain_id`, `WsAddr`, `NbPlayers`, `Name`, `On # Server version: 5.1.37-1ubuntu5.1 # Server OS: debian-linux-gnu # HeidiSQL version: 5.0.0.3272 -# Date/time: 2010-05-08 15:22:21 +# Date/time: 2010-05-08 15:31:22 # -------------------------------------------------------- /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; @@ -35,12 +35,12 @@ REPLACE INTO `shard` (`ShardId`, `domain_id`, `WsAddr`, `NbPlayers`, `Name`, `On /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; # Dumping data for table ring_open.sessions: 1 rows /*!40000 ALTER TABLE `sessions` DISABLE KEYS */; -REPLACE INTO `sessions` (`session_id`, `session_type`, `title`, `owner`, `plan_date`, `start_date`, `description`, `orientation`, `level`, `rule_type`, `access_type`, `state`, `host_shard_id`, `subscription_slots`, `reserved_slots`, `free_slots`, `estimated_duration`, `final_duration`, `folder_id`, `lang`, `icone`, `anim_mode`, `race_filter`, `religion_filter`, `guild_filter`, `shard_filter`, `level_filter`, `subscription_closed`, `newcomer`) VALUES (302, 'st_mainland', 'open shard mainland', 0, '2005-09-21 12:41:33', '2005-08-31 00:00:00', '', 'so_other', 'sl_a', 'rt_strict', 'at_public', 'ss_planned', 0, 0, 0, 0, 'et_short', 0, 0, 'lang_en', '', 'am_dm', 'rf_fyros,rf_matis,rf_tryker,rf_zorai', 'rf_kami,rf_karavan,rf_neutral', 'gf_any_player', '', 'lf_a,lf_b,lf_c,lf_d,lf_e,lf_f', 0, 0); +INSERT IGNORE INTO `sessions` (`session_id`, `session_type`, `title`, `owner`, `plan_date`, `start_date`, `description`, `orientation`, `level`, `rule_type`, `access_type`, `state`, `host_shard_id`, `subscription_slots`, `reserved_slots`, `free_slots`, `estimated_duration`, `final_duration`, `folder_id`, `lang`, `icone`, `anim_mode`, `race_filter`, `religion_filter`, `guild_filter`, `shard_filter`, `level_filter`, `subscription_closed`, `newcomer`) VALUES (302, 'st_mainland', 'open shard mainland', 0, '2005-09-21 12:41:33', '2005-08-31 00:00:00', '', 'so_other', 'sl_a', 'rt_strict', 'at_public', 'ss_planned', 0, 0, 0, 0, 'et_short', 0, 0, 'lang_en', '', 'am_dm', 'rf_fyros,rf_matis,rf_tryker,rf_zorai', 'rf_kami,rf_karavan,rf_neutral', 'gf_any_player', '', 'lf_a,lf_b,lf_c,lf_d,lf_e,lf_f', 0, 0); /*!40000 ALTER TABLE `sessions` ENABLE KEYS */; # Dumping data for table ring_open.shard: 1 rows /*!40000 ALTER TABLE `shard` DISABLE KEYS */; -REPLACE INTO `shard` (`shard_id`, `WSOnline`, `MOTD`, `OldState`, `RequiredState`) VALUES (302, 1, 'Shard up', 'ds_restricted', 'ds_open'); +INSERT IGNORE INTO `shard` (`shard_id`, `WSOnline`, `MOTD`, `OldState`, `RequiredState`) VALUES (302, 1, 'Shard up', 'ds_restricted', 'ds_open'); /*!40000 ALTER TABLE `shard` ENABLE KEYS */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;