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

Merge with game-device

Browse source
This commit is contained in:
kaetemi 2014-07-31 02:07:20 +02:00
commit a6812f5844
3215 changed files with 1954 additions and 2093 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.hgignore
View file

@ -160,6 +160,7 @@ code/build/*
code/build-2010/*
build/*
install/*
build_vc*
code/nel/tools/build_gamedata/configuration/buildsite.py
# Linux nel compile

62
code/CMakeModules/Find3dsMaxSDK.cmake
View file

@ -1,46 +1,52 @@
# - Find DirectInput
# Find the DirectSound includes and libraries
#
# MAXSDK_DIR - 3DSMAX SDK root directory
# MAXSDK_INCLUDE_DIR - where to find baseinterface.h
# MAXSDK_LIBRARIES - List of libraries when using 3DSMAX.
# MAXSDK_FOUND - True if MAX SDK found.
if(MAXSDK_INCLUDE_DIR)
# Already in cache, be silent
set(MAXSDK_FIND_QUIETLY TRUE)
# Already in cache, be silent
SET(MAXSDK_FIND_QUIETLY TRUE)
endif(MAXSDK_INCLUDE_DIR)
find_path(MAXSDK_INCLUDE_DIR max.h
FIND_PATH(MAXSDK_DIR
"include/maxversion.h"
HINTS
"$ENV{MAXSDK_DIR}"
PATHS
"$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/include"
"$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/include"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk/include"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk/include"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/include"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/include"
)
find_path(MAXSDK_CS_INCLUDE_DIR bipexp.h
PATHS
"$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/include/CS"
"$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/include/CS"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk/include/CS"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk/include/CS"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/include/CS"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/include/CS"
"$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk"
"$ENV{3DSMAX_2011_SDK_PATH}/maxsdk"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk"
)
FIND_PATH(MAXSDK_INCLUDE_DIR
max.h
HINTS
${MAXSDK_DIR}/include
)
FIND_PATH(MAXSDK_CS_INCLUDE_DIR bipexp.h
HINTS
${MAXSDK_DIR}/include/CS
)
IF(TARGET_X64)
SET(MAXSDK_LIBRARY_DIRS ${MAXSDK_DIR}/x64/lib)
ELSE(TARGET_X64)
SET(MAXSDK_LIBRARY_DIRS ${MAXSDK_DIR}/lib)
ENDIF(TARGET_X64)
MACRO(FIND_3DS_LIBRARY MYLIBRARY MYLIBRARYNAME)
FIND_LIBRARY(${MYLIBRARY}
NAMES ${MYLIBRARYNAME}
PATHS
"$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/lib"
"$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/lib"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2010 SDK/maxsdk/lib"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2009 SDK/maxsdk/lib"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/lib"
"$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/lib"
)
NAMES ${MYLIBRARYNAME}
HINTS
${MAXSDK_LIBRARY_DIRS}
)
ENDMACRO(FIND_3DS_LIBRARY MYLIBRARY MYLIBRARYNAME)
FIND_3DS_LIBRARY(MAXSDK_CORE_LIBRARY core)

9
code/CMakeModules/FindFMOD.cmake
View file

@ -23,8 +23,15 @@ FIND_PATH(FMOD_INCLUDE_DIR
PATH_SUFFIXES fmod fmod3
)
IF(TARGET_X64)
SET(FMOD_LIBRARY_NAMES fmod64 fmod)
ELSE(TARGET_X64)
SET(FMOD_LIBRARY_NAMES fmodvc fmod)
ENDIF(TARGET_X64)
FIND_LIBRARY(FMOD_LIBRARY
NAMES fmod fmodvc libfmod fmod64
NAMES
${FMOD_LIBRARY_NAMES}
PATHS
$ENV{FMOD_DIR}/lib
/usr/local/lib

5
code/nel/include/nel/3d/driver_user.h
View file

@ -34,7 +34,7 @@
#include "nel/3d/vertex_stream_manager.h"
#include "nel/3d/async_texture_manager.h"
#include "nel/3d/lod_character_manager.h"
#include "nel/3d/render_target_manager.h"
namespace NL3D
{
@ -71,6 +71,7 @@ protected:
bool _WindowInit;
CMatrixContext _CurrentMatrixContext;
CFontManager _FontManager;
CRenderTargetManager _RenderTargetManager;
// Components List.
typedef CPtrSet<CTextureUser> TTextureSet;
typedef CPtrSet<CTextContextUser> TTextContextSet;
@ -253,6 +254,8 @@ public:
/// get cahce information.
virtual std::string getFontManagerCacheInformation() const ;
virtual CRenderTargetManager &getRenderTargetManager() { return _RenderTargetManager; }
/** Create a new texture file, searching in CPath.
* \param file filename, local to CPath paths.

8
code/nel/include/nel/3d/particle_system.h
View file

@ -1178,9 +1178,6 @@ private:
CPSMultiMap<uint32, CPSLocatedBindable *>::M TLBMap;
TLBMap _LBMap;
float _AutoLODStartDistPercent;
uint8 _AutoLODDegradationExponent;
CPSAttribMaker<NLMISC::CRGBA> *_ColorAttenuationScheme;
NLMISC::CRGBA _GlobalColor;
NLMISC::CRGBA _GlobalColorLighted;
@ -1206,6 +1203,11 @@ private:
bool _HiddenAtCurrentFrame : 1;
bool _HiddenAtPreviousFrame : 1;
// The two following members have been moved after the bitfield to workaround a MSVC 64-bit compiler bug (fixed in VS2013)
// For more info, see: http://connect.microsoft.com/VisualStudio/feedback/details/777184/c-compiler-bug-vtable-pointer-put-at-wrong-offset-in-64-bit-mode
float _AutoLODStartDistPercent;
uint8 _AutoLODDegradationExponent;
static bool _SerialIdentifiers;
static bool _ForceDisplayBBox;

83
code/nel/include/nel/3d/render_target_manager.h Normal file
View file

@ -0,0 +1,83 @@
/**
* \file render_target_manager.h
* \brief CRenderTargetManager
* \date 2014-07-30 21:30GMT
* \author Jan Boon (Kaetemi)
* CRenderTargetManager
*/
/*
* Copyright (C) 2013 by authors
*
* This file is part of NL3D.
* NL3D is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* NL3D is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
* Public License for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with NL3D. If not, see
* <http://www.gnu.org/licenses/>.
*/
#ifndef NL3D_RENDER_TARGET_MANAGER_H
#define NL3D_RENDER_TARGET_MANAGER_H
#include <nel/misc/types_nl.h>
// STL includes
// NeL includes
#include <nel/misc/smart_ptr.h>
#include <nel/misc/geom_ext.h>
// Project includes
// ...
namespace NL3D {
class UDriver;
class ITexture;
class CTextureUser;
class CDriverUser;
struct CRenderTargetDescInt;
/**
* \brief CRenderTargetManager
* \date 2013-07-03 20:17GMT
* \author Jan Boon (Kaetemi)
* CRenderTargetManager
* Usage: Call 'getRenderTarget' when you start using a render target,
* call 'recycledRenderTarget' when the render target can be recycled.
* At end of frame call cleanup.
* Assumes semi-constant render target quantity between frames,
* except on changes of resolution or feature settings.
*/
class CRenderTargetManager
{
public:
CRenderTargetManager();
~CRenderTargetManager();
NL3D::CTextureUser *getRenderTarget(uint width, uint height);
void recycleRenderTarget(NL3D::CTextureUser *renderTarget);
void cleanup();
private:
friend class CDriverUser;
NL3D::UDriver *m_Driver;
std::vector<CRenderTargetDescInt *> m_RenderTargets;
}; /* class CRenderTargetManager */
} /* namespace NL3D */
#endif /* #ifndef NL3D_RENDER_TARGET_MANAGER_H */
/* end of file */

8
code/nel/include/nel/3d/stereo_debugger.h
View file

@ -65,10 +65,12 @@ public:
/// Sets driver and generates necessary render targets
virtual void setDriver(NL3D::UDriver *driver);
void releaseTextures();
/*void releaseTextures();
void initTextures();
void setTextures();
void verifyTextures();
void verifyTextures();*/
void getTextures();
void recycleTextures();
/// Gets the required screen resolution for this device
virtual bool getScreenResolution(uint &width, uint &height);
@ -116,9 +118,7 @@ private:
CFrustum m_Frustum[NL_STEREO_MAX_USER_CAMERAS];
CMatrix m_CameraMatrix[NL_STEREO_MAX_USER_CAMERAS];
NLMISC::CSmartPtr<NL3D::ITexture> m_LeftTex;
NL3D::CTextureUser *m_LeftTexU;
NLMISC::CSmartPtr<NL3D::ITexture> m_RightTex;
NL3D::CTextureUser *m_RightTexU;
NL3D::UMaterial m_Mat;
NLMISC::CQuadUV m_QuadUV;

3
code/nel/include/nel/3d/u_driver.h
View file

@ -60,6 +60,7 @@ class U3dMouseListener;
class ULight;
class UAnimationSet;
class UWaterEnvMap;
class CRenderTargetManager;
typedef void (*emptyProc)(void);
@ -319,6 +320,8 @@ public:
/// get cahce information.
virtual std::string getFontManagerCacheInformation() const =0;
virtual CRenderTargetManager &getRenderTargetManager() =0;
/** Create a new texture file, searching in CPath. NB: by default a textureFile created with this
* method has a setAllowDegradation() at false.

4
code/nel/samples/3d/cegui/NeLDriver.h
View file

@ -34,8 +34,8 @@ extern uint16 gScreenHeight;
class NeLDriver {
public:
NeLDriver(NL3D::UDriver *driver) { m_Driver=driver; }
virtual ~NeLDriver() { ; }
NeLDriver(NL3D::UDriver *driver):m_Driver(driver), m_TextContext(NULL), m_Scene(NULL) { }
virtual ~NeLDriver() { }
void init();
void update();

2
code/nel/samples/3d/cluster_viewer/main.cpp
View file

@ -362,7 +362,7 @@ int main()
}
++itAcc;
}
if ((vCluster.size() == 0) && (DispCS[0].pIG == pCurIG))
if (vCluster.empty() && (DispCS[0].pIG == pCurIG))
{
vCluster.push_back (pClipTrav->RootCluster);
}

2
code/nel/samples/3d/nel_qt/configuration.cpp
View file

@ -47,7 +47,7 @@ CConfiguration::~CConfiguration()
void CConfiguration::init()
{
// verify data
nlassert(!m_ConfigCallbacks.size());
nlassert(m_ConfigCallbacks.empty());
// load config
m_ConfigFile.load(NLQT_CONFIG_FILE);

2
code/nel/src/3d/driver_user.cpp
View file

@ -192,6 +192,7 @@ CDriverUser::CDriverUser (uintptr_t windowIcon, TDriver driver, emptyProc exitFu
_PBTri.lock (iba);
iba.setTri(0, 0, 1, 2);
_RenderTargetManager.m_Driver = this;
_ShapeBank._DriverUser = this;
NL_SET_IB_NAME(_PBLine, "CDriverUser::_PBLine");
@ -1357,6 +1358,7 @@ void CDriverUser::swapBuffers()
NL3D_HAUTO_SWAP_DRIVER;
_Driver->swapBuffers();
_RenderTargetManager.cleanup();
}
// ***************************************************************************

7
code/nel/src/3d/fasthls_modifier.cpp
View file

@ -109,7 +109,7 @@ CRGBA CFastHLSModifier::convert(uint H, uint L, uint S)
return col;
}
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71
#if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 71)
# pragma warning( push )
# pragma warning( disable : 4799 )
#endif
@ -124,7 +124,6 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin
static uint64 mmBlank = 0;
static uint64 mmOne = INT64_CONSTANT(0x00FF00FF00FF00FF);
static uint64 mmGray = INT64_CONSTANT(0x0080008000800080);
static uint64 mmInterpBufer[4]= {0,0,0,INT64_CONSTANT(0x00FF00FF00FF00FF)};
/*
dLum is actually 0xFFFFFF00 + realDLum
@ -136,6 +135,8 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin
#if defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM)
if(CSystemInfo::hasMMX())
{
static uint64 mmInterpBufer[4]= {0,0,0,INT64_CONSTANT(0x00FF00FF00FF00FF)};
__asm
{
mov edi, offset mmInterpBufer
@ -262,7 +263,7 @@ uint16 CFastHLSModifier::applyHLSMod(uint16 colorIn, uint8 dHue, uint dLum, uin
#pragma managed(pop)
#endif
#if defined(NL_COMP_VC) && NL_COMP_VC_VERSION >= 71
#if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 71)
# pragma warning( pop )
#endif

2
code/nel/src/3d/flare_model.cpp
View file

@ -271,7 +271,7 @@ void CFlareModel::traverseRender()
float depthRangeNear, depthRangeFar;
drv->getDepthRange(depthRangeNear, depthRangeFar);
z = (depthRangeFar - depthRangeNear) * z + depthRangeNear;
if (!v.size() || z > v[0]) // test against z-buffer
if (v.empty() || z > v[0]) // test against z-buffer
{
visibilityRatio = 0.f;
}

2
code/nel/src/3d/lod_character_shape.cpp
View file

@ -354,7 +354,7 @@ void CLodCharacterShape::buildMesh(const std::string &name, const CLodCharacte
const vector<CVector> &normals= lodBuild.Normals;
nlassert(numVertices>0);
nlassert(triangleIndices.size()>0);
nlassert(!triangleIndices.empty());
nlassert((triangleIndices.size()%3)==0);
nlassert(skinWeights.size() == numVertices);
nlassert(uvs.size() == numVertices);

2
code/nel/src/3d/program.cpp
View file

@ -94,7 +94,7 @@ const char *CProgramIndex::Names[NUM_UNIFORMS] =
void IProgram::buildInfo(CSource *source)
{
nlassert(!m_Source);
// nlassert(!m_Source); // VALID: When deleting driver and creating new one.
m_Source = source;

152
code/nel/src/3d/render_target_manager.cpp Normal file
View file

@ -0,0 +1,152 @@
/**
* \file render_target_manager.cpp
* \brief CRenderTargetManager
* \date 2014-07-30 21:30GMT
* \author Jan Boon (Kaetemi)
* CRenderTargetManager
*/
/*
* Copyright (C) 2014 by authors
*
* This file is part of NL3D.
* NL3D is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* NL3D is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
* Public License for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with NL3D. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include <nel/misc/types_nl.h>
#include <nel/3d/render_target_manager.h>
// STL includes
#include <sstream>
// NeL includes
// #include <nel/misc/debug.h>
#include <nel/3d/u_camera.h>
#include <nel/3d/u_driver.h>
#include <nel/3d/material.h>
#include <nel/3d/texture_bloom.h>
#include <nel/3d/texture_user.h>
#include <nel/3d/driver_user.h>
#include <nel/3d/u_texture.h>
// Project includes
using namespace std;
// using namespace NLMISC;
namespace NL3D {
struct CRenderTargetDescInt
{
public:
uint Width;
uint Height;
NL3D::CTextureUser *TextureUser;
NLMISC::CSmartPtr<NL3D::ITexture> TextureInterface;
bool InUse;
bool Used;
};
CRenderTargetManager::CRenderTargetManager() : m_Driver(NULL)
{
}
CRenderTargetManager::~CRenderTargetManager()
{
// Call twice to reset counters and cleanup
cleanup();
cleanup();
}
NL3D::CTextureUser *CRenderTargetManager::getRenderTarget(uint width, uint height)
{
// Find or create a render target, short loop so no real optimization
for (std::vector<CRenderTargetDescInt *>::iterator it(m_RenderTargets.begin()), end(m_RenderTargets.end()); it != end; ++it)
{
CRenderTargetDescInt *desc = *it;
if (!desc->InUse && desc->Width == width && desc->Height == height)
{
desc->InUse = true;
desc->Used = true;
return desc->TextureUser;
}
}
nldebug("3D: Create new render target (%u x %u)", width, height);
NL3D::IDriver *drvInternal = (static_cast<CDriverUser *>(m_Driver))->getDriver();
CRenderTargetDescInt *desc = new CRenderTargetDescInt();
desc->TextureInterface = new CTextureBloom(); // LOL
desc->TextureInterface->setRenderTarget(true);
desc->TextureInterface->setReleasable(false);
desc->TextureInterface->resize(width, height);
desc->TextureInterface->setFilterMode(ITexture::Linear, ITexture::LinearMipMapOff);
desc->TextureInterface->setWrapS(ITexture::Clamp);
desc->TextureInterface->setWrapT(ITexture::Clamp);
drvInternal->setupTexture(*desc->TextureInterface);
desc->TextureUser = new CTextureUser(desc->TextureInterface);
nlassert(!drvInternal->isTextureRectangle(desc->TextureInterface)); // Not allowed, we only support NPOT for render targets now.
desc->Width = width;
desc->Height = height;
desc->Used = true;
desc->InUse = true;
m_RenderTargets.push_back(desc);
return desc->TextureUser;
}
void CRenderTargetManager::recycleRenderTarget(NL3D::CTextureUser *renderTarget)
{
for (std::vector<CRenderTargetDescInt *>::iterator it(m_RenderTargets.begin()), end(m_RenderTargets.end()); it != end; ++it)
{
CRenderTargetDescInt *desc = *it;
if (desc->TextureUser == renderTarget)
{
desc->InUse = false;
return;
}
}
nlerror("3D: Render target not found");
}
void CRenderTargetManager::cleanup()
{
for (sint i = 0; i < (sint)m_RenderTargets.size(); ++i)
{
CRenderTargetDescInt *desc = m_RenderTargets[i];
nlassert(!desc->InUse); // Assert for debugging, to not allow textures being carried over between frames. Optional assert
if (!desc->InUse)
{
if (!desc->Used)
{
// No longer in use
nldebug("3D: Release render target (%u x %u)", desc->Width, desc->Height);
delete desc->TextureUser;
desc->TextureUser = NULL;
desc->TextureInterface = NULL; // CSmartPtr
m_RenderTargets.erase(m_RenderTargets.begin() + i);
--i;
}
else
{
// Flag for next round
desc->Used = false;
}
}
}
}
} /* namespace NL3D */
/* end of file */

51
code/nel/src/3d/stereo_debugger.cpp
View file

