Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge ryzomcore/v0.11.3

Browse source
This commit is contained in:
kaetemi 2015-03-07 00:03:48 +01:00
commit e8d8503631
32 changed files with 3885 additions and 3721 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.hgeol
View file

@ -14,6 +14,8 @@
**.font = native
**.scheme = native
**.tpl = native
**.xsd = native
**.dox = native

4
code/CMakeLists.txt
View file

@ -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}")
#-----------------------------------------------------------------------------

8
code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
View file

@ -575,8 +575,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 11, 0, 0
PRODUCTVERSION 0, 11, 0, 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.0\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.0\0"
VALUE "ProductVersion", "0.11.3\0"
VALUE "SpecialBuild", "\0"
END
END

8
code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
View file

@ -85,8 +85,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 11, 0, 0
PRODUCTVERSION 0, 11, 0, 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.0"
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.0"
VALUE "ProductVersion", "0.11.3"
END
END
BLOCK "VarFileInfo"

8
code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
View file

@ -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"

8
code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
View file

@ -96,8 +96,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 11, 1, 0
PRODUCTVERSION 0, 11, 1, 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.1\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.1\0"
VALUE "ProductVersion", "0.11.3\0"
VALUE "SpecialBuild", "\0"
END
END

8
code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
View file

@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR CURSOR DISCARDABLE "dropcurs.cur"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 11, 0, 0
PRODUCTVERSION 0, 11, 0, 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.0\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.0\0"
VALUE "ProductVersion", "0.11.3\0"
END
END
BLOCK "VarFileInfo"

8
code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
View file

@ -124,8 +124,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 11, 0, 0
PRODUCTVERSION 0, 11, 0, 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.0\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.0\0"
VALUE "ProductVersion", "0.11.3\0"
VALUE "FileDescription", "Create material for tiles\0"
VALUE "Comments", "TECH: \0"
VALUE "LegalTrademarks", "\0"

2
code/ryzom/common/src/game_share/ryzom_version.h
View file

@ -20,7 +20,7 @@
#define RYZOM_COMPATIBILITY_VERSION "2.1.0"
#define RYZOM_VERSION RYZOM_COMPATIBILITY_VERSION" (ryzom" \
"/" \
"v0.11.2" \
"v0.11.3" \
")"
#endif // RYZOM_VERSION_H

162
code/tool/increment_version/increment_version.py Normal file
View file

@ -0,0 +1,162 @@
#
# Copyright (c) 2015 Jan Boon <jan.boon@kaetemi.be>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
import fileinput
import os
os.chdir('../../')
RootDir = os.getcwd();
MajorVersion = 0
MinorVersion = 11
PatchVersion = 3
Revision = 0
VersionString = str(MajorVersion) + "." + str(MinorVersion) + "." + str(PatchVersion)
VersionComma = str(MajorVersion) + ", " + str(MinorVersion) + ", " + str(PatchVersion) + ", " + str(Revision)
for line in fileinput.input("CMakeLists.txt", inplace = True):
if ("# Version" in line):
print "# Version: " + VersionString
elif ("SET(NL_VERSION_MAJOR" in line):
print "SET(NL_VERSION_MAJOR " + str(MajorVersion) + ")"
elif ("SET(NL_VERSION_MINOR" in line):
print "SET(NL_VERSION_MINOR " + str(MinorVersion) + ")"
elif ("SET(NL_VERSION_PATCH" in line):
print "SET(NL_VERSION_PATCH " + str(PatchVersion) + ")"
else:
print line.rstrip()
os.chdir(RootDir)
os.chdir("web/public_php/ams/templates/")
for line in fileinput.input("layout.tpl", inplace = True):
if (" Powered by: " in line):
print "\t\t\t{if $permission > 1}<p class=\"pull-right\">AMS " + VersionString + " Powered by: <a href=\"http://usman.it/free-responsive-admin-template\">Charisma</a></p>{/if}"
else:
print line.rstrip()
os.chdir(RootDir)
os.chdir("ryzom/common/src/game_share/")
for line in fileinput.input("ryzom_version.h", inplace = True):
if (("\"v" in line) and (" \\" in line)):
print "\t\"v" + VersionString + "\" \\"
else:
print line.rstrip()
os.chdir(RootDir)
os.chdir("nel/tools/3d/plugin_max/")
os.chdir("nel_export")
for line in fileinput.input("nel_export.rc", inplace = True):
if ("FILEVERSION" in line):
print " FILEVERSION " + VersionComma
elif ("PRODUCTVERSION" in line):
print " PRODUCTVERSION " + VersionComma
elif (("FileVersion" in line) and ("VALUE" in line)):
print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
elif (("ProductVersion" in line) and ("VALUE" in line)):
print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
else:
print line.rstrip()
os.chdir("..")
os.chdir("nel_patch_converter")
for line in fileinput.input("nel_patch_converter.rc", inplace = True):
if ("FILEVERSION" in line):
print " FILEVERSION " + VersionComma
elif ("PRODUCTVERSION" in line):
print " PRODUCTVERSION " + VersionComma
elif (("FileVersion" in line) and ("VALUE" in line)):
print " VALUE \"FileVersion\", \"" + VersionString + "\""
elif (("ProductVersion" in line) and ("VALUE" in line)):
print " VALUE \"ProductVersion\", \"" + VersionString + "\""
else:
print line.rstrip()
os.chdir("..")
os.chdir("nel_patch_edit")
for line in fileinput.input("mods.rc", inplace = True):
if ("FILEVERSION" in line):
print " FILEVERSION " + VersionComma
elif ("PRODUCTVERSION" in line):
print " PRODUCTVERSION " + VersionComma
elif (("FileVersion" in line) and ("VALUE" in line)):
print " VALUE \"FileVersion\", \"" + VersionString + "\""
elif (("ProductVersion" in line) and ("VALUE" in line)):
print " VALUE \"ProductVersion\", \"" + VersionString + "\""
else:
print line.rstrip()
os.chdir("..")
os.chdir("nel_patch_paint")
for line in fileinput.input("nel_patch_paint.rc", inplace = True):
if ("FILEVERSION" in line):
print " FILEVERSION " + VersionComma
elif ("PRODUCTVERSION" in line):
print " PRODUCTVERSION " + VersionComma
elif (("FileVersion" in line) and ("VALUE" in line)):
print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
elif (("ProductVersion" in line) and ("VALUE" in line)):
print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
else:
print line.rstrip()
os.chdir("..")
os.chdir("nel_vertex_tree_paint")
for line in fileinput.input("vertex_tree_paint.rc", inplace = True):
if ("FILEVERSION" in line):
print " FILEVERSION " + VersionComma
elif ("PRODUCTVERSION" in line):
print " PRODUCTVERSION " + VersionComma
elif (("FileVersion" in line) and ("VALUE" in line)):
print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
elif (("ProductVersion" in line) and ("VALUE" in line)):
print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
else:
print line.rstrip()
os.chdir("..")
os.chdir("tile_utility")
for line in fileinput.input("tile_utility.rc", inplace = True):
if ("FILEVERSION" in line):
print " FILEVERSION " + VersionComma
elif ("PRODUCTVERSION" in line):
print " PRODUCTVERSION " + VersionComma
elif (("FileVersion" in line) and ("VALUE" in line)):
print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
elif (("ProductVersion" in line) and ("VALUE" in line)):
print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
else:
print line.rstrip()
# end of file

2
code/web/public_php/ams/templates/layout.tpl
View file

@ -167,7 +167,7 @@
</div>
<footer>
{if $permission > 1}<p class="pull-right">AMS 0.11.0 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-->