aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2025-01-01 21:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with default

Browse source 
--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2014-08-01 11:50:40 +02:00
commit c70d8597b2
10 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.hgtags
View file

@ -1,8 +1,4 @@
a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0 950d650ca92e6041611258d7e5131ccf661e4ec2 compatibility-merge
a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0 4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore/v0.8.0
0000000000000000000000000000000000000000 ryzomcore_0_8_0 00d9b6e29e95f56785fbf85abe60afd34674f402 ryzomcore/v0.9.0
0000000000000000000000000000000000000000 ryzomcore_0_8_0 79776c337176dd5b02e1a74fe5dfb703b91747aa ryzomcore/v0.9.1
4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0
950d650ca92e6041611258d7e5131ccf661e4ec2 latest-graft-to-default
950d650ca92e6041611258d7e5131ccf661e4ec2 latest-merge-from-default

4
code/CMakeLists.txt
View file

@ -2,7 +2,7 @@
# #
# NeL # NeL
# Authors: Nevrax and the NeL Community # Authors: Nevrax and the NeL Community
# Version: 0.9.0 # Version: 0.9.1
# #
# Notes: # Notes:
# * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path # * 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) PROJECT(RyzomCore CXX C)
SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MAJOR 0)
SET(NL_VERSION_MINOR 9) SET(NL_VERSION_MINOR 9)
SET(NL_VERSION_PATCH 0) SET(NL_VERSION_PATCH 1)
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}") SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

8
code/nel/src/3d/scene_group.cpp
View file

