Merge with hotfix

--HG-- branch : develop
2015-03-07 00:01:02 +01:00 · 2015-03-07 00:01:02 +01:00 · 9d36ac8cb0
commit 9d36ac8cb0
parent 2d297efc2a 646ffa3195
11 changed files with 30 additions and 29 deletions
--- a/.hgtags
+++ b/.hgtags
@ -6,3 +6,4 @@ fedf2aa443d09707beed814b0f499c6a5519cc84 ryzomcore/v0.10.0
 edaa3624a56420b02ccc64c26059801a389927ee ryzomcore/v0.11.0
 e3fe4855f22c3e75722e015dc33c091c340b3ad7 ryzomcore/v0.11.1
 9e583b717fd63be0be9fd60b99087abf1691ea49 ryzomcore/v0.11.2
+bfe5628e14a024ba7ea32e4b326ae433a07856b9 ryzomcore/v0.11.3
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@ -2,7 +2,7 @@
 #
 # Ryzom Core
 #  Authors: Nevrax and the Ryzom Core Community
-#  Version: 0.11.2
+#  Version: 0.11.3
 #
 # Notes:
 #   * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path
@ -48,7 +48,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 0)
 SET(NL_VERSION_MINOR 11)
-SET(NL_VERSION_PATCH 2)
+SET(NL_VERSION_PATCH 3)
 SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")

 #-----------------------------------------------------------------------------
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
@ -575,8 +575,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -593,14 +593,14 @@ BEGIN
        BEGIN
            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
            VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
            VALUE "InternalName", "CNelExport\0"
            VALUE "LegalCopyright", "\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "CNelExport.dlu\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
            VALUE "SpecialBuild", "\0"
        END
    END
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
@ -85,8 +85,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -103,12 +103,12 @@ BEGIN
        BEGIN
            VALUE "Comments", "http://www.ryzomcore.org/"
            VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
-            VALUE "FileVersion", "0.11.2"
+            VALUE "FileVersion", "0.11.3"
            VALUE "InternalName", "PatchMesh to RykolPatchMesh"
            VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
            VALUE "OriginalFilename", "nel_convert_patch.dlm"
            VALUE "ProductName", "NeL Patch Converter"
-            VALUE "ProductVersion", "0.11.2"
+            VALUE "ProductVersion", "0.11.3"
        END
    END
    BLOCK "VarFileInfo"
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
@ -514,8 +514,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -533,13 +533,13 @@ BEGIN
            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
            VALUE "CompanyName", "Ryzom Core"
            VALUE "FileDescription", "NeL Patch Edit"
-            VALUE "FileVersion", "0.11.2"
+            VALUE "FileVersion", "0.11.3"
            VALUE "InternalName", "neleditpatch"
            VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc."
            VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF."
            VALUE "OriginalFilename", "neleditpatch.dlm"
            VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", "0.11.2"
+            VALUE "ProductVersion", "0.11.3"
        END
    END
    BLOCK "VarFileInfo"
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
@ -96,8 +96,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -116,14 +116,14 @@ BEGIN
            VALUE "Comments", "TECH: cyril.corvazier\0"
            VALUE "CompanyName", "Ryzom Core\0"
            VALUE "FileDescription", "NeL Patch Paint\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
            VALUE "InternalName", "mods\0"
            VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
            VALUE "SpecialBuild", "\0"
        END
    END
--- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR      CURSOR  DISCARDABLE     "dropcurs.cur"
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -145,13 +145,13 @@ BEGIN
            VALUE "Comments", "TECH: \0"
            VALUE "CompanyName", "Ryzom Core\0"
            VALUE "FileDescription", "Vertex Tree Paint\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
            VALUE "InternalName", "VertexTreePaint\0"
            VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0"
            VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0"
            VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
        END
    END
    BLOCK "VarFileInfo"
--- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
+++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
@ -124,8 +124,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -142,12 +142,12 @@ BEGIN
        BEGIN
            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
            VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.11.2\0"
+            VALUE "FileVersion", "0.11.3\0"
            VALUE "InternalName", "Tile_utility\0"
            VALUE "LegalCopyright", "\0"
            VALUE "OriginalFilename", "Tile_utility.dlu\0"
            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.11.2\0"
+            VALUE "ProductVersion", "0.11.3\0"
            VALUE "FileDescription", "Create material for tiles\0"
            VALUE "Comments", "TECH: \0"
            VALUE "LegalTrademarks", "\0"
--- a/code/ryzom/common/src/game_share/ryzom_version.h
+++ b/code/ryzom/common/src/game_share/ryzom_version.h
@ -19,7 +19,7 @@

 #define RYZOM_VERSION	"ryzomcore" \
 	"/" \
-	"v0.11.2" \
+	"v0.11.3" \
 	"-dev"

 #endif // RYZOM_VERSION_H
--- a/code/tool/increment_version/increment_version.py
+++ b/code/tool/increment_version/increment_version.py
@ -32,7 +32,7 @@ RootDir = os.getcwd();

 MajorVersion = 0
 MinorVersion = 11
-PatchVersion = 2
+PatchVersion = 3
 Revision = 0

 VersionString = str(MajorVersion) + "." + str(MinorVersion) + "." + str(PatchVersion)
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@ -167,7 +167,7 @@
 		</div>

 		<footer>
-			{if $permission > 1}<p class="pull-right">AMS 0.11.2 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
+			{if $permission > 1}<p class="pull-right">AMS 0.11.3 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
 		</footer>
 		{/if}
 	</div><!--/.fluid-container-->