@ -42,6 +42,7 @@
#include <nel/3d/texture_user.h>
#include <nel/3d/driver_user.h>
#include <nel/3d/u_texture.h>
#include <nel/3d/render_target_manager.h>
using namespace std;
// using namespace NLMISC;
@ -137,8 +138,6 @@ CStereoDebugger::CStereoDebugger() : m_Driver(NULL), m_Stage(0), m_SubStage(0),
CStereoDebugger::~CStereoDebugger()
{
releaseTextures();
if (!m_Mat.empty())
{
m_Driver->deleteMaterial(m_Mat);
@ -188,8 +187,6 @@ void CStereoDebugger::setDriver(NL3D::UDriver *driver)
if (m_PixelProgram)
{
initTextures();
m_Mat = m_Driver->createMaterial();
m_Mat.initUnlit();
m_Mat.setColor(CRGBA::White);
@ -202,8 +199,6 @@ void CStereoDebugger::setDriver(NL3D::UDriver *driver)
mat->setZFunc(CMaterial::always);
mat->setDoubleSided(true);
setTextures();
m_QuadUV.V0 = CVector(0.f, 0.f, 0.5f);
m_QuadUV.V1 = CVector(1.f, 0.f, 0.5f);
m_QuadUV.V2 = CVector(1.f, 1.f, 0.5f);
@ -216,6 +211,32 @@ void CStereoDebugger::setDriver(NL3D::UDriver *driver)
}
}
void CStereoDebugger::getTextures()
{
nlassert(!m_LeftTexU);
nlassert(!m_RightTexU);
uint32 width, height;
m_Driver->getWindowSize(width, height);
m_LeftTexU = m_Driver->getRenderTargetManager().getRenderTarget(width, height);
m_RightTexU = m_Driver->getRenderTargetManager().getRenderTarget(width, height);
NL3D::CMaterial *mat = m_Mat.getObjectPtr();
mat->setTexture(0, m_LeftTexU->getITexture());
mat->setTexture(1, m_RightTexU->getITexture());
}
void CStereoDebugger::recycleTextures()
{
nlassert(m_LeftTexU);
nlassert(m_RightTexU);
m_Mat.getObjectPtr()->setTexture(0, NULL);
m_Mat.getObjectPtr()->setTexture(1, NULL);
m_Driver->getRenderTargetManager().recycleRenderTarget(m_LeftTexU);
m_Driver->getRenderTargetManager().recycleRenderTarget(m_RightTexU);
m_LeftTexU = NULL;
m_RightTexU = NULL;
}
/*
void CStereoDebugger::releaseTextures()
{
if (!m_Mat.empty())
@ -233,7 +254,7 @@ void CStereoDebugger::releaseTextures()
m_RightTexU = NULL;
m_RightTex = NULL; // CSmartPtr
}
*//*
void CStereoDebugger::initTextures()
{
uint32 width, height;
@ -261,15 +282,15 @@ void CStereoDebugger::initTextures()
drvInternal->setupTexture(*m_RightTex);
m_RightTexU = new CTextureUser(m_RightTex);
nlassert(!drvInternal->isTextureRectangle(m_RightTex)); // not allowed
}
}*/
/*
void CStereoDebugger::setTextures()
{
NL3D::CMaterial *mat = m_Mat.getObjectPtr();
mat->setTexture(0, m_LeftTex);
mat->setTexture(1, m_RightTex);
}
}*/
/*
void CStereoDebugger::verifyTextures()
{
if (m_Driver)
@ -287,7 +308,7 @@ void CStereoDebugger::verifyTextures()
setTextures();
}
}
}
}*/
/// Gets the required screen resolution for this device
bool CStereoDebugger::getScreenResolution(uint &width, uint &height)
@ -407,6 +428,7 @@ bool CStereoDebugger::beginRenderTarget()
{
if (m_Stage != 3 && m_Driver && (m_Driver->getPolygonMode() == UDriver::Filled))
{
if (!m_LeftTexU) getTextures();
if (m_Stage % 2) static_cast<CDriverUser *>(m_Driver)->setRenderTarget(*m_RightTexU, 0, 0, 0, 0);
else static_cast<CDriverUser *>(m_Driver)->setRenderTarget(*m_LeftTexU, 0, 0, 0, 0);
return true;
@ -430,14 +452,15 @@ bool CStereoDebugger::endRenderTarget()
uint32 width, height;
NL3D::IDriver *drvInternal = (static_cast<CDriverUser *>(m_Driver))->getDriver();
NL3D::CMaterial *mat = m_Mat.getObjectPtr();
mat->setTexture(0, m_LeftTex);
mat->setTexture(1, m_RightTex);
mat->setTexture(0, m_LeftTexU->getITexture());
mat->setTexture(1, m_RightTexU->getITexture());
drvInternal->activePixelProgram(m_PixelProgram);
m_Driver->drawQuad(m_QuadUV, m_Mat);
drvInternal->activePixelProgram(NULL);
m_Driver->enableFog(fogEnabled);
recycleTextures();
return true;
}

2
code/nel/src/net/callback_client.cpp
View file

@ -53,7 +53,7 @@ CCallbackClient::~CCallbackClient()
* Recorded : YES
* Replayed : MAYBE
*/
void CCallbackClient::send (const CMessage &buffer, TSockId hostid, bool log)
void CCallbackClient::send (const CMessage &buffer, TSockId hostid, bool /* log */)
{
nlassert (hostid == InvalidSockId); // should always be InvalidSockId on client
nlassert (connected ());

2
code/nel/tools/3d/build_clod_bank/build_clod_bank.cpp
View file

@ -62,7 +62,7 @@ int main(int argc, char *argv[])
float bakeFrameRate= 20;
if(argc>=5)
{
bakeFrameRate= (float)atof(argv[4]);
NLMISC::fromString(argv[4], bakeFrameRate);
if(bakeFrameRate<=1)
{
nlwarning("bad bakeFrameRate value, use a default of 20");

4
code/nel/tools/3d/object_viewer/edit_ex.cpp
View file

@ -67,7 +67,9 @@ uint CEditEx::getUInt() const
float CEditEx::getFloat() const
{
nlassert(_Type == FloatType);
return (float) ::atof(getString().c_str());
float val;
NLMISC::fromString(getString(), val);
return val;
}
std::string CEditEx::getString() const

11
code/nel/tools/3d/object_viewer/object_viewer.cpp
View file

@ -598,7 +598,11 @@ bool CObjectViewer::initUI (HWND parent)
// initialize NeL context if needed
if (!NLMISC::INelContext::isContextInitialised())
new NLMISC::CApplicationContext;
{
new NLMISC::CApplicationContext();
nldebug("NeL Object Viewer: initUI");
NLMISC::CSheetId::initWithoutSheet();
}
// The fonts manager
_FontManager.setMaxMemory(2000000);
@ -676,9 +680,12 @@ bool CObjectViewer::initUI (HWND parent)
view->MainFrame = _MainFrame;
_MainFrame->ShowWindow (SW_SHOW);
RECT viewportRect;
GetClientRect(view->m_hWnd, &viewportRect);
// Init NELU
if (!CNELU::init (640, 480, viewport, 32, true, view->m_hWnd, false, _Direct3d))
if (!CNELU::init (viewportRect.right, viewportRect.bottom, viewport, 32, true, view->m_hWnd, false, _Direct3d))
{
return false;
}

6
code/nel/tools/3d/object_viewer/vegetable_density_page.cpp
View file

@ -225,7 +225,8 @@ void CVegetableDensityPage::updateAngleMinFromEditText()
// get angles edited.
char stmp[256];
AngleMinEdit.GetWindowText(stmp, 256);
float angleMin= (float)atof(stmp);
float angleMin;
NLMISC::fromString(stmp, angleMin);
NLMISC::clamp(angleMin, -90, 90);
// make a sinus, because 90 => 1, and -90 =>-1
float cosAngleMin= (float)sin(angleMin*NLMISC::Pi/180.f);
@ -248,7 +249,8 @@ void CVegetableDensityPage::updateAngleMaxFromEditText()
// get angles edited.
char stmp[256];
AngleMaxEdit.GetWindowText(stmp, 256);
float angleMax= (float)atof(stmp);
float angleMax;
NLMISC::fromString(stmp, angleMax);
NLMISC::clamp(angleMax, -90, 90);
// make a sinus, because 90 => 1, and -90 =>-1
float cosAngleMax= (float)sin(angleMax*NLMISC::Pi/180.f);

2
code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp
View file

@ -20,6 +20,7 @@
#include "nel/misc/app_context.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h>
#include "nel/misc/sheet_id.h"
extern ClassDesc2* GetCNelExportDesc();
@ -34,6 +35,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{
new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Export: DllMain");
NLMISC::CSheetId::initWithoutSheet();
}
hInstance = hinstDLL; // Hang on to this DLL's instance handle.

6
code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
View file

@ -173,7 +173,7 @@ INT_PTR CALLBACK OptionsDialogCallback (
if( SendMessage( GetDlgItem(hwndDlg,IDC_RADIORADIOSITYEXPORTLIGHTING), BM_GETCHECK, 0, 0 ) == BST_CHECKED )
theExportSceneStruct.nExportLighting = 1;
SendMessage( GetDlgItem(hwndDlg,IDC_EDITLUMELSIZE), WM_GETTEXT, 1024, (long)tmp );
theExportSceneStruct.rLumelSize = (float)atof( tmp );
NLMISC::fromString(tmp, theExportSceneStruct.rLumelSize);
if( SendMessage( GetDlgItem(hwndDlg,IDC_RADIOSS1), BM_GETCHECK, 0, 0 ) == BST_CHECKED )
theExportSceneStruct.nOverSampling = 1;
@ -192,9 +192,9 @@ INT_PTR CALLBACK OptionsDialogCallback (
// SurfaceLighting
theExportSceneStruct.bTestSurfaceLighting= (SendMessage( GetDlgItem(hwndDlg,IDC_TEST_SURFACE_LIGHT), BM_GETCHECK, 0, 0 ) == BST_CHECKED);
SendMessage( GetDlgItem(hwndDlg,IDC_EDITCELLSIZE), WM_GETTEXT, 1024, (long)tmp );
theExportSceneStruct.SurfaceLightingCellSize= (float)atof( tmp );
NLMISC::fromString(tmp, theExportSceneStruct.SurfaceLightingCellSize);
SendMessage( GetDlgItem(hwndDlg,IDC_EDITCELLDELTAZ), WM_GETTEXT, 1024, (long)tmp );
theExportSceneStruct.SurfaceLightingDeltaZ= (float)atof( tmp );
NLMISC::fromString(tmp, theExportSceneStruct.SurfaceLightingDeltaZ);
// End the dialog
EndDialog(hwndDlg, TRUE);

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

@ -575,8 +575,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1, 0, 0, 117
PRODUCTVERSION 3,0,0,0
FILEVERSION 0, 9, 0, 0
PRODUCTVERSION 0, 9, 0, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -591,16 +591,16 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "TECH: \0"
VALUE "CompanyName", "\0"
VALUE "FileVersion", "1, 0, 0, 117\0"
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileVersion", "0.9.0\0"
VALUE "InternalName", "CNelExport\0"
VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "CNelExport.dlu\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "3D Studio MAX\0"
VALUE "ProductVersion", "3.0.0.0\0"
VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0"
VALUE "SpecialBuild", "\0"
END
END

14
code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp
View file

@ -293,16 +293,19 @@ void SLightBuild::convertFromMaxLight (INode *node,TimeValue tvTime)
for (sint i = 0; i < exclusionList.Count(); ++i)
{
INode *exclNode = exclusionList[i];
string tmp = exclNode->GetName();
this->setExclusion.insert(tmp);
if (exclNode) // Crashfix // FIXME: Why is this NULL?
{
string tmp = exclNode->GetName();
this->setExclusion.insert(tmp);
}
}
#endif // (MAX_RELEASE < 4000)
// Get Soft Shadow information
string sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_RADIUS, toString(NEL3D_APPDATA_SOFTSHADOW_RADIUS_DEFAULT));
this->rSoftShadowRadius = (float)atof(sTmp.c_str());
NLMISC::fromString(sTmp, this->rSoftShadowRadius);
sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_CONELENGTH, toString(NEL3D_APPDATA_SOFTSHADOW_CONELENGTH_DEFAULT));
this->rSoftShadowConeLength = (float)atof(sTmp.c_str());
NLMISC::fromString(sTmp, this->rSoftShadowConeLength);
if( deleteIt )
maxLight->DeleteThis();
@ -2147,7 +2150,8 @@ bool CExportNel::calculateLM( CMesh::CMeshBuild *pZeMeshBuild, CMeshBase::CMeshB
// **** Retrieve Shape Node properties
string sLumelSizeMul = CExportNel::getScriptAppData (&ZeNode, NEL3D_APPDATA_LUMELSIZEMUL, "1.0");
float rLumelSizeMul = (float)atof(sLumelSizeMul.c_str());
float rLumelSizeMul;
NLMISC::fromString(sLumelSizeMul, rLumelSizeMul);
// 8Bits LightMap Compression
bool lmcEnabled= CExportNel::getScriptAppData (&ZeNode, NEL3D_APPDATA_EXPORT_LMC_ENABLED, BST_UNCHECKED)==BST_CHECKED;
enum {NumLightGroup= 3};

7
code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
View file

@ -508,14 +508,13 @@ std::string CExportNel::getName (MtlBase& mtl)
// --------------------------------------------------
// Get the node name
std::string CExportNel::getName (INode& mtl)
std::string CExportNel::getName(INode& node)
{
// Return its name
TCHAR* name=mtl.GetName();
return std::string (name);
MCHAR* name = node.GetName();
return std::string(name);
}
// --------------------------------------------------
// Get the NEL node name

139
code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp
View file

@ -18,64 +18,17 @@
#include "export_nel.h"
#include "export_appdata.h"
#include "nel/3d/skeleton_shape.h"
#include "iskin.h"
using namespace NLMISC;
using namespace NL3D;
// ***************************************************************************
#define SKIN_INTERFACE 0x00010000
// ***************************************************************************
#define SKIN_CLASS_ID Class_ID(9815843,87654)
#define PHYSIQUE_CLASS_ID Class_ID(PHYSIQUE_CLASS_ID_A, PHYSIQUE_CLASS_ID_B)
// ***************************************************************************
class ISkinContextData
{
public:
virtual int GetNumPoints()=0;
virtual int GetNumAssignedBones(int vertexIdx)=0;
virtual int GetAssignedBone(int vertexIdx, int boneIdx)=0;
virtual float GetBoneWeight(int vertexIdx, int boneIdx)=0;
virtual int GetSubCurveIndex(int vertexIdx, int boneIdx)=0;
virtual int GetSubSegmentIndex(int vertexIdx, int boneIdx)=0;
virtual float GetSubSegmentDistance(int vertexIdx, int boneIdx)=0;
virtual Point3 GetTangent(int vertexIdx, int boneIdx)=0;
virtual Point3 GetOPoint(int vertexIdx, int boneIdx)=0;
virtual void SetWeight(int vertexIdx, int boneIdx, float weight)=0;
virtual void SetWeight(int vertexIdx, INode* bone, float weight)=0;
virtual void SetWeights(int vertexIdx, Tab<int> boneIdx, Tab<float> weights)=0;
virtual void SetWeights(int vertexIdx, INodeTab boneIdx, Tab<float> weights)=0;
};
// ***************************************************************************
class ISkin
{
public:
ISkin() {}
~ISkin() {}
virtual int GetBoneInitTM(INode *pNode, Matrix3 &InitTM, bool bObjOffset = false)=0;
virtual int GetSkinInitTM(INode *pNode, Matrix3 &InitTM, bool bObjOffset = false)=0;
virtual int GetNumBones()=0;
virtual INode *GetBone(int idx)=0;
virtual DWORD GetBoneProperty(int idx)=0;
virtual ISkinContextData *GetContextInterface(INode *pNode)=0;
virtual BOOL AddBone(INode *bone)=0;
virtual BOOL AddBones(INodeTab *bones)=0;
virtual BOOL RemoveBone(INode *bone)=0;
virtual void Invalidate()=0;
};
// ***************************************************************************
void CExportNel::buildSkeletonShape (CSkeletonShape& skeletonShape, INode& node, mapBoneBindPos* mapBindPos, TInodePtrInt& mapId,
TimeValue time)
{
@ -410,7 +363,8 @@ void CExportNel::buildSkeleton (std::vector<CBoneBase>& bonesArray, INode& node,
bonesArray.push_back (bone);
// **** Call on child
for (int children=0; children<node.NumberOfChildren(); children++)
const int numChildren = node.NumberOfChildren();
for (int children=0; children<numChildren; children++)
buildSkeleton (bonesArray, *node.GetChildNode(children), mapBindPos, mapId, nameSet, time, ++idCount, id);
}
@ -422,7 +376,7 @@ bool CExportNel::isSkin (INode& node)
bool ok=false;
// Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID);
Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Found it ?
if (skin)
@ -431,7 +385,7 @@ bool CExportNel::isSkin (INode& node)
//if (skin->IsEnabled())
{
// Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE);
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Found com_skin2 ?
if (comSkinInterface)
@ -446,7 +400,7 @@ bool CExportNel::isSkin (INode& node)
ok=true;
// Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface);
skin->ReleaseInterface (I_SKIN, comSkinInterface);
}
}
}
@ -490,7 +444,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
uint ok=NoError;
// Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID);
Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Build a the name array
buildMesh.BonesNames.resize (skeletonShape.size());
@ -513,7 +467,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
// ********** COMSKIN EXPORT **********
// Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE);
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Should been controled with isSkin before.
nlassert (comSkinInterface);
@ -645,7 +599,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
}
// Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface);
skin->ReleaseInterface (I_SKIN, comSkinInterface);
}
else
{
@ -881,13 +835,13 @@ INode* CExportNel::getSkeletonRootBone (INode& node)
INode* ret=NULL;
// Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID);
Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Found it ?
if (skin)
{
// Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE);
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Found com_skin2 ?
if (comSkinInterface)
@ -921,7 +875,7 @@ INode* CExportNel::getSkeletonRootBone (INode& node)
}
// Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface);
skin->ReleaseInterface (I_SKIN, comSkinInterface);
}
}
else
@ -961,40 +915,47 @@ INode* CExportNel::getSkeletonRootBone (INode& node)
// Get a vertex interface
IPhyVertexExport *vertexInterface=localData->GetVertexInterface (vtx);
// Check if it is a rigid vertex or a blended vertex
int type=vertexInterface->GetVertexType ();
if (type==RIGID_TYPE)
if (vertexInterface)
{
// this is a rigid vertex
IPhyRigidVertex *rigidInterface=(IPhyRigidVertex*)vertexInterface;
// Get the bone
INode *newBone=rigidInterface->GetNode();
// Get the root of the hierarchy
ret=getRoot (newBone);
found=true;
break;
}
else
{
// It must be a blendable vertex
nlassert (type==RIGID_BLENDED_TYPE);
IPhyBlendedRigidVertex *blendedInterface=(IPhyBlendedRigidVertex*)vertexInterface;
// For each bones
uint bone;
uint count=(uint)blendedInterface->GetNumberNodes ();
for (bone=0; bone<count; bone++)
// Check if it is a rigid vertex or a blended vertex
int type=vertexInterface->GetVertexType ();
if (type==RIGID_TYPE)
{
// Get the bone pointer
INode *newBone=blendedInterface->GetNode(bone);
// this is a rigid vertex
IPhyRigidVertex *rigidInterface=(IPhyRigidVertex*)vertexInterface;
// Get the bone
INode *newBone=rigidInterface->GetNode();
// Get the root of the hierarchy
ret=getRoot (newBone);
found=true;
break;
}
else
{
// It must be a blendable vertex
nlassert (type==RIGID_BLENDED_TYPE);
IPhyBlendedRigidVertex *blendedInterface=(IPhyBlendedRigidVertex*)vertexInterface;
// For each bones
uint bone;
uint count=(uint)blendedInterface->GetNumberNodes ();
for (bone=0; bone<count; bone++)
{
// Get the bone pointer
INode *newBone=blendedInterface->GetNode(bone);
// Get the root of the hierarchy
ret=getRoot (newBone);
found=true;
break;
}
}
}
else
{
nlwarning("Physique vertex interface NULL");
}
// Release vertex interfaces
@ -1030,13 +991,13 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
uint ok=NoError;
// Get the skin modifier
Modifier* skin=getModifier (&skinedNode, SKIN_CLASS_ID);
Modifier* skin=getModifier (&skinedNode, SKIN_CLASSID);
// Found it ?
if (skin)
{
// Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE);
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Should been controled with isSkin before.
nlassert (comSkinInterface);
@ -1082,7 +1043,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
}
// Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface);
skin->ReleaseInterface (I_SKIN, comSkinInterface);
}
}
else
@ -1267,7 +1228,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
}
// Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, physiqueInterface);
skin->ReleaseInterface (I_SKIN, physiqueInterface);
}
}
}
@ -1279,7 +1240,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
void CExportNel::enableSkinModifier (INode& node, bool enable)
{
// Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID);
Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Found it ?
if (skin)

2
code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp
View file

@ -21,6 +21,7 @@
#include "nel/misc/app_context.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h>
#include "nel/misc/sheet_id.h"
extern ClassDesc2* GetPO2RPODesc();
extern ClassDesc* GetRPODesc();
@ -44,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{
new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Export: DllMain");
NLMISC::CSheetId::initWithoutSheet();
}
if(fdwReason == DLL_PROCESS_ATTACH)

10
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,6,0,0
PRODUCTVERSION 0,6,0,0
FILEVERSION 0, 9, 0, 0
PRODUCTVERSION 0, 9, 0, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -101,14 +101,14 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://www.opennel.org/"
VALUE "Comments", "http://www.ryzomcore.org/"
VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
VALUE "FileVersion", "0.6.0"
VALUE "FileVersion", "0.9.0"
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.6.0"
VALUE "ProductVersion", "0.9.0"
END
END
BLOCK "VarFileInfo"

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

@ -514,8 +514,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,50
PRODUCTVERSION 3,0,0,0
FILEVERSION 0, 9, 0, 0
PRODUCTVERSION 0, 9, 0, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -530,15 +530,16 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Nevrax Ltd."
VALUE "FileDescription", "Standard modifiers (plugin)"
VALUE "FileVersion", "1, 0, 0, 50"
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.9.0"
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", "3D Studio MAX"
VALUE "ProductVersion", "3.0.0.0"
VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", "0.9.0"
END
END
BLOCK "VarFileInfo"

2
code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
View file

@ -18,6 +18,7 @@
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h>
#include "nel/misc/sheet_id.h"
HINSTANCE hInstance;
int controlsInit = FALSE;
@ -32,6 +33,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{
new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Patch Edit: DllMain");
NLMISC::CSheetId::initWithoutSheet();
}
if (fdwReason == DLL_PROCESS_ATTACH)

2
code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
View file

@ -4,6 +4,7 @@
#include "nel/misc/app_context.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h>
#include "nel/misc/sheet_id.h"
HINSTANCE hInstance;
int controlsInit = FALSE;
@ -18,6 +19,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{
new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Patch Paint: DllMain");
NLMISC::CSheetId::initWithoutSheet();
}
hInstance = hinstDLL;

17
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 1, 0, 0, 51
PRODUCTVERSION 3,0,0,0
FILEVERSION 0, 9, 0, 0
PRODUCTVERSION 0, 9, 0, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -112,17 +112,18 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "Comments", "TECH: cyril.corvazier\0"
VALUE "CompanyName", "Nevrax Ltd\0"
VALUE "FileDescription", "Standard modifiers (plugin)\0"
VALUE "FileVersion", "1, 0, 0, 51\0"
VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileDescription", "NeL Patch Paint\0"
VALUE "FileVersion", "0.9.0\0"
VALUE "InternalName", "mods\0"
VALUE "LegalCopyright", "Copyright © 1998 Nevrax Ltd\0"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "3D Studio MAX\0"
VALUE "ProductVersion", "3.0.0.0\0"
VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0"
VALUE "SpecialBuild", "\0"
END
END

2
code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp
View file

@ -1,6 +1,7 @@
#include "vertex_tree_paint.h"
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <maxversion.h>
#include "nel/misc/sheet_id.h"
HINSTANCE hInstance;
@ -12,6 +13,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{
new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Vertex Tree Paint: DllMain");
NLMISC::CSheetId::initWithoutSheet();
}
hInstance = hinstDLL; // Hang on to this DLL's instance handle.

21
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 3,1,0,0
PRODUCTVERSION 3,1,0,0
FILEVERSION 0, 9, 0, 0
PRODUCTVERSION 0, 9, 0, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -141,16 +141,17 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "TECH: Christer Janson\0"
VALUE "CompanyName", "Kinetix, a division of Autodesk, Inc.\0"
VALUE "FileDescription", "Vertex Color Paint (plugin)\0"
VALUE "FileVersion", "3.1.0.0\0"
VALUE "InternalName", "VertexPaint\0"
VALUE "LegalCopyright", "Copyright © 1998 Autodesk Inc.\0"
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.1 plugin sample\0"
VALUE "Comments", "TECH: \0"
VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileDescription", "Vertex Tree Paint\0"
VALUE "FileVersion", "0.9.0\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", "3D Studio MAX\0"
VALUE "ProductVersion", "3.1.0.0\0"
VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0"
END
END
BLOCK "VarFileInfo"

19
code/nel/tools/3d/plugin_max/scripts/startup/nel_material.ms
View file

@ -545,7 +545,7 @@ plugin material NelMaterial
rollout nelBasicParameters "NeL Basic Parameters" rolledUp:false
(
Label lblNlbpA "NeL Material" align:#center across:3
Label lblNlbpB "http://dev.ryzom.com/" align:#center
Label lblNlbpB "http://www.ryzomcore.org/" align:#center
CheckBox cbTwoSided "2-Sided" checked:false align:#right
group "Standard Lighting"
@ -595,7 +595,7 @@ plugin material NelMaterial
cpSelfIllumColor.visible = bUseSelfIllumColor
)
else
(
(
bTwoSided = cbTwoSided.checked
cAmbient = cpAmbient.color
cDiffuse = cpDiffuse.color
@ -607,6 +607,9 @@ plugin material NelMaterial
pSelfIllumAmount = spSelfIllumAmount.value
bUseSelfIllumColor = cbUseSelfIllumColor.checked
spSelfIllumAmount.visible = not cbUseSelfIllumColor.checked
cpSelfIllumColor.visible = cbUseSelfIllumColor.checked
delegate.twoSided = bTwoSided
delegate.ambient = cAmbient
delegate.diffuse = cDiffuse
@ -2211,6 +2214,18 @@ plugin material NelMaterial
on create do
(
-- Load from Standard
bTwoSided = delegate.twoSided
cAmbient = delegate.ambient
cDiffuse = delegate.diffuse
pOpacity = delegate.opacity
cSpecular = delegate.specular
pSpecularLevel = delegate.specularLevel
pGlossiness = delegate.glossiness
cSelfIllumColor = delegate.selfIllumColor
pSelfIllumAmount = delegate.selfIllumAmount
bUseSelfIllumColor = delegate.useSelfIllumColor
-- Single shader
loadShader ShaderSingleTexture
)

2
code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp
View file

@ -21,6 +21,7 @@
#include "../nel_3dsmax_shared/nel_3dsmax_shared.h"
#include <vector>
#include <maxversion.h>
#include "nel/misc/sheet_id.h"
extern ClassDesc2* GetTile_utilityDesc();
extern ClassDesc* GetRGBAddDesc();
@ -41,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
{
new NLMISC::CLibraryContext(GetSharedNelContext());
nldebug("NeL Tile Utility: DllMain");
NLMISC::CSheetId::initWithoutSheet();
}
hInstance = hinstDLL; // Hang on to this DLL's instance handle.

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

@ -124,8 +124,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1, 0, 0, 56
PRODUCTVERSION 3,0,0,0
FILEVERSION 0, 9, 0, 0
PRODUCTVERSION 0, 9, 0, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -140,13 +140,14 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileVersion", "1, 0, 0, 56\0"
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileVersion", "0.9.0\0"
VALUE "InternalName", "Tile_utility\0"
VALUE "LegalCopyright", "\0"
VALUE "OriginalFilename", "Tile_utility.dlu\0"
VALUE "ProductName", "3D Studio MAX\0"
VALUE "ProductVersion", "3.0.0.0\0"
VALUE "ProductName", "Ryzom Core\0"
VALUE "ProductVersion", "0.9.0\0"
VALUE "FileDescription", "Create material for tiles\0"
VALUE "Comments", "TECH: \0"
VALUE "LegalTrademarks", "\0"

4
code/nel/tools/3d/tga_2_dds/tga2dds.cpp
View file

@ -61,6 +61,10 @@ uint8 getType(const std::string &sFileNameDest)
return NOT_DEFINED;
}
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(dds);
#endif
if (fread(&h,sizeof(CS3TCCompressor::DDS_HEADER),1,f) != 1)
{
fclose(f);

2
code/nel/tools/3d/zviewer/zviewer.cpp
View file

@ -983,7 +983,7 @@ int main(int /* argc */, char ** /* argv */)
ViewerCfg.FontManager.setMaxMemory(2000000);
displayZones();
// release nelu
NL3D::CNELU::release();
}

45
code/nel/tools/build_gamedata/configuration/scripts.py
View file

@ -282,6 +282,26 @@ def findFilesNoSubdir(log, dir_where, file_ext):
printLog(log, "findFilesNoSubdir: file not dir or file?!" + fileFull)
return result
def findFilesNoSubdirFiltered(log, dir_where, file_ext, filter):
if len(filter) == 0:
return findFilesNoSubdir(log, dir_where, file_ext)
result = [ ]
files = os.listdir(dir_where)
len_file_ext = len(file_ext)
for fileName in files:
if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*":
fileFull = dir_where + "/" + fileName
if os.path.isfile(fileFull):
if fileName[-len_file_ext:].lower() == file_ext.lower():
fileNameLower = fileName.lower()
for filterWord in filter:
if filterWord in fileNameLower:
result += [ fileName ]
break
elif not os.path.isdir(fileFull):
printLog(log, "findFilesNoSubdir: file not dir or file?!" + fileFull)
return result
def findFile(log, dir_where, file_name):
files = os.listdir(dir_where)
for fileName in files:
@ -323,6 +343,31 @@ def needUpdateDirByLowercaseTagLog(log, dir_source, ext_source, dir_dest, ext_de
printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
return 0
def needUpdateDirByTagLogFiltered(log, dir_source, ext_source, dir_dest, ext_dest, filter):
updateCount = 0
skipCount = 0
lenSrcExt = len(ext_source)
sourceFiles = findFilesNoSubdirFiltered(log, dir_source, ext_source, filter)
destFiles = findFilesNoSubdir(log, dir_dest, ext_dest)
for file in sourceFiles:
sourceFile = dir_source + "/" + file
tagFile = dir_dest + "/" + file[0:-lenSrcExt] + ext_dest
if os.path.isfile(tagFile):
sourceTime = os.stat(sourceFile).st_mtime
tagTime = os.stat(tagFile).st_mtime
if (sourceTime > tagTime):
updateCount = updateCount + 1
else:
skipCount = skipCount + 1
else:
updateCount = updateCount + 1
if updateCount > 0:
printLog(log, "UPDATE " + str(updateCount) + " / " + str(len(sourceFiles)) + "; SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
return 1
else:
printLog(log, "SKIP " + str(skipCount) + " / " + str(len(sourceFiles)) + "; DEST " + str(len(destFiles)))
return 0
def needUpdateDirByTagLog(log, dir_source, ext_source, dir_dest, ext_dest):
updateCount = 0
skipCount = 0

2
code/nel/tools/build_gamedata/processes/ligo/1_export.py
View file

@ -62,7 +62,7 @@ if LigoExportLand == "" or LigoExportOnePass == 1:
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory)
mkPath(log, DatabaseDirectory + "/" + ZoneSourceDirectory[0])
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory)
if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory, ".max", ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory, ".max.tag")):
if (needUpdateDirByTagLogFiltered(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory, ".max", ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory, ".max.tag", [ "zonematerial", "zonetransition", "zonespecial" ])):
printLog(log, "WRITE " + ligoIniPath)
ligoIni = open(ligoIniPath, "w")
ligoIni.write("[LigoConfig]\n")

122
code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms
View file

@ -233,6 +233,15 @@ fn exportCollisionsFromZone outputNelDir filename =
if (isToBeExportedCollision m) == true then
selectmore m
)
for node in objects where classOf node == XRefObject do
(
sourceObject = node.GetSourceObject false
if (superclassOf sourceObject == GeometryClass) then
(
if (isToBeExportedCollision node) == true then
selectmore node
)
)
-- Export the collision
if (NelExportCollision ($selection as array) outputNelDir) == false then
@ -311,10 +320,10 @@ fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSi
-- Scan all the ig in this project
nlerror("Scan all the ig in this project")
for node in geometry do
for node in objects do
(
ig = getIg node
nlerror("geometry node")
nlerror("object node")
if ( (ig != undefined) and (ig != "") and ( (igName == "") or (ig == igName) ) ) then
(
nlerror("Found something with an IG name")
@ -347,71 +356,6 @@ fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSi
)
)
for node in lights do
(
ig = getIg node
if ( (ig != undefined) and (ig != "") and ( (igName == "") or ( ig == igName) ) ) then
(
-- Transition ?
if ( ig == IgName) then
(
-- Transform the object
node.transform = buildTransitionMatrixObj node.transform transitionZone cellSize
)
-- Found ?
found = false
-- Already found ?
for j = 1 to ig_array.count do
(
if (ig_array[j]==ig) then
(
found = true
)
)
-- Found ?
if (found == false) then
(
append ig_array ig
)
)
)
for node in helpers do
(
ig = getIg node
if ( (ig != undefined) and (ig != "") and ( (igName == "") or (ig == igName) ) ) then
(
-- Transition ?
if (ig == IgName) then
(
-- Transform the object
node.transform = buildTransitionMatrixObj node.transform transitionZone cellSize
)
-- Found ?
found = false
-- Already found ?
for j = 1 to ig_array.count do
(
if (ig_array[j]==ig) then
(
found = true
)
)
-- Found ?
if (found == false) then
(
append ig_array ig
)
)
)
-- Have some ig ?
if (ig_array.count != 0) then
(
@ -429,6 +373,29 @@ fn exportInstanceGroupFromZone inputFile outputPath igName transitionZone cellSi
-- Select none
max select none
for node in objects where classOf node == XRefObject do
(
if ((getIg node) == ig_array[ig]) then
(
sourceObject = node.GetSourceObject false
if (classOf sourceObject == XRefObject) then
(
nlerror("FAIL XREF STILL XREF " + node.name)
)
else if (superclassOf sourceObject == GeometryClass) then
(
selectmore node
)
else if (superclassOf sourceObject == Helper) then
(
selectmore node
)
else if (superclassOf sourceObject == Light) then
(
selectmore node
)
)
)
-- Select all node in this ig
for node in geometry do
(
@ -508,8 +475,8 @@ try
for curFileName in MaxFilesList do
(
-- Free memory and file handles
gc ()
resetMAXFile #noprompt
-- gc ()
-- resetMAXFile #noprompt
tokenArray = filterString (getFilenameFile curFileName) "-"
@ -528,6 +495,7 @@ try
nlerror ("Scanning file "+curFileName+" ...")
mergeMaxFile curFileName quiet:true
objXRefMgr.UpdateAllRecords()
-- Unhide category
unhidecategory()
@ -622,6 +590,8 @@ try
)
resetMAXFile #noprompt
gc ()
resetMAXFile #noprompt
)
else
(
@ -635,10 +605,10 @@ try
for curFileName in MaxFilesList do
(
-- Free memory and file handles
gc ()
-- gc ()
-- Reset 3dsmax
resetMAXFile #noprompt
-- resetMAXFile #noprompt
tokenArray = filterString (getFilenameFile curFileName) "-"
if (tokenArray.count == 4) and (tokenArray[1] == "zonetransition") then
@ -672,6 +642,7 @@ try
nlerror ("Scanning file "+curFileName+" ...")
mergeMaxFile curFileName quiet:true
objXRefMgr.UpdateAllRecords()
-- Unhide category
unhidecategory()
@ -852,6 +823,8 @@ try
)
resetMAXFile #noprompt
gc ()
resetMAXFile #noprompt
)
else
(
@ -865,8 +838,8 @@ try
for curFileName in MaxFilesList do
(
-- Free memory and file handles
gc ()
resetMAXFile #noprompt
-- gc ()
-- resetMAXFile #noprompt
tokenArray = filterString (getFilenameFile curFileName) "-"
if (tokenArray.count == 2) and (tokenArray[1] == "zonespecial") then
@ -884,6 +857,7 @@ try
nlerror ("Scanning file "+curFileName+" ...")
mergeMaxFile curFileName quiet:true
objXRefMgr.UpdateAllRecords()
-- Unhide category
unhidecategory()
@ -971,6 +945,8 @@ try
)
resetMAXFile #noprompt
gc ()
resetMAXFile #noprompt
)
else
(

9
code/nel/tools/memory/memlog/memlog.cpp
View file

@ -69,11 +69,20 @@ int main(int argc, char* argv[])
if (fread (&size, sizeof(uint32), 1, file) != 1)
break;
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(size);
#endif
while (1)
{
uint32 start;
if (fread (&start, sizeof(uint32), 1, file) != 1)
break;
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(start);
#endif
string category;
if (!readString (category, file))
break;

34
code/nel/tools/misc/bnp_make/main.cpp
View file

@ -94,7 +94,15 @@ struct BNPHeader
if (f == NULL) return false;
uint32 nNbFile = (uint32)Files.size();
if (fwrite (&nNbFile, sizeof(uint32), 1, f) != 1)
// value to be serialized
uint32 nNbFile2 = nNbFile;
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(nNbFile2);
#endif
if (fwrite (&nNbFile2, sizeof(uint32), 1, f) != 1)
{
fclose(f);
return false;
@ -115,20 +123,38 @@ struct BNPHeader
return false;
}
if (fwrite (&Files[i].Size, sizeof(uint32), 1, f) != 1)
uint32 nFileSize = Files[i].Size;
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(nFileSize);
#endif
if (fwrite (&nFileSize, sizeof(uint32), 1, f) != 1)
{
fclose(f);
return false;
}
if (fwrite (&Files[i].Pos, sizeof(uint32), 1, f) != 1)
uint32 nFilePos = Files[i].Pos;
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(nFilePos);
#endif
if (fwrite (&nFilePos, sizeof(uint32), 1, f) != 1)
{
fclose(f);
return false;
}
}
if (fwrite (&OffsetFromBeginning, sizeof(uint32), 1, f) != 1)
uint32 nOffsetFromBeginning = OffsetFromBeginning;
#ifdef NL_BIG_ENDIAN
NLMISC_BSWAP32(nOffsetFromBeginning);
#endif
if (fwrite (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1)
{
fclose(f);
return false;

62
code/nelns/login_system/database/nel.sql
View file

@ -1,62 +0,0 @@
# HeidiSQL Dump
#
# --------------------------------------------------------
# Host: 127.0.0.1
# Database: nel
# Server version: 5.0.33
# Server OS: Win32
# Target-Compatibility: MySQL 5.0
# Extended INSERTs: Y
# max_allowed_packet: 1048576
# HeidiSQL version: 3.0 Revision: 572
# --------------------------------------------------------
/*!40100 SET CHARACTER SET latin1*/;
#
# Table structure for table 'permission'
#
CREATE TABLE `permission` (
`UId` int(10) unsigned NOT NULL default '0',
`ClientApplication` char(64) collate latin1_general_ci NOT NULL default 'sample',
`ShardId` int(10) NOT NULL default '-1'
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
#
# Table structure for table 'shard'
#
CREATE TABLE `shard` (
`ShardId` int(10) NOT NULL auto_increment,
`WsAddr` varchar(64) collate latin1_general_ci NOT NULL,
`NbPlayers` int(10) unsigned NOT NULL default '0',
`Name` varchar(64) collate latin1_general_ci NOT NULL default 'unknown shard',
`Online` tinyint(1) unsigned NOT NULL default '0',
`ClientApplication` varchar(64) collate latin1_general_ci NOT NULL,
`Version` varchar(64) collate latin1_general_ci NOT NULL default '',
`DynPatchURL` varchar(255) collate latin1_general_ci NOT NULL default '',
PRIMARY KEY (`ShardId`)
) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards information for login system';
#
# Table structure for table 'user'
#
CREATE TABLE `user` (
`UId` int(10) NOT NULL auto_increment,
`Login` varchar(64) collate latin1_general_ci NOT NULL default '',
`Password` char(32) collate latin1_general_ci NOT NULL,
`ShardId` int(10) NOT NULL default '-1',
`State` enum('Offline','Authorized','Waiting','Online') collate latin1_general_ci NOT NULL default 'Offline',
`Privilege` varchar(255) collate latin1_general_ci NOT NULL default '',
`ExtendedPrivilege` varchar(45) collate latin1_general_ci NOT NULL default '',
`Cookie` varchar(255) collate latin1_general_ci NOT NULL default '',
PRIMARY KEY (`UId`)
) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users information for login system';

50
code/nelns/login_system/database/nel_tool.sql
View file

@ -1,50 +0,0 @@
# Database : `nel_tool`
# --------------------------------------------------------
#
# Table structure for table `server`
#
CREATE TABLE server (
sid int(11) unsigned NOT NULL auto_increment,
name varchar(64) default NULL,
address varchar(64) default NULL,
PRIMARY KEY (sid)
) TYPE=MyISAM;
#
# Dumping data for table `server`
#
INSERT INTO server VALUES (1, 'Local Host', '127.0.0.1');
# --------------------------------------------------------
#
# Table structure for table `service`
#
CREATE TABLE service (
shid int(11) unsigned NOT NULL auto_increment,
shard varchar(64) default NULL,
server varchar(64) default NULL,
name varchar(64) default NULL,
PRIMARY KEY (shid)
) TYPE=MyISAM;
#
# Dumping data for table `service`
#
INSERT INTO service VALUES (1, '300', 'Local Host', 'localhost');
# --------------------------------------------------------
#
# Table structure for table `variable`
#
CREATE TABLE variable (
path text,
error_bound text,
alarm_order text,
graph_update text
) TYPE=MyISAM;
#
# Dumping data for table `variable`
#

2
code/ryzom/client/src/connection.cpp
View file

@ -186,7 +186,7 @@ bool hasPrivilegeEM() { return (UserPrivileges.find(":EM:") != std::string::npos
bool hasPrivilegeEG() { return (UserPrivileges.find(":EG:") != std::string::npos); }
// Restore the video mode (fullscreen for exemple) after the connection (done in a window)
// Restore the video mode (fullscreen for example) after the connection (done in a window)
void connectionRestaureVideoMode ()
{
// Setup full screen if we have to

2
code/ryzom/client/src/interface_v3/input_handler_manager.h
View file

@ -44,7 +44,7 @@
class CInputHandlerManager : public NLMISC::IEventListener, public CGroupEditBox::IComboKeyHandler
{
public:
/// The EventServer Filled with Filtered Messages the InterfaceManager didn't cactch
/// The EventServer Filled with Filtered Messages the InterfaceManager didn't catch
NLMISC::CEventServer FilteredEventServer;
public:

31
code/ryzom/client/src/main_loop.cpp
View file

@ -687,22 +687,27 @@ void updateWeather()
}
#endif
// FIXME: temporary fix for teleportation crash
// Update new sky
if (ContinentMngr.cur() && Driver->getPolygonMode() == UDriver::Filled && Filter3D[FilterSky])
s_SkyMode = NoSky;
if (ContinentMngr.cur() && !ContinentMngr.cur()->Indoor)
{
CSky &sky = ContinentMngr.cur()->CurrentSky;
if (!ContinentMngr.cur()->Indoor && sky.getScene())
if(Driver->getPolygonMode() == UDriver::Filled)
{
s_SkyMode = NewSky;
sky.getScene()->animate(TimeInSec-FirstTimeInSec);
// Setup the sky camera
preRenderNewSky();
}
else
{
s_SkyMode = OldSky;
if (Filter3D[FilterSky])
{
CSky &sky = ContinentMngr.cur()->CurrentSky;
if (sky.getScene())
{
s_SkyMode = NewSky;
sky.getScene()->animate(TimeInSec-FirstTimeInSec);
// Setup the sky camera
preRenderNewSky();
}
else
{
s_SkyMode = OldSky;
}
}
}
}
}

14
code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
View file

@ -2895,13 +2895,13 @@ uint32 CGameItem::maxDurability() const
// tools
// SHEARS = pick for forage
case ITEM_TYPE::SHEARS: return (uint32)CWeaponCraftParameters::ForageToolDurability;
case ITEM_TYPE::AmmoTool: return (uint32)CWeaponCraftParameters::AmmoCraftingToolDurability;
case ITEM_TYPE::ArmorTool: return (uint32)CWeaponCraftParameters::ArmorCraftingToolDurability;
case ITEM_TYPE::JewelryTool: return (uint32)CWeaponCraftParameters::JewelryCraftingToolDurability;
case ITEM_TYPE::MeleeWeaponTool:return (uint32)CWeaponCraftParameters::MeleeWeaponCraftingToolDurability;
case ITEM_TYPE::RangeWeaponTool:return (uint32)CWeaponCraftParameters::RangeWeaponCraftingToolDurability;
case ITEM_TYPE::ToolMaker: return (uint32)CWeaponCraftParameters::ToolCraftingToolDurability;
case ITEM_TYPE::SHEARS: d = CWeaponCraftParameters::ForageToolDurability; break;
case ITEM_TYPE::AmmoTool: d = CWeaponCraftParameters::AmmoCraftingToolDurability; break;
case ITEM_TYPE::ArmorTool: d = CWeaponCraftParameters::ArmorCraftingToolDurability; break;
case ITEM_TYPE::JewelryTool: d = CWeaponCraftParameters::JewelryCraftingToolDurability; break;
case ITEM_TYPE::MeleeWeaponTool: d = CWeaponCraftParameters::MeleeWeaponCraftingToolDurability; break;
case ITEM_TYPE::RangeWeaponTool: d = CWeaponCraftParameters::RangeWeaponCraftingToolDurability; break;
case ITEM_TYPE::ToolMaker: d = CWeaponCraftParameters::ToolCraftingToolDurability; break;
default:
return 0;

125
code/ryzom/server/src/shard_unifier_service/nel.sql
View file

@ -1,125 +0,0 @@
# MySQL-Front Dump 2.4
#
# Host: localhost Database: nel
#--------------------------------------------------------
# Server version 4.0.24_Debian-10sarge1-log
USE nel;
#
# Table structure for table 'domain'
#
CREATE TABLE `domain` (
`domain_id` int(10) unsigned NOT NULL auto_increment,
`domain_name` varchar(32) NOT NULL default '',
`status` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL default 'ds_dev',
`patch_version` int(10) unsigned NOT NULL default '0',
`backup_patch_url` varchar(255) default NULL,
`patch_urls` text,
`login_address` varchar(255) NOT NULL default '',
`session_manager_address` varchar(255) NOT NULL default '',
`ring_db_name` varchar(255) NOT NULL default '',
`web_host` varchar(255) NOT NULL default '',
`web_host_php` varchar(255) NOT NULL default '',
`description` varchar(200) default NULL,
PRIMARY KEY (`domain_id`),
UNIQUE KEY `name_idx` (`domain_name`)
) TYPE=MyISAM;
#
# Table structure for table 'permission'
#
CREATE TABLE `permission` (
`UId` int(10) unsigned NOT NULL default '0',
`ClientApplication` char(64) NOT NULL default 'r2',
`ShardId` int(10) NOT NULL default '-1',
`AccessPrivilege` set('DEV','RESTRICTED','OPEN') NOT NULL default 'OPEN',
`prim` int(10) unsigned NOT NULL auto_increment,
PRIMARY KEY (`prim`),
KEY `UIdIndex` (`UId`)
) TYPE=MyISAM;
#
# Table structure for table 'shard'
#
CREATE TABLE `shard` (
`ShardId` int(10) NOT NULL auto_increment,
`domain_id` int(10) NOT NULL default '-1',
`WsAddr` varchar(64) default NULL,
`NbPlayers` int(10) unsigned default '0',
`Name` varchar(64) default 'unknown shard',
`Online` tinyint(1) unsigned default '0',
`ClientApplication` varchar(64) default 'ryzom',
`Version` varchar(64) default NULL,
`PatchURL` varchar(255) default NULL,
`DynPatchURL` varchar(255) default NULL,
`FixedSessionId` int(10) unsigned default '0',
PRIMARY KEY (`ShardId`)
) TYPE=MyISAM COMMENT='contains all shards information for login system';
#
# Table structure for table 'user'
#
CREATE TABLE `user` (
`UId` int(10) NOT NULL auto_increment,
`Login` varchar(64) NOT NULL default '',
`Password` varchar(13) default NULL,
`ShardId` int(10) NOT NULL default '-1',
`State` enum('Offline','Online') NOT NULL default 'Offline',
`Privilege` varchar(255) default NULL,
`GroupName` varchar(255) NOT NULL default '',
`FirstName` varchar(255) NOT NULL default '',
`LastName` varchar(255) NOT NULL default '',
`Birthday` varchar(32) NOT NULL default '',
`Gender` tinyint(1) unsigned NOT NULL default '0',
`Country` char(2) NOT NULL default '',
`Email` varchar(255) NOT NULL default '',
`Address` varchar(255) NOT NULL default '',
`City` varchar(100) NOT NULL default '',
`PostalCode` varchar(10) NOT NULL default '',
`USState` char(2) NOT NULL default '',
`Chat` char(2) NOT NULL default '0',
`BetaKeyId` int(10) unsigned NOT NULL default '0',
`CachedCoupons` varchar(255) NOT NULL default '',
`ProfileAccess` varchar(45) default NULL,
`Level` int(2) NOT NULL default '0',
`CurrentFunds` int(4) NOT NULL default '0',
`IdBilling` varchar(255) NOT NULL default '',
`Community` char(2) NOT NULL default '--',
`Newsletter` tinyint(1) NOT NULL default '1',
`Account` varchar(64) NOT NULL default '',
`ChoiceSubLength` tinyint(2) NOT NULL default '0',
`CurrentSubLength` varchar(255) NOT NULL default '0',
`ValidIdBilling` int(4) NOT NULL default '0',
`GMId` int(4) NOT NULL default '0',
`ExtendedPrivilege` varchar(255) NOT NULL default '',
`ToolsGroup` varchar(255) NOT NULL default '',
`Unsubscribe` date NOT NULL default '0000-00-00',
`SubDate` datetime NOT NULL default '0000-00-00 00:00:00',
`SubIp` varchar(20) NOT NULL default '',
`SecurePassword` varchar(32) NOT NULL default '',
`LastInvoiceEmailCheck` date NOT NULL default '0000-00-00',
`FromSource` varchar(8) NOT NULL default '',
`ValidMerchantCode` varchar(11) NOT NULL default '',
`PBC` tinyint(1) NOT NULL default '0',
PRIMARY KEY (`UId`),
KEY `LoginIndex` (`Login`),
KEY `GroupIndex` (`GroupName`),
KEY `Email` (`Email`),
KEY `ToolsGroup` (`ToolsGroup`),
KEY `CurrentSubLength` (`CurrentSubLength`),
KEY `Community` (`Community`),
KEY `GMId` (`GMId`)
) TYPE=InnoDB;

199
code/ryzom/server/src/shard_unifier_service/nel_tool.sql
View file

@ -1,199 +0,0 @@
# MySQL-Front Dump 2.4
#
# Host: localhost Database: nel_tool
#--------------------------------------------------------
# Server version 4.0.24_Debian-10sarge1-log
USE nel_tool;
#
# Table structure for table 'help_topic'
#
CREATE TABLE `help_topic` (
`file` varchar(32) default '0',
`topic` varchar(32) default '0',
`help_body` text
) TYPE=MyISAM;
#
# Table structure for table 'server'
#
CREATE TABLE `server` (
`name` char(32) NOT NULL default '0',
`address` char(32) NOT NULL default '0'
) TYPE=MyISAM;
#
# Table structure for table 'service'
#
CREATE TABLE `service` (
`service_id` int(10) unsigned NOT NULL auto_increment,
`shard` char(32) NOT NULL default '',
`server` char(32) NOT NULL default '',
`name` char(32) NOT NULL default '',
PRIMARY KEY (`service_id`),
UNIQUE KEY `service_id` (`service_id`),
KEY `service_id_2` (`service_id`)
) TYPE=MyISAM;
#
# Table structure for table 'shard_access'
#
CREATE TABLE `shard_access` (
`uid` int(10) unsigned default '0',
`shard` char(64) default '0'
) TYPE=MyISAM;
#
# Table structure for table 'shard_annotation'
#
CREATE TABLE `shard_annotation` (
`shard` varchar(32) default '0',
`annotation` varchar(255) default '0',
`user` int(10) unsigned default '0',
`post_date` datetime default NULL,
`lock_user` int(10) unsigned default '0',
`lock_ip` varchar(32) default NULL,
`lock_date` datetime default NULL,
`ASAddr` varchar(255) default NULL,
`alias` varchar(255) default NULL
) TYPE=MyISAM;
#
# Table structure for table 'user'
#
CREATE TABLE `user` (
`login` varchar(16) NOT NULL default '',
`password` varchar(32) NOT NULL default '',
`uid` int(10) NOT NULL auto_increment,
`gid` int(10) NOT NULL default '1',
`useCookie` enum('yes','no') NOT NULL default 'no',
`default_view` int(11) NOT NULL default '0',
`allowed_ip` varchar(32) default NULL,
PRIMARY KEY (`uid`),
UNIQUE KEY `login` (`login`)
) TYPE=MyISAM;
#
# Table structure for table 'user_right'
#
CREATE TABLE `user_right` (
`uid` int(10) unsigned default '0',
`uright` varchar(16) default '0',
KEY `uid` (`uid`)
) TYPE=MyISAM;
#
# Table structure for table 'user_variable'
#
CREATE TABLE `user_variable` (
`uid` int(11) NOT NULL default '0',
`vid` int(11) NOT NULL default '0',
`privilege` enum('none','rd','rw') NOT NULL default 'none',
PRIMARY KEY (`uid`,`vid`),
UNIQUE KEY `uid` (`uid`,`vid`)
) TYPE=MyISAM;
#
# Table structure for table 'variable'
#
CREATE TABLE `variable` (
`vid` int(11) NOT NULL auto_increment,
`name` varchar(128) NOT NULL default '',
`path` varchar(255) NOT NULL default '',
`state` enum('rd','rw') NOT NULL default 'rd',
`vgid` int(10) unsigned NOT NULL default '1',
`warning_bound` int(11) default '-1',
`error_bound` int(11) default '-1',
`alarm_order` enum('gt','lt') NOT NULL default 'gt',
`graph_update` int(10) unsigned default '0',
`command` enum('variable','command') NOT NULL default 'variable',
PRIMARY KEY (`vid`),
UNIQUE KEY `vid` (`vid`)
) TYPE=MyISAM;
#
# Table structure for table 'variable_group'
#
CREATE TABLE `variable_group` (
`vgid` int(10) NOT NULL auto_increment,
`name` varchar(32) default '0',
PRIMARY KEY (`vgid`),
UNIQUE KEY `name` (`name`)
) TYPE=MyISAM;
#
# Table structure for table 'view_command'
#
CREATE TABLE `view_command` (
`name` varchar(32) default '0',
`command` varchar(32) default '0',
`tid` int(11) unsigned default '0'
) TYPE=MyISAM;
#
# Table structure for table 'view_row'
#
CREATE TABLE `view_row` (
`tid` int(11) NOT NULL default '0',
`vid` int(11) NOT NULL default '0',
`name` varchar(128) NOT NULL default '',
`ordering` tinyint(4) NOT NULL default '0',
`filter` varchar(64) default NULL,
`graph` tinyint(3) unsigned NOT NULL default '0'
) TYPE=MyISAM;
#
# Table structure for table 'view_table'
#
CREATE TABLE `view_table` (
`tid` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL default '0',
`name` varchar(32) NOT NULL default '',
`ordering` tinyint(4) NOT NULL default '0',
`filter` varchar(64) default NULL,
`display` enum('normal','condensed') NOT NULL default 'normal',
`refresh_rate` int(10) unsigned default '0',
`auto_display` enum('auto','manual') NOT NULL default 'auto',
`show_base_cols` tinyint(3) unsigned NOT NULL default '1',
UNIQUE KEY `tid` (`tid`,`uid`)
) TYPE=MyISAM;

311
code/ryzom/server/src/shard_unifier_service/ring.sql
View file

@ -1,311 +0,0 @@
# MySQL-Front Dump 2.4
#
# Host: localhost Database: ring_ats
#--------------------------------------------------------
# Server version 4.0.24_Debian-10sarge1-log
USE ring_ats;
#
# Table structure for table 'characters'
#
CREATE TABLE `characters` (
`char_id` int(10) unsigned NOT NULL default '0',
`char_name` varchar(20) NOT NULL default '',
`user_id` int(10) unsigned NOT NULL default '0',
`guild_id` int(10) unsigned NOT NULL default '0',
`best_combat_level` int(10) unsigned NOT NULL default '0',
`home_mainland_session_id` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`char_id`),
UNIQUE KEY `char_name_idx` (`char_name`),
KEY `user_id_idx` (`user_id`),
KEY `guild_id_idx` (`guild_id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'folder'
#
CREATE TABLE `folder` (
`Id` int(10) unsigned NOT NULL auto_increment,
`owner` int(10) unsigned NOT NULL default '0',
`title` varchar(40) NOT NULL default '',
`comments` text NOT NULL,
PRIMARY KEY (`Id`),
KEY `owner_idx` (`owner`),
KEY `title_idx` (`title`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'folder_access'
#
CREATE TABLE `folder_access` (
`Id` int(10) unsigned NOT NULL auto_increment,
`folder_id` int(10) unsigned NOT NULL default '0',
`user_id` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`Id`),
KEY `folder_id_idx` (`folder_id`),
KEY `user_idx` (`user_id`)
) TYPE=MyISAM ROW_FORMAT=FIXED;
#
# Table structure for table 'guild_invites'
#
CREATE TABLE `guild_invites` (
`Id` int(10) unsigned NOT NULL auto_increment,
`session_id` int(10) unsigned NOT NULL default '0',
`guild_id` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`Id`),
KEY `guild_id_idx` (`guild_id`),
KEY `session_id_idx` (`session_id`)
) TYPE=MyISAM ROW_FORMAT=FIXED;
#
# Table structure for table 'guilds'
#
CREATE TABLE `guilds` (
`guild_id` int(10) unsigned NOT NULL default '0',
`guild_name` varchar(20) NOT NULL default '',
`shard_id` int(11) NOT NULL default '0',
PRIMARY KEY (`guild_id`),
UNIQUE KEY `huild_name_idx` (`guild_name`),
KEY `shard_id_idx` (`shard_id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'journal_entry'
#
CREATE TABLE `journal_entry` (
`Id` int(10) unsigned NOT NULL auto_increment,
`session_id` int(10) unsigned NOT NULL default '0',
`author` int(10) unsigned NOT NULL default '0',
`type` enum('jet_credits','jet_notes') NOT NULL default 'jet_notes',
`text` text NOT NULL,
`time_stamp` datetime NOT NULL default '2005-09-07 12:41:33',
PRIMARY KEY (`Id`),
KEY `session_id_idx` (`session_id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'known_users'
#
CREATE TABLE `known_users` (
`Id` int(10) unsigned NOT NULL auto_increment,
`owner` int(10) unsigned NOT NULL default '0',
`targer_user` int(10) unsigned NOT NULL default '0',
`targer_character` int(10) unsigned NOT NULL default '0',
`relation_type` enum('rt_friend','rt_banned','rt_friend_dm') NOT NULL default 'rt_friend',
`comments` varchar(255) NOT NULL default '',
PRIMARY KEY (`Id`),
KEY `user_index` (`owner`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'mfs_erased_mail_series'
#
CREATE TABLE `mfs_erased_mail_series` (
`erased_char_id` int(11) unsigned NOT NULL default '0',
`erased_char_name` varchar(32) NOT NULL default '',
`erased_series` int(11) unsigned NOT NULL auto_increment,
`erase_date` datetime NOT NULL default '0000-00-00 00:00:00',
PRIMARY KEY (`erased_series`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'mfs_guild_thread'
#
CREATE TABLE `mfs_guild_thread` (
`thread_id` int(11) NOT NULL auto_increment,
`guild_id` int(11) unsigned NOT NULL default '0',
`topic` varchar(255) NOT NULL default '',
`author_name` varchar(32) NOT NULL default '',
`last_post_date` datetime NOT NULL default '0000-00-00 00:00:00',
`post_count` int(11) unsigned NOT NULL default '0',
PRIMARY KEY (`thread_id`),
KEY `guild_index` (`guild_id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'mfs_guild_thread_message'
#
CREATE TABLE `mfs_guild_thread_message` (
`id` int(11) NOT NULL auto_increment,
`thread_id` int(11) unsigned NOT NULL default '0',
`author_name` varchar(32) NOT NULL default '',
`date` datetime NOT NULL default '0000-00-00 00:00:00',
`content` text NOT NULL,
PRIMARY KEY (`id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'mfs_mail'
#
CREATE TABLE `mfs_mail` (
`id` int(11) NOT NULL auto_increment,
`sender_name` varchar(32) NOT NULL default '',
`subject` varchar(250) NOT NULL default '',
`date` datetime NOT NULL default '0000-00-00 00:00:00',
`status` enum('ms_new','ms_read','ms_erased') NOT NULL default 'ms_new',
`dest_char_id` int(11) unsigned NOT NULL default '0',
`erase_series` int(11) unsigned NOT NULL default '0',
`content` text NOT NULL,
PRIMARY KEY (`id`),
KEY `dest_index` (`dest_char_id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'player_rating'
#
CREATE TABLE `player_rating` (
`Id` int(10) unsigned NOT NULL auto_increment,
`session_id` int(10) unsigned NOT NULL default '0',
`author` int(10) unsigned NOT NULL default '0',
`rating` int(10) NOT NULL default '0',
`comments` text NOT NULL,
`time_stamp` datetime NOT NULL default '2005-09-07 12:41:33',
PRIMARY KEY (`Id`),
KEY `session_id_idx` (`session_id`),
KEY `author_idx` (`author`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'ring_users'
#
CREATE TABLE `ring_users` (
`user_id` int(10) unsigned NOT NULL default '0',
`user_name` varchar(20) NOT NULL default '',
`user_type` enum('ut_character','ut_pioneer') NOT NULL default 'ut_character',
`current_session` int(10) unsigned NOT NULL default '0',
`current_activity` enum('ca_none','ca_play','ca_edit','ca_anim') NOT NULL default 'ca_none',
`current_status` enum('cs_offline','cs_logged','cs_online') NOT NULL default 'cs_offline',
`public_level` enum('pl_none','pl_public') NOT NULL default 'pl_none',
`account_type` enum('at_normal','at_gold') NOT NULL default 'at_normal',
`content_access_level` varchar(20) NOT NULL default '',
`description` text NOT NULL,
`lang` enum('lang_en','lang_fr','lang_de') NOT NULL default 'lang_en',
`cookie` varchar(30) NOT NULL default '',
`current_domain_id` int(10) NOT NULL default '-1',
`pioneer_char_id` int(11) unsigned NOT NULL default '0',
PRIMARY KEY (`user_id`),
UNIQUE KEY `user_name_idx` (`user_name`),
KEY `cookie_idx` (`cookie`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'scenario_desc'
#
CREATE TABLE `scenario_desc` (
`session_id` int(10) unsigned NOT NULL default '0',
`parent_scenario` int(10) unsigned NOT NULL default '0',
`description` text NOT NULL,
`relation_to_parent` enum('rtp_same','rtp_variant','rtp_different') NOT NULL default 'rtp_same',
`title` varchar(40) NOT NULL default '',
`num_player` int(10) unsigned NOT NULL default '0',
`content_access_level` varchar(20) NOT NULL default '',
PRIMARY KEY (`session_id`),
UNIQUE KEY `title_idx` (`title`),
KEY `parent_idx` (`parent_scenario`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'session_participant'
#
CREATE TABLE `session_participant` (
`Id` int(10) unsigned NOT NULL auto_increment,
`session_id` int(10) unsigned NOT NULL default '0',
`char_id` int(10) unsigned NOT NULL default '0',
`status` enum('sps_play_subscribed','sps_play_invited','sps_edit_invited','sps_anim_invited','sps_playing','sps_editing','sps_animating') NOT NULL default 'sps_play_subscribed',
`kicked` tinyint(1) unsigned NOT NULL default '0',
`session_rated` tinyint(1) unsigned NOT NULL default '0',
PRIMARY KEY (`Id`),
KEY `session_idx` (`session_id`),
KEY `user_idx` (`char_id`)
) TYPE=MyISAM ROW_FORMAT=FIXED;
#
# Table structure for table 'sessions'
#
CREATE TABLE `sessions` (
`session_id` int(10) unsigned NOT NULL auto_increment,
`session_type` enum('st_edit','st_anim','st_outland','st_mainland') NOT NULL default 'st_edit',
`title` varchar(40) NOT NULL default '',
`owner` int(10) unsigned NOT NULL default '0',
`plan_date` datetime NOT NULL default '2005-09-21 12:41:33',
`start_date` datetime NOT NULL default '2005-08-31 00:00:00',
`description` text NOT NULL,
`orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL default 'so_other',
`level` enum('sl_a','sl_b','sl_c','sl_d','sl_e') NOT NULL default 'sl_a',
`rule_type` enum('rt_strict','rt_liberal') NOT NULL default 'rt_strict',
`access_type` enum('at_public','at_private') NOT NULL default 'at_public',
`state` enum('ss_planned','ss_open','ss_locked','ss_closed') NOT NULL default 'ss_planned',
`host_shard_id` int(11) NOT NULL default '0',
`subscription_slots` int(11) unsigned NOT NULL default '0',
`reserved_slots` int(10) unsigned NOT NULL default '0',
`free_slots` int(10) unsigned NOT NULL default '0',
`estimated_duration` enum('et_short','et_medium','et_long') NOT NULL default 'et_short',
`final_duration` int(10) unsigned NOT NULL default '0',
`folder_id` int(10) unsigned NOT NULL default '0',
`lang` enum('lang_en','lang_fr','lang_de') NOT NULL default 'lang_en',
`icone` varchar(70) NOT NULL default '',
PRIMARY KEY (`session_id`),
KEY `owner_idx` (`owner`),
KEY `folder_idx` (`folder_id`)
) TYPE=MyISAM ROW_FORMAT=DYNAMIC;
#
# Table structure for table 'shard'
#
CREATE TABLE `shard` (
`shard_id` int(11) NOT NULL default '0',
PRIMARY KEY (`shard_id`)
) TYPE=MyISAM ROW_FORMAT=FIXED;

107
code/ryzom/tools/server/sql/ryzom_admin_default_data.sql
View file

@ -1,107 +0,0 @@
# --------------------------------------------------------
# Host: 94.23.202.75
# Database: nel_tool
# Server version: 5.1.37-1ubuntu5.1
# Server OS: debian-linux-gnu
# HeidiSQL version: 5.0.0.3272
# Date/time: 2010-05-08 18:16:57
# --------------------------------------------------------
USE `nel_tool`;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
# Dumping data for table nel_tool.neltool_annotations: 1 rows
/*!40000 ALTER TABLE `neltool_annotations` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_annotations` (`annotation_id`, `annotation_domain_id`, `annotation_shard_id`, `annotation_data`, `annotation_user_name`, `annotation_date`) VALUES (12, NULL, 106, 'Welcome to the Shard Admin Website!', 'vl', 1272378352);
/*!40000 ALTER TABLE `neltool_annotations` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_applications: 38 rows
/*!40000 ALTER TABLE `neltool_applications` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_applications` (`application_id`, `application_name`, `application_uri`, `application_restriction`, `application_order`, `application_visible`, `application_icon`) VALUES (1, 'Main', 'index.php', '', 100, 1, 'imgs/icon_main.gif'), (2, 'Logout', 'index.php?mode=logout', '', 999999, 1, 'imgs/icon_logout.gif'), (3, 'Admin', 'tool_administration.php', 'tool_admin', 1500, 1, 'imgs/icon_admin.gif'), (4, 'Prefs', 'tool_preferences.php', 'tool_preferences', 1000, 1, 'imgs/icon_preferences.gif'), (5, 'Admin/Users', '', 'tool_admin_user', 1502, 0, ''), (6, 'Admin/Applications', '', 'tool_admin_application', 1501, 0, ''), (7, 'Admin/Domains', '', 'tool_admin_domain', 1504, 0, ''), (8, 'Admin/Shards', '', 'tool_admin_shard', 1505, 0, ''), (9, 'Admin/Groups', '', 'tool_admin_group', 1503, 0, ''), (10, 'Admin/Logs', '', 'tool_admin_logs', 1506, 0, ''), (11, 'Main/Start', '', 'tool_main_start', 101, 0, ''), (12, 'Main/Stop', '', 'tool_main_stop', 102, 0, ''), (13, 'Main/Restart', '', 'tool_main_restart', 103, 0, ''), (14, 'Main/Kill', '', 'tool_main_kill', 104, 0, ''), (15, 'Main/Abort', '', 'tool_main_abort', 105, 0, ''), (16, 'Main/Execute', '', 'tool_main_execute', 108, 0, ''), (18, 'Notes', 'tool_notes.php', 'tool_notes', 900, 1, 'imgs/icon_notes.gif'), (19, 'Player Locator', 'tool_player_locator.php', 'tool_player_locator', 200, 1, 'imgs/icon_player_locator.gif'), (20, 'Player Locator/Display Players', '', 'tool_player_locator_display_players', 201, 0, ''), (21, 'Player Locator/Locate', '', 'tool_player_locator_locate', 202, 0, ''), (22, 'Main/LockDomain', '', 'tool_main_lock_domain', 110, 0, ''), (23, 'Main/LockShard', '', 'tool_main_lock_shard', 111, 0, ''), (24, 'Main/WS', '', 'tool_main_ws', 112, 0, ''), (25, 'Main/ResetCounters', '', 'tool_main_reset_counters', 113, 0, ''), (26, 'Main/ServiceAutoStart', '', 'tool_main_service_autostart', 114, 0, ''), (27, 'Main/ShardAutoStart', '', 'tool_main_shard_autostart', 115, 0, ''), (28, 'Main/WS/Old', '', 'tool_main_ws_old', 112, 0, ''), (29, 'Graphs', 'tool_graphs.php', 'tool_graph', 500, 1, 'imgs/icon_graphs.gif'), (30, 'Notes/Global', '', 'tool_notes_global', 901, 0, ''), (31, 'Log Analyser', 'tool_log_analyser.php', 'tool_las', 400, 1, 'imgs/icon_log_analyser.gif'), (32, 'Guild Locator', 'tool_guild_locator.php', 'tool_guild_locator', 300, 1, 'imgs/icon_guild_locator.gif'), (33, 'Player Locator/UserID Check', '', 'tool_player_locator_userid_check', 203, 0, ''), (34, 'Player Locator/CSR Relocate', '', 'tool_player_locator_csr_relocate', 204, 0, ''), (35, 'Guild Locator/Guilds Update', '', 'tool_guild_locator_manage_guild', 301, 0, ''), (36, 'Guild Locator/Members Update', '', 'tool_guild_locator_manage_members', 302, 0, ''), (37, 'Entities', 'tool_event_entities.php', 'tool_event_entities', 350, 1, 'imgs/icon_entity.gif'), (38, 'Admin/Restarts', '', 'tool_admin_restart', 1507, 0, ''), (39, 'Main/EasyRestart', '', 'tool_main_easy_restart', 116, 0, '');
/*!40000 ALTER TABLE `neltool_applications` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_domains: 1 rows
/*!40000 ALTER TABLE `neltool_domains` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_domains` (`domain_id`, `domain_name`, `domain_as_host`, `domain_as_port`, `domain_rrd_path`, `domain_las_admin_path`, `domain_las_local_path`, `domain_application`, `domain_sql_string`, `domain_hd_check`, `domain_mfs_web`, `domain_cs_sql_string`) VALUES (12, 'open', 'open', 46700, '/home/nevrax/code/ryzom/server/save_shard/rrd_graphs', '', '', 'ryzom_open', 'mysql://shard@localhost/ring_open', 0, '', 'mysql://shard@localhost/atrium_forums');
/*!40000 ALTER TABLE `neltool_domains` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_groups: 11 rows
/*!40000 ALTER TABLE `neltool_groups` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_groups` (`group_id`, `group_name`, `group_level`, `group_default`, `group_active`, `group_default_domain_id`, `group_default_shard_id`) VALUES (1, 'AdminGroup', 0, 0, 1, 12, 106), (2, 'NevraxGroup', 0, 1, 1, NULL, NULL), (3, 'AdminDebugGroup', 10, 0, 1, 9, 56), (4, 'SupportSGMGroup', 0, 0, 1, NULL, NULL), (5, 'NevraxATSGroup', 0, 0, 1, NULL, NULL), (6, 'SupportGMGroup', 0, 0, 1, NULL, NULL), (7, 'SupportReadOnlyGroup', 0, 0, 1, NULL, NULL), (8, 'NevraxLevelDesigners', 0, 0, 1, NULL, NULL), (9, 'NevraxReadOnlyGroup', 0, 0, 1, 9, 56), (10, 'YubDevGroup', 0, 0, 1, 12, 106), (11, 'GuestGroup', 0, 0, 1, 12, 106);
/*!40000 ALTER TABLE `neltool_groups` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_group_applications: 178 rows
/*!40000 ALTER TABLE `neltool_group_applications` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_group_applications` (`group_application_id`, `group_application_group_id`, `group_application_application_id`) VALUES (879, 1, 10), (878, 1, 8), (877, 1, 7), (876, 1, 9), (875, 1, 5), (874, 1, 6), (873, 1, 3), (872, 1, 4), (871, 1, 30), (870, 1, 18), (869, 1, 29), (868, 1, 31), (867, 1, 37), (866, 1, 36), (865, 1, 35), (864, 1, 32), (863, 1, 34), (862, 1, 33), (861, 1, 21), (860, 1, 20), (859, 1, 19), (858, 1, 39), (857, 1, 27), (856, 1, 26), (843, 3, 10), (842, 3, 8), (841, 3, 7), (840, 3, 9), (839, 3, 5), (838, 3, 6), (837, 3, 3), (836, 3, 4), (835, 3, 30), (834, 3, 18), (833, 3, 29), (832, 3, 31), (831, 3, 37), (830, 3, 36), (829, 3, 35), (828, 3, 32), (827, 3, 34), (826, 3, 33), (825, 3, 21), (824, 3, 20), (823, 3, 19), (822, 3, 39), (821, 3, 27), (820, 3, 26), (597, 4, 36), (596, 4, 35), (595, 4, 32), (594, 4, 21), (593, 4, 20), (592, 4, 19), (591, 4, 24), (590, 4, 23), (589, 4, 14), (588, 4, 12), (632, 2, 18), (631, 2, 37), (630, 2, 32), (629, 2, 21), (628, 2, 20), (627, 2, 19), (626, 2, 24), (625, 2, 23), (624, 2, 22), (623, 2, 16), (622, 2, 15), (621, 2, 14), (620, 2, 13), (819, 3, 25), (855, 1, 25), (619, 2, 12), (818, 3, 28), (854, 1, 28), (817, 3, 24), (718, 5, 18), (717, 5, 37), (716, 5, 32), (715, 5, 21), (714, 5, 20), (713, 5, 19), (712, 5, 27), (711, 5, 26), (710, 5, 24), (709, 5, 23), (708, 5, 22), (707, 5, 16), (706, 5, 15), (705, 5, 14), (816, 3, 23), (609, 6, 35), (608, 6, 32), (607, 6, 21), (606, 6, 20), (605, 6, 19), (604, 6, 24), (603, 6, 23), (602, 6, 14), (601, 6, 12), (600, 6, 11), (815, 3, 22), (814, 3, 16), (853, 1, 24), (704, 5, 13), (703, 5, 12), (852, 1, 23), (587, 4, 11), (618, 2, 11), (702, 5, 11), (612, 7, 19), (851, 1, 22), (813, 3, 15), (812, 3, 14), (598, 4, 18), (599, 4, 4), (610, 6, 18), (611, 6, 4), (613, 7, 20), (614, 7, 21), (615, 7, 32), (616, 7, 35), (617, 7, 4), (633, 2, 4), (811, 3, 13), (810, 3, 12), (850, 1, 16), (849, 1, 15), (848, 1, 14), (847, 1, 13), (846, 1, 12), (719, 5, 4), (720, 8, 11), (721, 8, 12), (722, 8, 13), (723, 8, 14), (724, 8, 15), (725, 8, 16), (726, 8, 22), (727, 8, 23), (728, 8, 24), (729, 8, 25), (730, 8, 26), (731, 8, 27), (732, 8, 19), (733, 8, 20), (734, 8, 21), (735, 8, 37), (736, 8, 4), (737, 9, 29), (738, 9, 4), (809, 3, 11), (845, 1, 11), (844, 3, 38), (880, 1, 38), (909, 10, 18), (908, 10, 29), (907, 10, 37), (906, 10, 36), (905, 10, 35), (904, 10, 32), (903, 10, 34), (902, 10, 33), (901, 10, 21), (900, 10, 20), (899, 10, 19), (898, 10, 23), (897, 10, 13), (910, 10, 30), (965, 11, 29), (964, 11, 37), (963, 11, 32), (962, 11, 34), (961, 11, 33), (960, 11, 21), (959, 11, 20), (958, 11, 19);
/*!40000 ALTER TABLE `neltool_group_applications` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_group_domains: 25 rows
/*!40000 ALTER TABLE `neltool_group_domains` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_group_domains` (`group_domain_id`, `group_domain_group_id`, `group_domain_domain_id`) VALUES (79, 1, 9), (84, 3, 3), (78, 1, 8), (43, 2, 1), (20, 4, 4), (80, 1, 1), (77, 1, 3), (40, 5, 4), (21, 4, 1), (22, 6, 1), (42, 2, 4), (76, 1, 12), (83, 3, 12), (75, 1, 2), (41, 5, 8), (44, 2, 8), (82, 3, 2), (74, 1, 4), (73, 9, 9), (81, 3, 4), (85, 3, 8), (86, 3, 9), (87, 3, 1), (88, 10, 12), (89, 11, 12);
/*!40000 ALTER TABLE `neltool_group_domains` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_group_shards: 154 rows
/*!40000 ALTER TABLE `neltool_group_shards` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_group_shards` (`group_shard_id`, `group_shard_group_id`, `group_shard_shard_id`, `group_shard_domain_id`) VALUES (1513, 3, 43, 1), (1473, 1, 42, 1), (1472, 1, 2, 1), (1471, 1, 3, 1), (1470, 1, 1, 1), (1512, 3, 46, 1), (1511, 3, 45, 1), (1510, 3, 6, 1), (1509, 3, 5, 1), (1508, 3, 58, 9), (1507, 3, 102, 9), (1506, 3, 103, 9), (841, 2, 37, 8), (840, 2, 36, 8), (839, 2, 31, 8), (838, 2, 47, 8), (837, 2, 32, 8), (836, 2, 30, 8), (1469, 1, 44, 1), (1468, 1, 43, 1), (1467, 1, 46, 1), (1466, 1, 45, 1), (1465, 1, 6, 1), (1464, 1, 5, 1), (1463, 1, 58, 9), (1505, 3, 104, 9), (1504, 3, 57, 9), (1488, 3, 10, 2), (1487, 3, 14, 2), (1493, 3, 54, 3), (1486, 3, 8, 2), (1485, 3, 13, 2), (1503, 3, 56, 9), (1502, 3, 40, 8), (1501, 3, 37, 8), (1500, 3, 36, 8), (1499, 3, 31, 8), (1498, 3, 47, 8), (1497, 3, 32, 8), (1496, 3, 30, 8), (1462, 1, 102, 9), (1461, 1, 103, 9), (1492, 3, 53, 3), (1460, 1, 104, 9), (1459, 1, 57, 9), (1458, 1, 56, 9), (1457, 1, 40, 8), (903, 5, 37, 8), (902, 5, 36, 8), (901, 5, 31, 8), (900, 5, 47, 8), (899, 5, 32, 8), (898, 5, 30, 8), (897, 5, 39, 8), (1456, 1, 37, 8), (652, 4, 26, 4), (651, 4, 20, 4), (650, 4, 19, 4), (1491, 3, 15, 3), (1455, 1, 36, 8), (896, 5, 41, 8), (1490, 3, 106, 12), (1454, 1, 31, 8), (895, 5, 18, 4), (894, 5, 26, 4), (893, 5, 20, 4), (646, 4, 23, 4), (645, 4, 22, 4), (644, 4, 21, 4), (835, 2, 39, 8), (834, 2, 41, 8), (833, 2, 4, 1), (832, 2, 44, 1), (831, 2, 43, 1), (830, 2, 42, 1), (829, 2, 2, 1), (828, 2, 46, 1), (827, 2, 45, 1), (826, 2, 3, 1), (825, 2, 1, 1), (824, 2, 6, 1), (892, 5, 19, 4), (1495, 3, 39, 8), (1484, 3, 7, 2), (891, 5, 24, 4), (1489, 3, 107, 12), (1483, 3, 18, 4), (1482, 3, 26, 4), (1481, 3, 20, 4), (1480, 3, 19, 4), (1479, 3, 24, 4), (1453, 1, 47, 8), (1452, 1, 32, 8), (1474, 1, 4, 1), (887, 5, 23, 4), (886, 5, 22, 4), (1451, 1, 30, 8), (1450, 1, 39, 8), (1449, 1, 41, 8), (1448, 1, 54, 3), (1447, 1, 53, 3), (885, 5, 21, 4), (904, 5, 40, 8), (884, 5, 17, 4), (823, 2, 5, 1), (822, 2, 18, 4), (821, 2, 26, 4), (820, 2, 20, 4), (819, 2, 19, 4), (818, 2, 24, 4), (1446, 1, 15, 3), (1385, 9, 58, 9), (1445, 1, 106, 12), (1444, 1, 107, 12), (1443, 1, 10, 2), (1478, 3, 23, 4), (1477, 3, 22, 4), (1494, 3, 41, 8), (814, 2, 23, 4), (813, 2, 22, 4), (812, 2, 21, 4), (653, 4, 42, 1), (654, 4, 43, 1), (655, 4, 44, 1), (1384, 9, 102, 9), (842, 2, 40, 8), (1383, 9, 103, 9), (1382, 9, 104, 9), (811, 2, 17, 4), (1381, 9, 57, 9), (1442, 1, 14, 2), (1476, 3, 21, 4), (1441, 1, 8, 2), (1440, 1, 13, 2), (1380, 9, 56, 9), (1439, 1, 7, 2), (1438, 1, 18, 4), (1437, 1, 26, 4), (1436, 1, 20, 4), (1435, 1, 19, 4), (1434, 1, 24, 4), (1433, 1, 23, 4), (1432, 1, 22, 4), (1431, 1, 21, 4), (1430, 1, 17, 4), (1475, 3, 17, 4), (1514, 3, 44, 1), (1515, 3, 1, 1), (1516, 3, 3, 1), (1517, 3, 2, 1), (1518, 3, 42, 1), (1519, 3, 4, 1), (1520, 10, 106, 12), (1521, 11, 106, 12);
/*!40000 ALTER TABLE `neltool_group_shards` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_locks: 0 rows
/*!40000 ALTER TABLE `neltool_locks` DISABLE KEYS */;
/*!40000 ALTER TABLE `neltool_locks` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_notes: 8 rows
/*!40000 ALTER TABLE `neltool_notes` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_notes` (`note_id`, `note_user_id`, `note_title`, `note_data`, `note_date`, `note_active`, `note_global`) VALUES (2, 27, 'Welcome', 'Welcome to the shard administration website!\r\n\r\nThis website is used to monitor and restart shards.\r\n\r\nIt also gives some player characters information.', 1272378065, 1, 1), (3, 27, 'Shard Start', '# At the same time : NS and TS\r\n[1 min] : all MS, you can boot them all at the same time\r\n[1 min] : IOS\r\n[3 mins] : GMPS\r\n[3 mins] : EGS\r\n[5 mins] : AI Fyros\r\n[1 min 30] : AI Zorai\r\n[1 min 30] : AI Matis\r\n[1 min 30] : AI TNP\r\n[1 min 30] : AI NPE\r\n[1 min 30] : AI Tryker\r\n[1 min 30] : All FS and SBS at the same time\r\n[30 secs] : WS (atm the WS starts in OPEN mode by default, so be fast before CSR checkage, fix for that inc soon)\r\n\r\nNOTE: you can check the uptime for those timers in the right column of the admin tool: UpTime\r\n', 1158751126, 1, 0), (5, 27, 'shutting supplementary', 'the writing wont change when lock the ws\r\n\r\nuntick previous boxes as you shut down\r\n\r\nwait 5 between the ws and the egs ie egs is 5 past rest is 10 past', 1153395380, 1, 0), (4, 27, 'Shard Stop', '1. Broadcast to warn players\r\n\r\n2. 10 mins before shutdown, lock the WS\r\n\r\n3. At the right time shut down WS\r\n\r\n4. Shut down EGS\r\nOnly the EGS. Wait 5 reals minutes. Goal is to give enough time to egs, in order to save all the info he has to, and letting him sending those message to all services who need it.\r\n\r\n5. Shut down the rest, et voil&agrave;, you&#039;re done.', 1153314198, 1, 0), (6, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup:\r\n\r\n[shut down egs]\r\n[5 mins]\r\n\r\n[IOS] &amp; [GPMS] (shut down at same time)\r\n\r\nAfter the services are down follow &quot;UP&quot; process with timers again.\r\n\r\nIOS\r\n[3 mins]\r\nGPMS\r\n[3 mins]\r\nEGS\r\n[5 mins]\r\nbla bla...', 1153395097, 1, 0), (7, 27, 'opening if the egs is too high on reboot', '&lt;kadael&gt; here my note on admin about egs to high on startup\r\n&lt;kadael&gt; ---\r\n&lt;kadael&gt; If [EGS] is to high on startup:\r\n&lt;kadael&gt; [shut down egs]\r\n&lt;kadael&gt; [5 mins]\r\n&lt;kadael&gt; [IOS] &amp; [GPMS] (at same time shut down )\r\n&lt;kadael&gt; after the services are down follow &quot;UP&quot; process with timers again.\r\n&lt;kadael&gt; IOS\r\n&lt;kadael&gt; [3 mins]\r\n&lt;kadael&gt; GPMS\r\n&lt;kadael&gt; [3 mins]\r\n&lt;kadael&gt; EGS\r\n&lt;kadael&gt; [5 mins]\r\n&lt;kadael&gt; bla bla...\r\n&lt;kadael&gt; ---', 1153395362, 1, 0), (10, 27, 'Ring points', 'Commande pour donner tout les points ring &agrave; tout le monde :\r\n\r\nDans le DSS d&#039;un Shard Ring entrer : DefaultCharRingAccess f7:j7:l6:d7:p13:g9:a9', 1155722296, 1, 0), (9, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup: \r\n \r\n [shut down egs] \r\n [5 mins] \r\n \r\n [IOS] &amp; [GPMS] (shut down at same time) \r\n \r\n After the services are down follow &quot;UP&quot; process with timers again. \r\n \r\n IOS \r\n [3 mins] \r\n GPMS \r\n [3 mins] \r\n EGS \r\n [5 mins] \r\n bla bla...', 1153929658, 1, 0);
/*!40000 ALTER TABLE `neltool_notes` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_restart_groups: 4 rows
/*!40000 ALTER TABLE `neltool_restart_groups` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_restart_groups` (`restart_group_id`, `restart_group_name`, `restart_group_list`, `restart_group_order`) VALUES (1, 'Low Level', 'rns,ts,ms', '1'), (3, 'Mid Level', 'ios,gpms,egs', '2'), (4, 'High Level', 'ais', '3'), (5, 'Front Level', 'fes,sbs,dss,rws', '4');
/*!40000 ALTER TABLE `neltool_restart_groups` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_restart_messages: 4 rows
/*!40000 ALTER TABLE `neltool_restart_messages` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_restart_messages` (`restart_message_id`, `restart_message_name`, `restart_message_value`, `restart_message_lang`) VALUES (5, 'reboot', 'The shard is about to go down. Please find a safe location and log out.', 'en'), (4, 'reboot', 'Le serveur va redemarrer dans $minutes$ minutes. Merci de vous deconnecter en lieu sur.', 'fr'), (6, 'reboot', 'Der Server wird heruntergefahren. Findet eine sichere Stelle und logt aus.', 'de'), (10, 'reboot', 'Arret du serveur dans $minutes+1$ minutes', 'fr');
/*!40000 ALTER TABLE `neltool_restart_messages` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_restart_sequences: 0 rows
/*!40000 ALTER TABLE `neltool_restart_sequences` DISABLE KEYS */;
/*!40000 ALTER TABLE `neltool_restart_sequences` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_shards: 1 rows
/*!40000 ALTER TABLE `neltool_shards` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_shards` (`shard_id`, `shard_name`, `shard_as_id`, `shard_domain_id`, `shard_lang`, `shard_restart`) VALUES (106, 'Open', 'open', 12, 'en', 0);
/*!40000 ALTER TABLE `neltool_shards` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_stats_hd_datas: 0 rows
/*!40000 ALTER TABLE `neltool_stats_hd_datas` DISABLE KEYS */;
/*!40000 ALTER TABLE `neltool_stats_hd_datas` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_stats_hd_times: 0 rows
/*!40000 ALTER TABLE `neltool_stats_hd_times` DISABLE KEYS */;
/*!40000 ALTER TABLE `neltool_stats_hd_times` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_users: 3 rows
/*!40000 ALTER TABLE `neltool_users` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_users` (`user_id`, `user_name`, `user_password`, `user_group_id`, `user_created`, `user_active`, `user_logged_last`, `user_logged_count`, `user_menu_style`) VALUES (27, 'admin', '084e0343a0486ff05530df6c705c8bb4', 1, 1213886454, 1, 1273158945, 382, 2), (32, 'guest', '084e0343a0486ff05530df6c705c8bb4', 1, 1272379014, 1, 1273335407, 273, 2);
/*!40000 ALTER TABLE `neltool_users` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_user_applications: 5 rows
/*!40000 ALTER TABLE `neltool_user_applications` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_user_applications` (`user_application_id`, `user_application_user_id`, `user_application_application_id`) VALUES (8, 12, 33), (20, 6, 31), (19, 6, 34), (9, 12, 31), (21, 10, 34);
/*!40000 ALTER TABLE `neltool_user_applications` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_user_domains: 11 rows
/*!40000 ALTER TABLE `neltool_user_domains` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_user_domains` (`user_domain_id`, `user_domain_user_id`, `user_domain_domain_id`) VALUES (5, 6, 2), (9, 22, 1), (10, 23, 4), (4, 12, 3), (6, 6, 3), (11, 23, 2), (12, 23, 1), (13, 23, 8), (18, 15, 1), (17, 15, 2), (19, 31, 9);
/*!40000 ALTER TABLE `neltool_user_domains` ENABLE KEYS */;
# Dumping data for table nel_tool.neltool_user_shards: 81 rows
/*!40000 ALTER TABLE `neltool_user_shards` DISABLE KEYS */;
INSERT IGNORE INTO `neltool_user_shards` (`user_shard_id`, `user_shard_user_id`, `user_shard_shard_id`, `user_shard_domain_id`) VALUES (1, 8, 1, 1), (2, 9, 2, 1), (68, 7, 3, 1), (143, 6, 4, 1), (142, 6, 2, 1), (141, 6, 45, 1), (140, 6, 3, 1), (90, 23, 26, 4), (89, 23, 20, 4), (13, 14, 1, 1), (14, 14, 3, 1), (15, 14, 2, 1), (139, 6, 1, 1), (74, 17, 2, 1), (73, 17, 45, 1), (72, 17, 3, 1), (71, 17, 1, 1), (70, 17, 18, 4), (88, 23, 19, 4), (87, 23, 24, 4), (83, 23, 23, 4), (82, 23, 22, 4), (81, 23, 21, 4), (34, 12, 15, 3), (36, 18, 2, 1), (138, 6, 7, 2), (80, 23, 17, 4), (79, 22, 45, 1), (78, 22, 3, 1), (77, 21, 45, 1), (76, 21, 3, 1), (75, 17, 4, 1), (69, 7, 45, 1), (146, 6, 54, 3), (91, 23, 18, 4), (92, 23, 7, 2), (93, 23, 13, 2), (94, 23, 8, 2), (95, 23, 14, 2), (145, 6, 53, 3), (97, 23, 10, 2), (144, 6, 15, 3), (99, 23, 5, 1), (100, 23, 6, 1), (101, 23, 1, 1), (102, 23, 3, 1), (103, 23, 45, 1), (104, 23, 46, 1), (105, 23, 2, 1), (106, 23, 42, 1), (107, 23, 43, 1), (108, 23, 44, 1), (109, 23, 4, 1), (110, 23, 41, 8), (111, 23, 39, 8), (112, 23, 30, 8), (113, 23, 32, 8), (114, 23, 47, 8), (115, 23, 31, 8), (116, 23, 36, 8), (117, 23, 37, 8), (118, 23, 40, 8), (156, 15, 45, 1), (155, 15, 3, 1), (154, 15, 1, 1), (153, 15, 6, 1), (152, 15, 5, 1), (151, 15, 10, 2), (150, 15, 14, 2), (149, 15, 8, 2), (148, 15, 13, 2), (147, 15, 7, 2), (157, 15, 46, 1), (158, 15, 2, 1), (159, 15, 42, 1), (160, 15, 43, 1), (161, 15, 44, 1), (162, 15, 4, 1), (163, 31, 57, 9), (164, 31, 104, 9), (165, 31, 103, 9);
/*!40000 ALTER TABLE `neltool_user_shards` ENABLE KEYS */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

49
code/ryzom/tools/server/sql/ryzom_default_data.sql
View file

@ -1,49 +0,0 @@
# --------------------------------------------------------
# Host: 94.23.202.75
# Database: nel
# Server version: 5.1.37-1ubuntu5.1
# Server OS: debian-linux-gnu
# HeidiSQL version: 5.0.0.3272
# Date/time: 2010-05-08 15:31:21
# --------------------------------------------------------
USE `nel`;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!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 */;
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 */;
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
# Database: ring_open
# Server version: 5.1.37-1ubuntu5.1
# Server OS: debian-linux-gnu
# HeidiSQL version: 5.0.0.3272
# Date/time: 2010-05-08 15:31:22
# --------------------------------------------------------
USE `ring_open`;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!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 */;
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 */;
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 */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

812
code/ryzom/tools/server/sql/ryzom_tables.sql
View file

@ -1,812 +0,0 @@
# --------------------------------------------------------
# Host: 94.23.202.75
# Database: nel
# Server version: 5.1.37-1ubuntu5.1
# Server OS: debian-linux-gnu
# HeidiSQL version: 5.0.0.3272
# Date/time: 2010-05-08 09:14:27
# --------------------------------------------------------
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
# Dumping database structure for nel
CREATE DATABASE IF NOT EXISTS `nel` /*!40100 DEFAULT CHARACTER SET latin1 */;
USE `nel`;
# Dumping structure for table nel.domain
CREATE TABLE IF NOT EXISTS `domain` (
`domain_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`domain_name` varchar(32) NOT NULL DEFAULT '',
`status` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev',
`patch_version` int(10) unsigned NOT NULL DEFAULT '0',
`backup_patch_url` varchar(255) DEFAULT NULL,
`patch_urls` text,
`login_address` varchar(255) NOT NULL DEFAULT '',
`session_manager_address` varchar(255) NOT NULL DEFAULT '',
`ring_db_name` varchar(255) NOT NULL DEFAULT '',
`web_host` varchar(255) NOT NULL DEFAULT '',
`web_host_php` varchar(255) NOT NULL DEFAULT '',
`description` varchar(200) DEFAULT NULL,
PRIMARY KEY (`domain_id`),
UNIQUE KEY `name_idx` (`domain_name`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel.permission
CREATE TABLE IF NOT EXISTS `permission` (
`UId` int(10) unsigned NOT NULL DEFAULT '0',
`ClientApplication` char(64) NOT NULL DEFAULT 'ryzom',
`ShardId` int(10) NOT NULL DEFAULT '-1',
`AccessPrivilege` set('OPEN','DEV','RESTRICTED') NOT NULL DEFAULT 'OPEN',
`prim` int(10) unsigned NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`prim`),
KEY `UIDIndex` (`UId`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel.shard
CREATE TABLE IF NOT EXISTS `shard` (
`ShardId` int(10) NOT NULL DEFAULT '0',
`domain_id` int(11) unsigned NOT NULL DEFAULT '0',
`WsAddr` varchar(64) DEFAULT NULL,
`NbPlayers` int(10) unsigned DEFAULT '0',
`Name` varchar(255) DEFAULT 'unknown shard',
`Online` tinyint(1) unsigned DEFAULT '0',
`ClientApplication` varchar(64) DEFAULT 'ryzom',
`Version` varchar(64) NOT NULL DEFAULT '',
`PatchURL` varchar(255) NOT NULL DEFAULT '',
`DynPatchURL` varchar(255) NOT NULL DEFAULT '',
`FixedSessionId` int(11) unsigned NOT NULL DEFAULT '0',
`State` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev',
`MOTD` text NOT NULL,
`prim` int(10) unsigned NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`prim`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all shards information for login system';
# Data exporting was unselected.
# Dumping structure for table nel.user
CREATE TABLE IF NOT EXISTS `user` (
`UId` int(10) NOT NULL AUTO_INCREMENT,
`Login` varchar(64) NOT NULL DEFAULT '',
`Password` varchar(13) DEFAULT NULL,
`ShardId` int(10) NOT NULL DEFAULT '-1',
`State` enum('Offline','Online') NOT NULL DEFAULT 'Offline',
`Privilege` varchar(255) NOT NULL DEFAULT '',
`GroupName` varchar(255) NOT NULL DEFAULT '',
`FirstName` varchar(255) NOT NULL DEFAULT '',
`LastName` varchar(255) NOT NULL DEFAULT '',
`Birthday` varchar(32) NOT NULL DEFAULT '',
`Gender` tinyint(1) unsigned NOT NULL DEFAULT '0',
`Country` char(2) NOT NULL DEFAULT '',
`Email` varchar(255) NOT NULL DEFAULT '',
`Address` varchar(255) NOT NULL DEFAULT '',
`City` varchar(100) NOT NULL DEFAULT '',
`PostalCode` varchar(10) NOT NULL DEFAULT '',
`USState` char(2) NOT NULL DEFAULT '',
`Chat` char(2) NOT NULL DEFAULT '0',
`BetaKeyId` int(10) unsigned NOT NULL DEFAULT '0',
`CachedCoupons` varchar(255) NOT NULL DEFAULT '',
`ProfileAccess` varchar(45) DEFAULT NULL,
`Level` int(2) NOT NULL DEFAULT '0',
`CurrentFunds` int(4) NOT NULL DEFAULT '0',
`IdBilling` varchar(255) NOT NULL DEFAULT '',
`Community` char(2) NOT NULL DEFAULT '--',
`Newsletter` tinyint(1) NOT NULL DEFAULT '1',
`Account` varchar(64) NOT NULL DEFAULT '',
`ChoiceSubLength` tinyint(2) NOT NULL DEFAULT '0',
`CurrentSubLength` varchar(255) NOT NULL DEFAULT '0',
`ValidIdBilling` int(4) NOT NULL DEFAULT '0',
`GMId` int(4) NOT NULL DEFAULT '0',
`ExtendedPrivilege` varchar(128) NOT NULL DEFAULT '',
`ToolsGroup` varchar(20) NOT NULL DEFAULT '',
`Unsubscribe` date NOT NULL DEFAULT '0000-00-00',
`SubDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`SubIp` varchar(20) NOT NULL DEFAULT '',
`SecurePassword` varchar(32) NOT NULL DEFAULT '',
`LastInvoiceEmailCheck` date NOT NULL DEFAULT '0000-00-00',
`FromSource` varchar(8) NOT NULL DEFAULT '',
`ValidMerchantCode` varchar(13) NOT NULL DEFAULT '',
`PBC` tinyint(1) NOT NULL DEFAULT '0',
`ApiKeySeed` varchar(8) DEFAULT NULL,
PRIMARY KEY (`UId`),
KEY `LoginIndex` (`Login`),
KEY `GroupIndex` (`GroupName`),
KEY `ToolsGroup` (`ToolsGroup`),
KEY `CurrentSubLength` (`CurrentSubLength`),
KEY `Community` (`Community`),
KEY `Email` (`Email`),
KEY `GMId` (`GMId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all users information for login system';
# Data exporting was unselected.
# --------------------------------------------------------
# Host: 94.23.202.75
# Database: nel_tool
# Server version: 5.1.37-1ubuntu5.1
# Server OS: debian-linux-gnu
# HeidiSQL version: 5.0.0.3272
# Date/time: 2010-05-08 09:14:28
# --------------------------------------------------------
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
# Dumping database structure for nel_tool
CREATE DATABASE IF NOT EXISTS `nel_tool` /*!40100 DEFAULT CHARACTER SET latin1 */;
USE `nel_tool`;
# Dumping structure for table nel_tool.neltool_annotations
CREATE TABLE IF NOT EXISTS `neltool_annotations` (
`annotation_id` int(11) NOT NULL AUTO_INCREMENT,
`annotation_domain_id` int(11) DEFAULT NULL,
`annotation_shard_id` int(11) DEFAULT NULL,
`annotation_data` varchar(255) NOT NULL DEFAULT '',
`annotation_user_name` varchar(32) NOT NULL DEFAULT '',
`annotation_date` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`annotation_id`),
UNIQUE KEY `annotation_shard_id` (`annotation_shard_id`),
UNIQUE KEY `annotation_domain_id` (`annotation_domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_applications
CREATE TABLE IF NOT EXISTS `neltool_applications` (
`application_id` int(11) NOT NULL AUTO_INCREMENT,
`application_name` varchar(64) NOT NULL DEFAULT '',
`application_uri` varchar(255) NOT NULL DEFAULT '',
`application_restriction` varchar(64) NOT NULL DEFAULT '',
`application_order` int(11) NOT NULL DEFAULT '0',
`application_visible` int(11) NOT NULL DEFAULT '0',
`application_icon` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`application_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_domains
CREATE TABLE IF NOT EXISTS `neltool_domains` (
`domain_id` int(11) NOT NULL AUTO_INCREMENT,
`domain_name` varchar(128) NOT NULL DEFAULT '',
`domain_as_host` varchar(128) NOT NULL DEFAULT '',
`domain_as_port` int(11) NOT NULL DEFAULT '0',
`domain_rrd_path` varchar(255) NOT NULL DEFAULT '',
`domain_las_admin_path` varchar(255) NOT NULL DEFAULT '',
`domain_las_local_path` varchar(255) NOT NULL DEFAULT '',
`domain_application` varchar(128) NOT NULL DEFAULT '',
`domain_sql_string` varchar(128) NOT NULL DEFAULT '',
`domain_hd_check` int(11) NOT NULL DEFAULT '0',
`domain_mfs_web` text,
`domain_cs_sql_string` varchar(255) DEFAULT NULL,
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_groups
CREATE TABLE IF NOT EXISTS `neltool_groups` (
`group_id` int(11) NOT NULL AUTO_INCREMENT,
`group_name` varchar(32) NOT NULL DEFAULT 'NewGroup',
`group_level` int(11) NOT NULL DEFAULT '0',
`group_default` int(11) NOT NULL DEFAULT '0',
`group_active` int(11) NOT NULL DEFAULT '0',
`group_default_domain_id` tinyint(3) unsigned DEFAULT NULL,
`group_default_shard_id` tinyint(3) unsigned DEFAULT NULL,
PRIMARY KEY (`group_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_group_applications
CREATE TABLE IF NOT EXISTS `neltool_group_applications` (
`group_application_id` int(11) NOT NULL AUTO_INCREMENT,
`group_application_group_id` int(11) NOT NULL DEFAULT '0',
`group_application_application_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`group_application_id`),
KEY `group_application_group_id` (`group_application_group_id`),
KEY `group_application_application_id` (`group_application_application_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_group_domains
CREATE TABLE IF NOT EXISTS `neltool_group_domains` (
`group_domain_id` int(11) NOT NULL AUTO_INCREMENT,
`group_domain_group_id` int(11) NOT NULL DEFAULT '0',
`group_domain_domain_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`group_domain_id`),
KEY `group_domain_group_id` (`group_domain_group_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_group_shards
CREATE TABLE IF NOT EXISTS `neltool_group_shards` (
`group_shard_id` int(11) NOT NULL AUTO_INCREMENT,
`group_shard_group_id` int(11) NOT NULL DEFAULT '0',
`group_shard_shard_id` int(11) NOT NULL DEFAULT '0',
`group_shard_domain_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`group_shard_id`),
KEY `group_shard_group_id` (`group_shard_group_id`),
KEY `group_shard_domain_id` (`group_shard_domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_locks
CREATE TABLE IF NOT EXISTS `neltool_locks` (
`lock_id` int(11) NOT NULL AUTO_INCREMENT,
`lock_domain_id` int(11) DEFAULT NULL,
`lock_shard_id` int(11) DEFAULT NULL,
`lock_user_name` varchar(32) NOT NULL DEFAULT '',
`lock_date` int(11) NOT NULL DEFAULT '0',
`lock_update` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`lock_id`),
UNIQUE KEY `lock_shard_id` (`lock_shard_id`),
UNIQUE KEY `lock_domain_id` (`lock_domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_logs
CREATE TABLE IF NOT EXISTS `neltool_logs` (
`logs_id` int(11) NOT NULL AUTO_INCREMENT,
`logs_user_name` varchar(32) NOT NULL DEFAULT '0',
`logs_date` int(11) NOT NULL DEFAULT '0',
`logs_data` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`logs_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_notes
CREATE TABLE IF NOT EXISTS `neltool_notes` (
`note_id` int(11) NOT NULL AUTO_INCREMENT,
`note_user_id` int(11) NOT NULL DEFAULT '0',
`note_title` varchar(128) NOT NULL DEFAULT '',
`note_data` text NOT NULL,
`note_date` int(11) NOT NULL DEFAULT '0',
`note_active` int(11) NOT NULL DEFAULT '0',
`note_global` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`note_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_restart_groups
CREATE TABLE IF NOT EXISTS `neltool_restart_groups` (
`restart_group_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`restart_group_name` varchar(50) DEFAULT NULL,
`restart_group_list` varchar(50) DEFAULT NULL,
`restart_group_order` varchar(50) DEFAULT NULL,
PRIMARY KEY (`restart_group_id`),
UNIQUE KEY `restart_group_id` (`restart_group_id`),
KEY `restart_group_id_2` (`restart_group_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_restart_messages
CREATE TABLE IF NOT EXISTS `neltool_restart_messages` (
`restart_message_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`restart_message_name` varchar(20) DEFAULT NULL,
`restart_message_value` varchar(128) DEFAULT NULL,
`restart_message_lang` varchar(5) DEFAULT NULL,
PRIMARY KEY (`restart_message_id`),
UNIQUE KEY `restart_message_id` (`restart_message_id`),
KEY `restart_message_id_2` (`restart_message_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_restart_sequences
CREATE TABLE IF NOT EXISTS `neltool_restart_sequences` (
`restart_sequence_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`restart_sequence_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
`restart_sequence_shard_id` int(10) unsigned NOT NULL DEFAULT '0',
`restart_sequence_user_name` varchar(50) DEFAULT NULL,
`restart_sequence_step` int(10) unsigned NOT NULL DEFAULT '0',
`restart_sequence_date_start` int(11) DEFAULT NULL,
`restart_sequence_date_end` int(11) DEFAULT NULL,
`restart_sequence_timer` int(11) unsigned DEFAULT '0',
PRIMARY KEY (`restart_sequence_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_shards
CREATE TABLE IF NOT EXISTS `neltool_shards` (
`shard_id` int(11) NOT NULL AUTO_INCREMENT,
`shard_name` varchar(128) NOT NULL DEFAULT '',
`shard_as_id` varchar(255) NOT NULL DEFAULT '0',
`shard_domain_id` int(11) NOT NULL DEFAULT '0',
`shard_lang` char(2) NOT NULL DEFAULT 'en',
`shard_restart` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`shard_id`),
KEY `shard_domain_id` (`shard_domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_stats_hd_datas
CREATE TABLE IF NOT EXISTS `neltool_stats_hd_datas` (
`hd_id` int(11) NOT NULL AUTO_INCREMENT,
`hd_domain_id` int(11) NOT NULL DEFAULT '0',
`hd_server` varchar(32) NOT NULL DEFAULT '',
`hd_device` varchar(64) NOT NULL DEFAULT '',
`hd_size` varchar(16) NOT NULL DEFAULT '',
`hd_used` varchar(16) NOT NULL DEFAULT '',
`hd_free` varchar(16) NOT NULL DEFAULT '',
`hd_percent` int(11) NOT NULL DEFAULT '0',
`hd_mount` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`hd_id`),
KEY `hd_domain_id` (`hd_domain_id`),
KEY `hd_server` (`hd_server`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_stats_hd_times
CREATE TABLE IF NOT EXISTS `neltool_stats_hd_times` (
`hd_domain_id` int(11) NOT NULL DEFAULT '0',
`hd_last_time` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`hd_domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_users
CREATE TABLE IF NOT EXISTS `neltool_users` (
`user_id` int(11) NOT NULL AUTO_INCREMENT,
`user_name` varchar(32) NOT NULL DEFAULT '',
`user_password` varchar(64) NOT NULL DEFAULT '',
`user_group_id` int(11) NOT NULL DEFAULT '0',
`user_created` int(11) NOT NULL DEFAULT '0',
`user_active` int(11) NOT NULL DEFAULT '0',
`user_logged_last` int(11) NOT NULL DEFAULT '0',
`user_logged_count` int(11) NOT NULL DEFAULT '0',
`user_menu_style` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`user_id`),
UNIQUE KEY `user_login` (`user_name`),
KEY `user_group_id` (`user_group_id`),
KEY `user_active` (`user_active`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_user_applications
CREATE TABLE IF NOT EXISTS `neltool_user_applications` (
`user_application_id` int(11) NOT NULL AUTO_INCREMENT,
`user_application_user_id` int(11) NOT NULL DEFAULT '0',
`user_application_application_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`user_application_id`),
KEY `user_application_user_id` (`user_application_user_id`),
KEY `user_application_application_id` (`user_application_application_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_user_domains
CREATE TABLE IF NOT EXISTS `neltool_user_domains` (
`user_domain_id` int(11) NOT NULL AUTO_INCREMENT,
`user_domain_user_id` int(11) NOT NULL DEFAULT '0',
`user_domain_domain_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`user_domain_id`),
KEY `user_domain_user_id` (`user_domain_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table nel_tool.neltool_user_shards
CREATE TABLE IF NOT EXISTS `neltool_user_shards` (
`user_shard_id` int(11) NOT NULL AUTO_INCREMENT,
`user_shard_user_id` int(11) NOT NULL DEFAULT '0',
`user_shard_shard_id` int(11) NOT NULL DEFAULT '0',
`user_shard_domain_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`user_shard_id`),
KEY `user_shard_user_id` (`user_shard_user_id`),
KEY `user_shard_domain_id` (`user_shard_domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# --------------------------------------------------------
# Host: 94.23.202.75
# Database: ring_open
# Server version: 5.1.37-1ubuntu5.1
# Server OS: debian-linux-gnu
# HeidiSQL version: 5.0.0.3272
# Date/time: 2010-05-08 09:14:32
# --------------------------------------------------------
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
# Dumping database structure for ring_open
CREATE DATABASE IF NOT EXISTS `ring_open` /*!40100 DEFAULT CHARACTER SET latin1 */;
USE `ring_open`;
# Dumping structure for table ring_open.characters
CREATE TABLE IF NOT EXISTS `characters` (
`char_id` int(10) unsigned NOT NULL DEFAULT '0',
`char_name` varchar(20) NOT NULL DEFAULT '',
`user_id` int(10) unsigned NOT NULL DEFAULT '0',
`guild_id` int(10) unsigned NOT NULL DEFAULT '0',
`best_combat_level` int(10) unsigned NOT NULL DEFAULT '0',
`home_mainland_session_id` int(10) unsigned NOT NULL DEFAULT '0',
`ring_access` varchar(63) NOT NULL DEFAULT '',
`race` enum('r_fyros','r_matis','r_tryker','r_zorai') NOT NULL DEFAULT 'r_fyros',
`civilisation` enum('c_neutral','c_fyros','c_fyros','c_matis','c_tryker','c_zorai') NOT NULL DEFAULT 'c_neutral',
`cult` enum('c_neutral','c_kami','c_karavan') NOT NULL DEFAULT 'c_neutral',
`current_session` int(11) unsigned NOT NULL DEFAULT '0',
`rrp_am` int(11) unsigned NOT NULL DEFAULT '0',
`rrp_masterless` int(11) unsigned NOT NULL DEFAULT '0',
`rrp_author` int(11) unsigned NOT NULL DEFAULT '0',
`newcomer` tinyint(1) NOT NULL DEFAULT '1',
`creation_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`last_played_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`char_id`),
UNIQUE KEY `char_name_idx` (`char_name`,`home_mainland_session_id`),
KEY `user_id_idx` (`user_id`),
KEY `guild_idx` (`guild_id`),
KEY `guild_id_idx` (`guild_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table ring_open.folder
CREATE TABLE IF NOT EXISTS `folder` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`owner` int(10) unsigned NOT NULL DEFAULT '0',
`title` varchar(40) NOT NULL DEFAULT '',
`comments` text NOT NULL,
PRIMARY KEY (`Id`),
KEY `owner_idx` (`owner`),
KEY `title_idx` (`title`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.folder_access
CREATE TABLE IF NOT EXISTS `folder_access` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`folder_id` int(10) unsigned NOT NULL DEFAULT '0',
`user_id` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`Id`),
KEY `folder_id_idx` (`folder_id`),
KEY `user_idx` (`user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED;
# Data exporting was unselected.
# Dumping structure for table ring_open.guilds
CREATE TABLE IF NOT EXISTS `guilds` (
`guild_id` int(10) unsigned NOT NULL DEFAULT '0',
`guild_name` varchar(50) NOT NULL DEFAULT '',
`shard_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`guild_id`),
KEY `shard_id_idx` (`shard_id`),
KEY `guild_name_idx` (`guild_name`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.guild_invites
CREATE TABLE IF NOT EXISTS `guild_invites` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`session_id` int(10) unsigned NOT NULL DEFAULT '0',
`guild_id` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`Id`),
KEY `guild_id_idx` (`guild_id`),
KEY `session_id_idx` (`session_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED;
# Data exporting was unselected.
# Dumping structure for table ring_open.journal_entry
CREATE TABLE IF NOT EXISTS `journal_entry` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`session_id` int(10) unsigned NOT NULL DEFAULT '0',
`author` int(10) unsigned NOT NULL DEFAULT '0',
`type` enum('jet_credits','jet_notes') NOT NULL DEFAULT 'jet_notes',
`text` text NOT NULL,
`time_stamp` datetime NOT NULL DEFAULT '2005-09-07 12:41:33',
PRIMARY KEY (`Id`),
KEY `session_id_idx` (`session_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.known_users
CREATE TABLE IF NOT EXISTS `known_users` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`owner` int(10) unsigned NOT NULL DEFAULT '0',
`targer_user` int(10) unsigned NOT NULL DEFAULT '0',
`targer_character` int(10) unsigned NOT NULL DEFAULT '0',
`relation_type` enum('rt_friend','rt_banned','rt_friend_dm') NOT NULL DEFAULT 'rt_friend',
`comments` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`Id`),
KEY `user_index` (`owner`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.mfs_erased_mail_series
CREATE TABLE IF NOT EXISTS `mfs_erased_mail_series` (
`erased_char_id` int(11) unsigned NOT NULL DEFAULT '0',
`erased_char_name` varchar(32) NOT NULL DEFAULT '',
`erased_series` int(11) unsigned NOT NULL AUTO_INCREMENT,
`erase_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`erased_series`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.mfs_guild_thread
CREATE TABLE IF NOT EXISTS `mfs_guild_thread` (
`thread_id` int(11) NOT NULL AUTO_INCREMENT,
`guild_id` int(11) unsigned NOT NULL DEFAULT '0',
`topic` varchar(255) NOT NULL DEFAULT '',
`author_name` varchar(32) NOT NULL DEFAULT '',
`last_post_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`post_count` int(11) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`thread_id`),
KEY `guild_index` (`guild_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.mfs_guild_thread_message
CREATE TABLE IF NOT EXISTS `mfs_guild_thread_message` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`thread_id` int(11) unsigned NOT NULL DEFAULT '0',
`author_name` varchar(32) NOT NULL DEFAULT '',
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`content` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.mfs_mail
CREATE TABLE IF NOT EXISTS `mfs_mail` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`sender_name` varchar(32) NOT NULL DEFAULT '',
`subject` varchar(250) NOT NULL DEFAULT '',
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`status` enum('ms_new','ms_read','ms_erased') NOT NULL DEFAULT 'ms_new',
`dest_char_id` int(11) unsigned NOT NULL DEFAULT '0',
`erase_series` int(11) unsigned NOT NULL DEFAULT '0',
`content` text NOT NULL,
PRIMARY KEY (`id`),
KEY `dest_index` (`dest_char_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.outlands
CREATE TABLE IF NOT EXISTS `outlands` (
`session_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`island_name` text NOT NULL,
`billing_instance_id` int(11) unsigned NOT NULL DEFAULT '0',
`anim_session_id` int(11) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`session_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
# Data exporting was unselected.
# Dumping structure for table ring_open.player_rating
CREATE TABLE IF NOT EXISTS `player_rating` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`scenario_id` int(10) unsigned NOT NULL DEFAULT '0',
`session_id` int(10) unsigned NOT NULL DEFAULT '0',
`rate_fun` tinyint(3) unsigned NOT NULL DEFAULT '0',
`rate_difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
`rate_accessibility` tinyint(3) unsigned NOT NULL DEFAULT '0',
`rate_originality` tinyint(3) unsigned NOT NULL DEFAULT '0',
`rate_direction` tinyint(3) unsigned NOT NULL DEFAULT '0',
`author` int(10) unsigned NOT NULL DEFAULT '0',
`rating` int(10) NOT NULL DEFAULT '0',
`comments` text NOT NULL,
`time_stamp` datetime NOT NULL DEFAULT '2005-09-07 12:41:33',
PRIMARY KEY (`Id`),
KEY `session_id_idx` (`scenario_id`),
KEY `author_idx` (`author`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.ring_users
CREATE TABLE IF NOT EXISTS `ring_users` (
`user_id` int(10) unsigned NOT NULL DEFAULT '0',
`user_name` varchar(20) NOT NULL DEFAULT '',
`user_type` enum('ut_character','ut_pioneer') NOT NULL DEFAULT 'ut_character',
`current_session` int(10) unsigned NOT NULL DEFAULT '0',
`current_activity` enum('ca_none','ca_play','ca_edit','ca_anim') NOT NULL DEFAULT 'ca_none',
`current_status` enum('cs_offline','cs_logged','cs_online') NOT NULL DEFAULT 'cs_offline',
`public_level` enum('pl_none','pl_public') NOT NULL DEFAULT 'pl_none',
`account_type` enum('at_normal','at_gold') NOT NULL DEFAULT 'at_normal',
`content_access_level` varchar(20) NOT NULL DEFAULT '',
`description` text NOT NULL,
`lang` enum('lang_en','lang_fr','lang_de') NOT NULL DEFAULT 'lang_en',
`cookie` varchar(30) NOT NULL DEFAULT '',
`current_domain_id` int(10) NOT NULL DEFAULT '-1',
`pioneer_char_id` int(11) unsigned NOT NULL DEFAULT '0',
`current_char` int(11) NOT NULL DEFAULT '0',
`add_privileges` varchar(64) NOT NULL DEFAULT '',
PRIMARY KEY (`user_id`),
UNIQUE KEY `user_name_idx` (`user_name`),
KEY `cookie_idx` (`cookie`),
KEY `current_session_idx` (`current_session`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.scenario
CREATE TABLE IF NOT EXISTS `scenario` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`md5` varchar(64) NOT NULL DEFAULT '',
`title` varchar(32) NOT NULL DEFAULT '',
`description` text NOT NULL,
`author` varchar(32) NOT NULL DEFAULT '',
`rrp_total` int(11) unsigned NOT NULL DEFAULT '0',
`anim_mode` enum('am_dm','am_autonomous') NOT NULL DEFAULT 'am_dm',
`language` varchar(11) NOT NULL DEFAULT '',
`orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL DEFAULT 'so_other',
`level` enum('sl_a','sl_b','sl_c','sl_d','sl_e','sl_f') NOT NULL DEFAULT 'sl_a',
`allow_free_trial` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.scenario_desc
CREATE TABLE IF NOT EXISTS `scenario_desc` (
`session_id` int(10) unsigned NOT NULL DEFAULT '0',
`parent_scenario` int(10) unsigned NOT NULL DEFAULT '0',
`description` text NOT NULL,
`relation_to_parent` enum('rtp_same','rtp_variant','rtp_different') NOT NULL DEFAULT 'rtp_same',
`title` varchar(40) NOT NULL DEFAULT '',
`num_player` int(10) unsigned NOT NULL DEFAULT '0',
`content_access_level` varchar(20) NOT NULL DEFAULT '',
PRIMARY KEY (`session_id`),
UNIQUE KEY `title_idx` (`title`),
KEY `parent_idx` (`parent_scenario`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.sessions
CREATE TABLE IF NOT EXISTS `sessions` (
`session_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`session_type` enum('st_edit','st_anim','st_outland','st_mainland') NOT NULL DEFAULT 'st_edit',
`title` varchar(40) NOT NULL DEFAULT '',
`owner` int(10) unsigned NOT NULL DEFAULT '0',
`plan_date` datetime NOT NULL DEFAULT '2005-09-21 12:41:33',
`start_date` datetime NOT NULL DEFAULT '2005-08-31 00:00:00',
`description` text NOT NULL,
`orientation` enum('so_newbie_training','so_story_telling','so_mistery','so_hack_slash','so_guild_training','so_other') NOT NULL DEFAULT 'so_other',
`level` enum('sl_a','sl_b','sl_c','sl_d','sl_e','sl_f') NOT NULL DEFAULT 'sl_a',
`rule_type` enum('rt_strict','rt_liberal') NOT NULL DEFAULT 'rt_strict',
`access_type` enum('at_public','at_private') NOT NULL DEFAULT 'at_private',
`state` enum('ss_planned','ss_open','ss_locked','ss_closed') NOT NULL DEFAULT 'ss_planned',
`host_shard_id` int(11) NOT NULL DEFAULT '0',
`subscription_slots` int(11) unsigned NOT NULL DEFAULT '0',
`reserved_slots` int(10) unsigned NOT NULL DEFAULT '0',
`free_slots` int(10) unsigned NOT NULL DEFAULT '0',
`estimated_duration` enum('et_short','et_medium','et_long') NOT NULL DEFAULT 'et_short',
`final_duration` int(10) unsigned NOT NULL DEFAULT '0',
`folder_id` int(10) unsigned NOT NULL DEFAULT '0',
`lang` varchar(20) NOT NULL DEFAULT '',
`icone` varchar(70) NOT NULL DEFAULT '',
`anim_mode` enum('am_dm','am_autonomous') NOT NULL DEFAULT 'am_dm',
`race_filter` set('rf_fyros','rf_matis','rf_tryker','rf_zorai') NOT NULL DEFAULT '',
`religion_filter` set('rf_kami','rf_karavan','rf_neutral') NOT NULL DEFAULT '',
`guild_filter` enum('gf_only_my_guild','gf_any_player') DEFAULT 'gf_only_my_guild',
`shard_filter` set('sf_shard00','sf_shard01','sf_shard02','sf_shard03','sf_shard04','sf_shard05','sf_shard06','sf_shard07','sf_shard08','sf_shard09','sf_shard10','sf_shard11','sf_shard12','sf_shard13','sf_shard14','sf_shard15','sf_shard16','sf_shard17','sf_shard18','sf_shard19','sf_shard20','sf_shard21','sf_shard22','sf_shard23','sf_shard24','sf_shard25','sf_shard26','sf_shard27','sf_shard28','sf_shard29','sf_shard30','sf_shard31') NOT NULL DEFAULT 'sf_shard00,sf_shard01,sf_shard02,sf_shard03,sf_shard04,sf_shard05,sf_shard06,sf_shard07,sf_shard08,sf_shard09,sf_shard10,sf_shard11,sf_shard12,sf_shard13,sf_shard14,sf_shard15,sf_shard16,sf_shard17,sf_shard18,sf_shard19,sf_shard20,sf_shard21,sf_shard22,sf_shard23,sf_shard24,sf_shard25,sf_shard26,sf_shard27,sf_shard28,sf_shard29,sf_shard30,sf_shard31',
`level_filter` set('lf_a','lf_b','lf_c','lf_d','lf_e','lf_f') NOT NULL DEFAULT 'lf_a,lf_b,lf_c,lf_d,lf_e,lf_f',
`subscription_closed` tinyint(1) NOT NULL DEFAULT '0',
`newcomer` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
PRIMARY KEY (`session_id`),
KEY `owner_idx` (`owner`),
KEY `folder_idx` (`folder_id`),
KEY `state_type_idx` (`state`,`session_type`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.session_log
CREATE TABLE IF NOT EXISTS `session_log` (
`id` int(11) NOT NULL DEFAULT '0',
`scenario_id` int(11) unsigned NOT NULL DEFAULT '0',
`rrp_scored` int(11) unsigned NOT NULL DEFAULT '0',
`scenario_point_scored` int(11) unsigned NOT NULL DEFAULT '0',
`time_taken` int(11) unsigned NOT NULL DEFAULT '0',
`participants` text NOT NULL,
`launch_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`owner` varchar(32) NOT NULL DEFAULT '0',
`guild_name` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
# Data exporting was unselected.
# Dumping structure for table ring_open.session_participant
CREATE TABLE IF NOT EXISTS `session_participant` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`session_id` int(10) unsigned NOT NULL DEFAULT '0',
`char_id` int(10) unsigned NOT NULL DEFAULT '0',
`status` enum('sps_play_subscribed','sps_play_invited','sps_edit_invited','sps_anim_invited','sps_playing','sps_editing','sps_animating') NOT NULL DEFAULT 'sps_play_subscribed',
`kicked` tinyint(1) unsigned NOT NULL DEFAULT '0',
`session_rated` tinyint(1) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`Id`),
KEY `session_idx` (`session_id`),
KEY `user_idx` (`char_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED;
# Data exporting was unselected.
# Dumping structure for table ring_open.shard
CREATE TABLE IF NOT EXISTS `shard` (
`shard_id` int(10) NOT NULL DEFAULT '0',
`WSOnline` tinyint(1) NOT NULL DEFAULT '0',
`MOTD` text NOT NULL,
`OldState` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_restricted',
`RequiredState` enum('ds_close','ds_dev','ds_restricted','ds_open') NOT NULL DEFAULT 'ds_dev',
PRIMARY KEY (`shard_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED;
# Data exporting was unselected.
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

0
code/ryzom/tools/server/admin/docs/shard_restart/Filelist.xml → code/web/docs/admin/shard_restart/Filelist.xml
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/H38.css → code/web/docs/admin/shard_restart/H38.css
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/H70_2.htm → code/web/docs/admin/shard_restart/H70_2.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm → code/web/docs/admin/shard_restart/HOWTO_Restarting_Ryzom_Game_Shards.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hd36.xml → code/web/docs/admin/shard_restart/Hd36.xml
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hf69.htm → code/web/docs/admin/shard_restart/Hf69.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg39_1.gif → code/web/docs/admin/shard_restart/Hg39_1.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg39_1.htm → code/web/docs/admin/shard_restart/Hg39_1.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg41_2.gif → code/web/docs/admin/shard_restart/Hg41_2.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg41_2.htm → code/web/docs/admin/shard_restart/Hg41_2.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg43_3.gif → code/web/docs/admin/shard_restart/Hg43_3.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 151 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg43_3.htm → code/web/docs/admin/shard_restart/Hg43_3.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg45_4.gif → code/web/docs/admin/shard_restart/Hg45_4.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg45_4.htm → code/web/docs/admin/shard_restart/Hg45_4.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg47_5.gif → code/web/docs/admin/shard_restart/Hg47_5.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg47_5.htm → code/web/docs/admin/shard_restart/Hg47_5.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg49_6.gif → code/web/docs/admin/shard_restart/Hg49_6.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg49_6.htm → code/web/docs/admin/shard_restart/Hg49_6.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg51_7.gif → code/web/docs/admin/shard_restart/Hg51_7.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg51_7.htm → code/web/docs/admin/shard_restart/Hg51_7.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg53_8.gif → code/web/docs/admin/shard_restart/Hg53_8.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 166 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg53_8.htm → code/web/docs/admin/shard_restart/Hg53_8.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg55_9.gif → code/web/docs/admin/shard_restart/Hg55_9.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 165 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg55_9.htm → code/web/docs/admin/shard_restart/Hg55_9.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg57_10.gif → code/web/docs/admin/shard_restart/Hg57_10.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 165 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg57_10.htm → code/web/docs/admin/shard_restart/Hg57_10.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg59_11.gif → code/web/docs/admin/shard_restart/Hg59_11.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg59_11.htm → code/web/docs/admin/shard_restart/Hg59_11.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg61_12.gif → code/web/docs/admin/shard_restart/Hg61_12.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 146 KiB

0
code/ryzom/tools/server/admin/docs/shard_restart/Hg61_12.htm → code/web/docs/admin/shard_restart/Hg61_12.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hn68.htm → code/web/docs/admin/shard_restart/Hn68.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hu37.js → code/web/docs/admin/shard_restart/Hu37.js
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/Hz63.htm → code/web/docs/admin/shard_restart/Hz63.htm
View file

0
code/ryzom/tools/server/admin/docs/shard_restart/lt_off.gif → code/web/docs/admin/shard_restart/lt_off.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 900 B

0
code/ryzom/tools/server/admin/docs/shard_restart/lt_over.gif → code/web/docs/admin/shard_restart/lt_over.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 912 B

0
code/ryzom/tools/server/admin/docs/shard_restart/rt_off.gif → code/web/docs/admin/shard_restart/rt_off.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 900 B

0
code/ryzom/tools/server/admin/docs/shard_restart/rt_over.gif → code/web/docs/admin/shard_restart/rt_over.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 916 B

After

Width:  |  Height:  |  Size: 916 B

0
code/ryzom/tools/server/ryzom_ams_docs/doxygen/Doxyfile → code/web/docs/ams/doxygen/Doxyfile
View file

0
code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/db.png → code/web/docs/ams/doxygen/img/db.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 201 KiB

After

Width:  |  Height:  |  Size: 201 KiB

0
code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/info.jpg → code/web/docs/ams/doxygen/img/info.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 454 KiB

After

Width:  |  Height:  |  Size: 454 KiB

0
code/ryzom/tools/server/ryzom_ams_docs/doxygen/img/info.psd → code/web/docs/ams/doxygen/img/info.psd Executable file → Normal file
View file

Some files were not shown because too many files have changed in this diff Show more