@ -753,7 +753,13 @@ bool CInstanceGroup::addToSceneWhenAllShapesLoaded (CScene& scene, IDriver *driv
{ {
_Instances[i]->clipUnlinkFromAll(); _Instances[i]->clipUnlinkFromAll();
for (j = 0; j < _InstancesInfos[i].Clusters.size(); ++j) for (j = 0; j < _InstancesInfos[i].Clusters.size(); ++j)
_ClusterInstances[_InstancesInfos[i].Clusters[j]]->clipAddChild( _Instances[i] ); {
uint32 clusterInst = _InstancesInfos[i].Clusters[j];
if (clusterInst < _ClusterInstances.size())
_ClusterInstances[clusterInst]->clipAddChild( _Instances[i] );
else
nlwarning("IG: BUG: Cluster infos size %u, indexing %u", (uint32)_ClusterInstances.size(), clusterInst);
}
// For the first time we have to set all the instances to NOT move (and not be rebinded) // For the first time we have to set all the instances to NOT move (and not be rebinded)
_Instances[i]->freeze(); _Instances[i]->freeze();
_Instances[i]->setClusterSystem (this); _Instances[i]->setClusterSystem (this);

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

@ -575,8 +575,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 9, 0, 0 FILEVERSION 0, 9, 1, 0
PRODUCTVERSION 0, 9, 0, 0 PRODUCTVERSION 0, 9, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -593,14 +593,14 @@ BEGIN
BEGIN BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core\0" VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileVersion", "0.9.0\0" VALUE "FileVersion", "0.9.1\0"
VALUE "InternalName", "CNelExport\0" VALUE "InternalName", "CNelExport\0"
VALUE "LegalCopyright", "\0" VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "CNelExport.dlu\0" VALUE "OriginalFilename", "CNelExport.dlu\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Ryzom Core\0" VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0" VALUE "ProductVersion", "0.9.1\0"
VALUE "SpecialBuild", "\0" VALUE "SpecialBuild", "\0"
END END
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 VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 9, 0, 0 FILEVERSION 0, 9, 1, 0
PRODUCTVERSION 0, 9, 0, 0 PRODUCTVERSION 0, 9, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -103,12 +103,12 @@ BEGIN
BEGIN BEGIN
VALUE "Comments", "http://www.ryzomcore.org/" VALUE "Comments", "http://www.ryzomcore.org/"
VALUE "FileDescription", "PatchMesh to RykolPatchMesh" VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
VALUE "FileVersion", "0.9.0" VALUE "FileVersion", "0.9.1"
VALUE "InternalName", "PatchMesh to RykolPatchMesh" VALUE "InternalName", "PatchMesh to RykolPatchMesh"
VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd." VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
VALUE "OriginalFilename", "nel_convert_patch.dlm" VALUE "OriginalFilename", "nel_convert_patch.dlm"
VALUE "ProductName", "NeL Patch Converter" VALUE "ProductName", "NeL Patch Converter"
VALUE "ProductVersion", "0.9.0" VALUE "ProductVersion", "0.9.1"
END END
END END
BLOCK "VarFileInfo" 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 VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 9, 0, 0 FILEVERSION 0, 9, 1, 0
PRODUCTVERSION 0, 9, 0, 0 PRODUCTVERSION 0, 9, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -533,13 +533,13 @@ BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core" VALUE "CompanyName", "Ryzom Core"
VALUE "FileDescription", "NeL Patch Edit" VALUE "FileDescription", "NeL Patch Edit"
VALUE "FileVersion", "0.9.0" VALUE "FileVersion", "0.9.1"
VALUE "InternalName", "neleditpatch" VALUE "InternalName", "neleditpatch"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc." 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 "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 "OriginalFilename", "neleditpatch.dlm"
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", "0.9.0" VALUE "ProductVersion", "0.9.1"
END END
END END
BLOCK "VarFileInfo" 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 VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 9, 0, 0 FILEVERSION 0, 9, 1, 0
PRODUCTVERSION 0, 9, 0, 0 PRODUCTVERSION 0, 9, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -116,14 +116,14 @@ BEGIN
VALUE "Comments", "TECH: cyril.corvazier\0" VALUE "Comments", "TECH: cyril.corvazier\0"
VALUE "CompanyName", "Ryzom Core\0" VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileDescription", "NeL Patch Paint\0" VALUE "FileDescription", "NeL Patch Paint\0"
VALUE "FileVersion", "0.9.0\0" VALUE "FileVersion", "0.9.1\0"
VALUE "InternalName", "mods\0" VALUE "InternalName", "mods\0"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0" VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nelpatchpaint.dlm\0" VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Ryzom Core\0" VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0" VALUE "ProductVersion", "0.9.1\0"
VALUE "SpecialBuild", "\0" VALUE "SpecialBuild", "\0"
END END
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 VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 9, 0, 0 FILEVERSION 0, 9, 1, 0
PRODUCTVERSION 0, 9, 0, 0 PRODUCTVERSION 0, 9, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -145,13 +145,13 @@ BEGIN
VALUE "Comments", "TECH: \0" VALUE "Comments", "TECH: \0"
VALUE "CompanyName", "Ryzom Core\0" VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileDescription", "Vertex Tree Paint\0" VALUE "FileDescription", "Vertex Tree Paint\0"
VALUE "FileVersion", "0.9.0\0" VALUE "FileVersion", "0.9.1\0"
VALUE "InternalName", "VertexTreePaint\0" VALUE "InternalName", "VertexTreePaint\0"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\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 "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 "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
VALUE "ProductName", "Ryzom Core\0" VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0" VALUE "ProductVersion", "0.9.1\0"
END END
END END
BLOCK "VarFileInfo" 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 VS_VERSION_INFO VERSIONINFO
FILEVERSION 0, 9, 0, 0 FILEVERSION 0, 9, 1, 0
PRODUCTVERSION 0, 9, 0, 0 PRODUCTVERSION 0, 9, 1, 0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -142,12 +142,12 @@ BEGIN
BEGIN BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0" VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core\0" VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileVersion", "0.9.0\0" VALUE "FileVersion", "0.9.1\0"
VALUE "InternalName", "Tile_utility\0" VALUE "InternalName", "Tile_utility\0"
VALUE "LegalCopyright", "\0" VALUE "LegalCopyright", "\0"
VALUE "OriginalFilename", "Tile_utility.dlu\0" VALUE "OriginalFilename", "Tile_utility.dlu\0"
VALUE "ProductName", "Ryzom Core\0" VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0" VALUE "ProductVersion", "0.9.1\0"
VALUE "FileDescription", "Create material for tiles\0" VALUE "FileDescription", "Create material for tiles\0"
VALUE "Comments", "TECH: \0" VALUE "Comments", "TECH: \0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"

2
code/web/public_php/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php
View file

@ -14,7 +14,7 @@
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.datasources.dbo
* @since CakePHP(tm) v 0.9.0 * @since CakePHP(tm) v 0.9.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */