diff --git a/.hgeol b/.hgeol
index c7a59fec5..a9766f577 100644
--- a/.hgeol
+++ b/.hgeol
@@ -14,6 +14,8 @@
**.font = native
**.scheme = native
+**.tpl = native
+
**.xsd = native
**.dox = native
diff --git a/.hgtags b/.hgtags
index f42a47583..315e68df2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1,3 +1,4 @@
+950d650ca92e6041611258d7e5131ccf661e4ec2 compatibility-merge
4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore/v0.8.0
00d9b6e29e95f56785fbf85abe60afd34674f402 ryzomcore/v0.9.0
79776c337176dd5b02e1a74fe5dfb703b91747aa ryzomcore/v0.9.1
@@ -5,3 +6,4 @@ fedf2aa443d09707beed814b0f499c6a5519cc84 ryzomcore/v0.10.0
edaa3624a56420b02ccc64c26059801a389927ee ryzomcore/v0.11.0
e3fe4855f22c3e75722e015dc33c091c340b3ad7 ryzomcore/v0.11.1
9e583b717fd63be0be9fd60b99087abf1691ea49 ryzomcore/v0.11.2
+bfe5628e14a024ba7ea32e4b326ae433a07856b9 ryzomcore/v0.11.3
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index dcc9f9c93..7a4f0b4c5 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -2,7 +2,7 @@
#
# Ryzom Core
# Authors: Nevrax and the Ryzom Core Community
-# Version: 0.11.2
+# Version: 0.11.3
#
# Notes:
# * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path
@@ -48,7 +48,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(RyzomCore CXX C)
SET(NL_VERSION_MAJOR 0)
SET(NL_VERSION_MINOR 11)
-SET(NL_VERSION_PATCH 2)
+SET(NL_VERSION_PATCH 3)
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
#-----------------------------------------------------------------------------
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
index d01762618..31a258fb9 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
@@ -54,13 +54,13 @@ FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,129,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,129,42,50,14
- CONTROL "All",IDC_ALLCHANNEL,"Button",BS_AUTOCHECKBOX |
+ CONTROL "All",IDC_ALLCHANNEL,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,7,23,10
CONTROL "Channel Position",IDC_CHANNELPOS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,23,69,10
CONTROL "Channel Rotation",IDC_CHANNELROT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,34,71,10
- CONTROL "Channel Scale",IDC_CHANNELSCA,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Channel Scale",IDC_CHANNELSCA,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,46,62,10
END
@@ -91,11 +91,11 @@ BEGIN
10
CONTROL "64x",IDC_RADIOSS4,"Button",BS_AUTORADIOBUTTON,15,146,27,
10
- CONTROL "Shadow",IDC_SHADOW,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Shadow",IDC_SHADOW,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,81,18,42,10
CONTROL "Exclude non selected nodes from lighting",IDC_EXCLUDE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,145,10
- CONTROL "Show Lumel",IDC_SHOWLUMEL,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Show Lumel",IDC_SHOWLUMEL,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,91,100,55,10
CONTROL "Export bg color",IDC_EXPORT_BG_COLOR,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,91,115,63,10
@@ -131,28 +131,28 @@ BEGIN
GROUPBOX "LOD Root Properties",IDC_STATIC,5,5,172,95
LTEXT "List of lod mesh (ungrowing order):",IDC_STATIC,15,15,
108,10,SS_CENTERIMAGE
- LISTBOX IDC_LIST1,15,25,111,70,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+ LISTBOX IDC_LIST1,15,25,111,70,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_TABSTOP
PUSHBUTTON "Add..",IDC_ADD,131,25,40,14
PUSHBUTTON "Remove",IDC_REMOVE,131,39,40,14
PUSHBUTTON "Up",IDC_UP,131,54,40,14
PUSHBUTTON "Down",IDC_DOWN,131,68,40,14
GROUPBOX "LOD Properties",IDC_STATIC,5,105,172,50
- CONTROL "Blend in",IDC_BLEND_IN,"Button",BS_AUTO3STATE |
+ CONTROL "Blend in",IDC_BLEND_IN,"Button",BS_AUTO3STATE |
WS_TABSTOP,15,121,40,10
- CONTROL "Blend out",IDC_BLEND_OUT,"Button",BS_AUTO3STATE |
+ CONTROL "Blend out",IDC_BLEND_OUT,"Button",BS_AUTO3STATE |
WS_TABSTOP,15,130,45,10
- CONTROL "Coarse mesh",IDC_COARSE_MESH,"Button",BS_AUTO3STATE |
+ CONTROL "Coarse mesh",IDC_COARSE_MESH,"Button",BS_AUTO3STATE |
WS_TABSTOP,15,140,55,10
- CONTROL "Dynamic mesh",IDC_DYNAMIC_MESH,"Button",BS_AUTO3STATE |
+ CONTROL "Dynamic mesh",IDC_DYNAMIC_MESH,"Button",BS_AUTO3STATE |
WS_TABSTOP,80,120,60,10
LTEXT "Dist Max:",IDC_STATIC,5,160,45,13,SS_CENTERIMAGE
EDITTEXT IDC_DIST_MAX,51,160,45,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Blend length:",IDC_STATIC,80,135,45,13,SS_CENTERIMAGE
- EDITTEXT IDC_BLEND_LENGTH,125,135,45,12,ES_AUTOHSCROLL |
+ EDITTEXT IDC_BLEND_LENGTH,125,135,45,12,ES_AUTOHSCROLL |
ES_NUMBER
GROUPBOX "MRM properties",IDC_STATIC,185,5,172,95
- CONTROL "Active MRM",IDC_ACTIVE_MRM,"Button",BS_AUTO3STATE |
+ CONTROL "Active MRM",IDC_ACTIVE_MRM,"Button",BS_AUTO3STATE |
WS_TABSTOP,195,20,60,10
LTEXT "Skin reduction",IDC_STATIC,195,35,50,10,SS_CENTERIMAGE
CONTROL "Min",IDC_SKIN_REDUCTION_MIN,"Button",BS_AUTORADIOBUTTON,
@@ -170,12 +170,12 @@ BEGIN
LTEXT "Dist middle:",IDC_STATIC,260,65,45,13,SS_CENTERIMAGE
EDITTEXT IDC_DIST_MIDDLE,305,65,45,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Dist coarsest:",IDC_STATIC,260,80,45,13,SS_CENTERIMAGE
- EDITTEXT IDC_DIST_COARSEST,305,80,45,12,ES_AUTOHSCROLL |
+ EDITTEXT IDC_DIST_COARSEST,305,80,45,12,ES_AUTOHSCROLL |
ES_NUMBER
GROUPBOX "LOD Bones",IDC_STATIC,185,105,170,45
LTEXT "Disable Distance (0 means always activated) :",
IDC_STATIC,190,120,160,10
- EDITTEXT IDC_BONE_LOD_DISTANCE,190,130,45,12,ES_AUTOHSCROLL |
+ EDITTEXT IDC_BONE_LOD_DISTANCE,190,130,45,12,ES_AUTOHSCROLL |
ES_NUMBER
CONTROL "Export as Lod character (.clod)",IDC_EXPORT_CLOD,"Button",
BS_AUTO3STATE | WS_TABSTOP,190,160,150,10
@@ -197,21 +197,21 @@ BEGIN
BS_AUTO3STATE | WS_TABSTOP,27,92,71,10
CONTROL "Dynamic Portal",IDC_DYNAMIC_PORTAL,"Button",
BS_AUTO3STATE | WS_TABSTOP,27,44,63,10
- CONTROL "Clusterize",IDC_CLUSTERIZE,"Button",BS_AUTO3STATE |
+ CONTROL "Clusterize",IDC_CLUSTERIZE,"Button",BS_AUTO3STATE |
WS_TABSTOP,93,5,46,10
- COMBOBOX IDC_OCC_MODEL,209,30,123,134,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_OCC_MODEL,209,30,123,134,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
RTEXT "Occlusion model",IDC_STATIC,134,30,68,12,SS_CENTERIMAGE
- COMBOBOX IDC_OPEN_OCC_MODEL,209,44,123,116,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_OPEN_OCC_MODEL,209,44,123,116,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
RTEXT "Open portal occlusion model",IDC_STATIC,112,44,89,10,
SS_CENTERIMAGE
GROUPBOX "Audio properties",IDC_STATIC,105,19,237,141
RTEXT "Sound group",IDC_STATIC,111,86,90,14
- COMBOBOX IDC_ENV_FX,209,106,123,87,CBS_DROPDOWNLIST | WS_VSCROLL |
+ COMBOBOX IDC_ENV_FX,209,106,123,87,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
RTEXT "Environment FX",IDC_STATIC,112,106,89,10,SS_CENTERIMAGE
- COMBOBOX IDC_SOUND_GROUP,209,86,123,101,CBS_DROPDOWN | CBS_SORT |
+ COMBOBOX IDC_SOUND_GROUP,209,86,123,101,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
CONTROL "Father audible",IDC_FATHER_AUDIBLE,"Button",
BS_AUTO3STATE | WS_TABSTOP,210,135,61,10
@@ -240,17 +240,17 @@ BEGIN
GROUPBOX "Properties for objects without lightmaps",IDC_STATIC,5,
80,150,60
CONTROL "If checked, use per vertex lighting attenuation else use global lighting attenuation for the object. Doesn't work with per pixel lighting shader.",
- IDC_USE_LIGHT_LOCAL_ATTENUATION,"Button",BS_AUTO3STATE |
+ IDC_USE_LIGHT_LOCAL_ATTENUATION,"Button",BS_AUTO3STATE |
BS_TOP | BS_MULTILINE | WS_TABSTOP,15,95,120,41
GROUPBOX "Properties for lights",IDC_STATIC,160,5,185,200
CONTROL "RealTime Light. If set, this light will light scene objects.",
- IDC_EXPORT_REALTIME_LIGHT,"Button",BS_AUTO3STATE |
+ IDC_EXPORT_REALTIME_LIGHT,"Button",BS_AUTO3STATE |
BS_TOP | BS_MULTILINE | WS_TABSTOP,170,15,165,20
CONTROL "RealTime Sun Light. If set, this DIRECTIONNAL light will be used as sun light to light scene objects.",
- IDC_EXPORT_AS_SUN_LIGHT,"Button",BS_AUTO3STATE | BS_TOP |
+ IDC_EXPORT_AS_SUN_LIGHT,"Button",BS_AUTO3STATE | BS_TOP |
BS_MULTILINE | WS_TABSTOP,170,34,170,25
CONTROL "LightMap Light. If set, this light will be used to compute the lightmaps of the project objects.",
- IDC_EXPORT_LIGHTMAP_LIGHT,"Button",BS_AUTO3STATE |
+ IDC_EXPORT_LIGHTMAP_LIGHT,"Button",BS_AUTO3STATE |
BS_TOP | BS_MULTILINE | WS_TABSTOP,170,60,170,20
LTEXT "LightMap Animation Name. This is the name of the animation used to flick the light color.",
IDC_STATIC,170,135,170,20
@@ -284,7 +284,7 @@ BEGIN
CONTROL "Floating Object",IDC_FLOATING_OBJECT,"Button",
BS_AUTO3STATE | WS_TABSTOP,5,5,65,12
GROUPBOX "Ligoscape",IDC_STATIC,5,100,120,45
- CONTROL "Symmetry",IDC_LIGO_SYMMETRY,"Button",BS_AUTO3STATE |
+ CONTROL "Symmetry",IDC_LIGO_SYMMETRY,"Button",BS_AUTO3STATE |
WS_TABSTOP,11,110,44,12
LTEXT "Rotation:",IDC_STATIC,11,125,30,13,SS_CENTERIMAGE
EDITTEXT IDC_LIGO_ROTATE,60,126,57,14,ES_AUTOHSCROLL
@@ -313,7 +313,7 @@ BEGIN
EDITTEXT IDC_EDIT_INTERFACE_THRESHOLD,221,137,110,14,
ES_AUTOHSCROLL
GROUPBOX "Bone Scale",IDC_STATIC,5,150,120,60
- CONTROL "Enable",IDC_EXPORT_BONE_SCALE,"Button",BS_AUTO3STATE |
+ CONTROL "Enable",IDC_EXPORT_BONE_SCALE,"Button",BS_AUTO3STATE |
WS_TABSTOP,10,160,38,10
LTEXT "Bone Reference Name extension:",IDC_STATIC,10,175,110,
13,SS_CENTERIMAGE
@@ -332,7 +332,7 @@ BEGIN
EDITTEXT IDC_REMANENCE_SAMPLING_PERIOD,266,190,20,14,
ES_AUTOHSCROLL
CONTROL "Shift texture at start of animation",
- IDC_REMANENCE_SHIFTING_TEXTURE,"Button",BS_AUTOCHECKBOX |
+ IDC_REMANENCE_SHIFTING_TEXTURE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,207,178,116,9
LTEXT "Rollup ratio :",IDC_ROLLUP_RATIO,290,192,41,8
EDITTEXT IDC_REMANENCE_ROLLUP_RATIO,332,190,16,14,ES_AUTOHSCROLL
@@ -342,10 +342,10 @@ IDD_VEGETABLE DIALOG DISCARDABLE 0, 0, 360, 200
STYLE WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
- CONTROL "Vegetable",IDC_VEGETABLE,"Button",BS_AUTO3STATE |
+ CONTROL "Vegetable",IDC_VEGETABLE,"Button",BS_AUTO3STATE |
WS_TABSTOP,5,5,50,12
CONTROL "Alpha Blend ON (double sided)",
- IDC_VEGETABLE_ALPHA_BLEND_ON,"Button",BS_AUTORADIOBUTTON |
+ IDC_VEGETABLE_ALPHA_BLEND_ON,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,21,30,112,15
CONTROL "Alpha Blend OFF",IDC_VEGETABLE_ALPHA_BLEND_OFF,"Button",
BS_AUTORADIOBUTTON,20,74,85,15
@@ -394,7 +394,7 @@ BEGIN
LTEXT "Name of the instance group where this instance will be inserted. Enter ... to erase all",
IDC_STATIC,195,45,160,15
CONTROL "Don't add to scene. If checked, this instance will not be added in the scene.",
- IDC_DONT_ADD_TO_SCENE,"Button",BS_AUTO3STATE |
+ IDC_DONT_ADD_TO_SCENE,"Button",BS_AUTO3STATE |
WS_TABSTOP,5,71,255,10
CONTROL "Don't export the shape. If checked, no shape file will be exported from this object.",
IDC_DONT_EXPORT,"Button",BS_AUTO3STATE | WS_TABSTOP,5,86,
@@ -427,15 +427,15 @@ BEGIN
CONTROL "Export note track",IDC_EXPORT_NOTE_TRACK,"Button",
BS_AUTO3STATE | WS_TABSTOP,5,50,75,10
CONTROL "Export animated materials",
- IDC_EXPORT_ANIMATED_MATERIALS,"Button",BS_AUTO3STATE |
+ IDC_EXPORT_ANIMATED_MATERIALS,"Button",BS_AUTO3STATE |
WS_TABSTOP,5,35,98,10
CONTROL "Export node animation",IDC_EXPORT_NODE_ANIMATION,"Button",
BS_AUTO3STATE | WS_TABSTOP,5,5,98,10
CONTROL "Prefixe tracks with node name (Instance name or, if emtpy, node name)",
- IDC_EXPORT_ANIMATION_PREFIXE_NAME,"Button",BS_AUTO3STATE |
+ IDC_EXPORT_ANIMATION_PREFIXE_NAME,"Button",BS_AUTO3STATE |
BS_MULTILINE | WS_TABSTOP,5,20,245,10
CONTROL "Allow automatic animation. If the shape is ""obj.shape"", then it will bind ""obj.anim"" automatically.",
- IDC_AUTOMATIC_ANIM,"Button",BS_AUTO3STATE | BS_MULTILINE |
+ IDC_AUTOMATIC_ANIM,"Button",BS_AUTO3STATE | BS_MULTILINE |
WS_TABSTOP,5,65,315,10
CONTROL "Export SSS track (Skeleton Spawn Script)",
IDC_EXPORT_SSS_TRACK,"Button",BS_AUTO3STATE | WS_TABSTOP,
@@ -449,7 +449,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_PANEL, DIALOG
BEGIN
@@ -548,18 +548,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
@@ -575,8 +575,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -593,14 +593,14 @@ BEGIN
BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core\0"
- VALUE "FileVersion", "0.11.0\0"
+ VALUE "FileVersion", "0.11.3\0"
VALUE "InternalName", "CNelExport\0"
VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "CNelExport.dlu\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Ryzom Core\0"
- VALUE "ProductVersion", "0.11.0\0"
+ VALUE "ProductVersion", "0.11.3\0"
VALUE "SpecialBuild", "\0"
END
END
@@ -618,7 +618,7 @@ END
// String Table
//
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_LIBDESCRIPTION "Geometry Export/View"
IDS_CATEGORY "Nel Tools"
@@ -673,9 +673,9 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,10,5,105,10
LTEXT "Frequency Scale :",IDC_STATIC,120,5,60,10
LTEXT "Distance Scale :",IDC_STATIC,245,5,60,10
- EDITTEXT IDC_EDIT_VPWT_FREQ_SCALE,190,5,35,12,ES_MULTILINE |
+ EDITTEXT IDC_EDIT_VPWT_FREQ_SCALE,190,5,35,12,ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
- EDITTEXT IDC_EDIT_VPWT_DIST_SCALE,305,5,35,12,ES_MULTILINE |
+ EDITTEXT IDC_EDIT_VPWT_DIST_SCALE,305,5,35,12,ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
GROUPBOX "Level 0 (eg: Tree Trunk)",IDC_STATIC,0,20,355,50
GROUPBOX "Level 1 (eg: branch)",IDC_STATIC,0,75,355,55
@@ -790,7 +790,7 @@ FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,160,240,50,14
PUSHBUTTON "Cancel",IDCANCEL,160,265,50,14
- LISTBOX IDC_LMC_COPY_LIST,5,20,120,260,LBS_SORT |
+ LISTBOX IDC_LMC_COPY_LIST,5,20,120,260,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
LTEXT "List of objects in LMC mode.",IDC_STATIC,5,10,120,10
CONTROL "Custom1",IDC_LMC_COPY_ALWAYS_DIFFUSE,"ColorSwatch",
@@ -829,7 +829,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_NODE_PROPERTIES_PANEL, DIALOG
BEGIN
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
index b6eea41a6..068bddea0 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc
@@ -40,7 +40,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_PANEL, DIALOG
BEGIN
@@ -59,18 +59,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -85,8 +85,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -103,12 +103,12 @@ BEGIN
BEGIN
VALUE "Comments", "http://www.ryzomcore.org/"
VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
- VALUE "FileVersion", "0.11.0"
+ VALUE "FileVersion", "0.11.3"
VALUE "InternalName", "PatchMesh to RykolPatchMesh"
VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
VALUE "OriginalFilename", "nel_convert_patch.dlm"
VALUE "ProductName", "NeL Patch Converter"
- VALUE "ProductVersion", "0.11.0"
+ VALUE "ProductVersion", "0.11.3"
END
END
BLOCK "VarFileInfo"
@@ -123,7 +123,7 @@ END
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_LIBDESCRIPTION "Rykol Patchmesh Converter"
IDS_CATEGORY "Rykol Tools"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
index 6de328356..d49d40a82 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc
@@ -345,12 +345,12 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"modsres.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n"
@@ -359,7 +359,7 @@ BEGIN
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -439,7 +439,7 @@ IDB_PATCHSELMASK BITMAP "patselm.bmp"
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_PASTE_NAMEDSET, DIALOG
BEGIN
@@ -514,8 +514,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 2, 0
- PRODUCTVERSION 0, 11, 2, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -533,13 +533,13 @@ BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core"
VALUE "FileDescription", "NeL Patch Edit"
- VALUE "FileVersion", "0.11.2"
+ VALUE "FileVersion", "0.11.3"
VALUE "InternalName", "neleditpatch"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc."
VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX. The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF."
VALUE "OriginalFilename", "neleditpatch.dlm"
VALUE "ProductName", "Ryzom Core"
- VALUE "ProductVersion", "0.11.2"
+ VALUE "ProductVersion", "0.11.3"
END
END
BLOCK "VarFileInfo"
@@ -565,7 +565,7 @@ IDI_ICON3 ICON "icon3.ico"
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_NORMALMOD "NormalMod"
IDS_RB_SKEWMOD "SkewMod"
@@ -585,7 +585,7 @@ BEGIN
IDS_RB_VOLSELECT_CLASS "Vol. Select"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_EDITMESH_CLASS "Edit Mesh"
IDS_RB_PARAMETERS "Parameters"
@@ -594,7 +594,7 @@ BEGIN
IDS_RB_AMOUNT "Amount"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_BEND2 "Bend"
IDS_RB_FROM "Lower Limit"
@@ -614,7 +614,7 @@ BEGIN
IDS_RB_DISPLACEMOD "DisplaceMod"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_NODEXFORM "Linked XForm"
IDS_RB_NODEXFORM_CLASS "Linked XForm"
@@ -630,7 +630,7 @@ BEGIN
IDS_RB_SOT "Supports Objects of Type"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_BIASL2 "Bias L2"
IDS_RB_EDITMESHMOD "EditMeshMod"
@@ -650,7 +650,7 @@ BEGIN
IDS_RB_SMOOTHMOD "SmoothMod"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_EXTRUDE "Extrude"
IDS_RB_TAPER "Taper"
@@ -663,7 +663,7 @@ BEGIN
IDS_RB_APPARATUS "Gizmo"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_FREQUENCY "Frequency"
IDS_RB_MAPMOD "MapMod"
@@ -683,7 +683,7 @@ BEGIN
IDS_RB_BIASL1 "Bias L1"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_AMOUNT2 "Amount"
IDS_RB_CURVITURE "Curvature"
@@ -697,13 +697,13 @@ BEGIN
IDS_DB_EXTRUDE "Extrude"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_RIPPLE "Ripple"
IDS_RB_RIPPLE_BINDING "Ripple Binding"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_DELETEVERT "Delete Vertex"
IDS_RB_DELETEFACE "Delete Face"
@@ -720,7 +720,7 @@ BEGIN
IDS_RB_EDGEDIVIDE "Edge Divide"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_EDGETURN "Edge Turn"
IDS_RB_DELETEEDGE "Delete Edge"
@@ -732,36 +732,36 @@ BEGIN
IDS_PW_LATTICE "Lattice Map"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_DEFDEFORMATIONS "MAX STANDARD"
IDS_RB_DEFEDIT "MAX EDIT"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_DEFLECTOR_CLASS "Deflector"
IDS_RB_HIDEVERT "Hide Vertices"
IDS_RB_DEFSURFACE "MAX SURFACE"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_NOISE "Noise"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_ROTATION2 "Rotation"
IDS_RB_TWIST "Twist"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_BENDMOD "BendMod"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_DISPLACEBINDING "Displace Binding"
IDS_RB_SELECTDISPIMAGE "Select Displacement Image"
@@ -781,7 +781,7 @@ BEGIN
IDS_RB_TURBULENCE "Turbulence"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_SKEW_CLASS "Skew"
IDS_RB_MATERIAL3_CLASS "Material"
@@ -800,7 +800,7 @@ BEGIN
IDS_RB_WAVE_CLASS "Wave"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_STRENGTH2 "Strength"
IDS_DS_MOVE "Move"
@@ -809,7 +809,7 @@ BEGIN
IDS_RB_ELEMENTSEL "Element"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_NOVERTSTOWELD "No vertices within weld threshold."
IDS_RB_CHAOS "Chaos"
@@ -819,24 +819,24 @@ BEGIN
IDS_RB_DUPFACEWARNING "This face already exists."
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_NONE "None"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_SCALE "Scale"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_DS_MOVE2 "Move"
IDS_DS_SELECT "Select"
IDS_DS_CREATE "Create"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_VERTDELETE "Delete Vertex"
IDS_TH_BEZIERCORNER "Bezier Corner"
@@ -848,7 +848,7 @@ BEGIN
IDS_TH_NOPATCHESSEL "No patches selected"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_EDGESUBDIVIDE "Edge Subdivide"
IDS_TH_PATCHSUBDIVIDE "Patch Subdivide"
@@ -863,16 +863,16 @@ BEGIN
IDS_TH_CONNECT_COINCIDENT "Weld coincident endpoints?"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_BOOLWELDFAILED "ERROR: Final boolean weld stage failed"
IDS_TH_COINCIDENTVERTEX "Cannot perform boolean because splines have coincident vertices"
- IDS_TH_SPLINESMUSTOVERLAP
+ IDS_TH_SPLINESMUSTOVERLAP
"Cannot perform boolean because splines must overlap"
IDS_TH_SELECTCLOSEDSPLINE "Please select a closed spline"
IDS_TH_SPLINESELFINTERSECTS "Spline is invalid: Self-intersects"
IDS_TH_ATTACH "Attach"
- IDS_TH_CANHAVEONLYONESHAPE
+ IDS_TH_CANHAVEONLYONESHAPE
"Can only have one shape in modifier for this operation"
IDS_TH_NOVERTSSEL "No vertices selected"
IDS_TH_VERTCHANGE "Vertex Change"
@@ -885,7 +885,7 @@ BEGIN
IDS_TH_LINE "Line"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_MAKEFIRST "Make First"
IDS_TH_EDITEDGE "Edit Edge"
@@ -896,7 +896,7 @@ BEGIN
IDS_TH_PATCHADD "Patch Add"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_EDITSPLINE "Edit Spline"
IDS_TH_EDITSEGMENT "Edit Segment"
@@ -907,7 +907,7 @@ BEGIN
IDS_TH_EDITOBJECT "Edit Object"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_DETACHSPLINE "Detach Spline"
IDS_TH_OUTLINE "Outline Spline"
@@ -927,9 +927,9 @@ BEGIN
IDS_TH_INTERSECTION "Intersection"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
- IDS_TH_CANHAVEONLYONEPATCH
+ IDS_TH_CANHAVEONLYONEPATCH
"Can only have one patch object in modifier for this operation"
IDS_TH_DETACHPATCH "Detach Patch"
IDS_TH_COPY_SPLINE "Copy Spline"
@@ -937,7 +937,7 @@ BEGIN
IDS_TH_SPLINECHANGE "Spline Change"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_EDITPATCH_CLASS "NeL Edit"
IDS_TH_EDITSPLINE_CLASS "Edit Spline"
@@ -957,7 +957,7 @@ BEGIN
IDS_TH_NOSEGSSEL "No segments selected"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_DEGREES "Degrees"
IDS_TH_AXIS "Axis"
@@ -968,12 +968,12 @@ BEGIN
IDS_RB_STARTPOINT "Start Point"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_MIRRORSPLINE "Mirror Spline"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_ENDPOINT "End Point"
IDS_RB_AFRPOINTS "Points"
@@ -993,7 +993,7 @@ BEGIN
IDS_RB_VOFFSET "V Offset"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_WOFFSET "W Offset"
IDS_RB_MAXEDGE1 "Max Edge Length 1"
@@ -1013,14 +1013,14 @@ BEGIN
IDS_RB_SHOULDRESET "Do you also want to reset the Unwrap UVW modifier\nto inherit the mapping from the new channel?\n\nChanges made within the UVW modifier will be lost."
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_NUMVERTSELP "%d Vertices Selected"
IDS_RB_NUMFACESELP "%d Faces Selected"
IDS_RB_NUMEDGESELP "%d Edges Selected"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_RESETUNWRAPUVWS "Are you sure you want to reset?\n\nAll changes made within the Unwrap UVW modifier will be lost."
IDS_RB_LENGTH "Length"
@@ -1040,7 +1040,7 @@ BEGIN
IDS_RB_ZOOMREG "Zoom Region"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RB_UVW "Coordinates"
IDS_RB_PROP "Unwrap Options"
@@ -1060,10 +1060,10 @@ BEGIN
IDS_EM_SHAPE "Shape"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_ADV_SURF_APPROX_WARNING_TITLE "Surface Approximation Verification"
- IDS_ADV_SURF_APPROX_WARNING
+ IDS_ADV_SURF_APPROX_WARNING
"You have selected a potentially dangerous setting for the SubDivision limits. Are you sure you want to do this?"
IDS_PW_PICK "Pick Texture"
IDS_PW_SNAP "Pixel Snap"
@@ -1079,7 +1079,7 @@ BEGIN
IDS_PW_FALLOFF "Falloff type"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_EM_SELBYCOLOR "Select By Color"
IDS_EM_VERTEXCOLOR "Vertex Color"
@@ -1099,7 +1099,7 @@ BEGIN
IDS_EM_DETACHFACES "Detach Faces"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_EM_DETACHVERTS "Detach Verts"
IDS_EM_INHERIT_MATERIAL "Inherit Material"
@@ -1119,7 +1119,7 @@ BEGIN
IDS_TH_SPLINE_VERT_COUNT "Vertex Count: %d"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_SELECTION "Selection"
IDS_TH_OBJECT_SEL "Whole Object Selected"
@@ -1139,17 +1139,17 @@ BEGIN
IDS_TH_CROSS_INSERT "Cross Insert"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_EM_BEVEL "Bevel"
IDS_EM_OUTLINE "Outline"
- IDS_ADV_DISP_APPROX_WARNING_TITLE
+ IDS_ADV_DISP_APPROX_WARNING_TITLE
"Displacement Approximation Verification"
- IDS_ADV_DISP_APPROX_WARNING
+ IDS_ADV_DISP_APPROX_WARNING
"You have selected a potential dangerous setting for the SubDivision limits. Are you sure you want to do this?"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_PW_FALLOFFSPACE "World Falloff Space"
IDS_PW_BREAK "Break Selected Vertices"
@@ -1169,7 +1169,7 @@ BEGIN
IDS_PW_TEXMAP "TextureMap"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_PW_CHANNEL "Map Channel"
IDS_PW_MAP "Map Channel Type"
@@ -1181,9 +1181,9 @@ BEGIN
IDS_PW_FALLOFF2 "Falloff"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
- IDS_TH_CROSS_NOT_IN_THRESHOLD
+ IDS_TH_CROSS_NOT_IN_THRESHOLD
"Crossing lines not within specified threshold"
IDS_TH_EDGEDELETE "Delete Edge"
IDS_TH_NOEDGESSEL "No edges selected"
@@ -1200,7 +1200,7 @@ BEGIN
IDS_TH_OPEN "Open"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_TH_CLOSED "Closed"
IDS_EM_ATTACH_LIST "Attach List"
@@ -1220,7 +1220,7 @@ BEGIN
IDS_PW_SCALEV "Scale Vertical"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_PW_WELDSELECTED "Weld Selected"
IDS_PW_APPLYPLANAR "Apply Planar"
@@ -1240,7 +1240,7 @@ BEGIN
IDS_PW_UNHIDEALL "Unhide All"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_PW_FREEZE_SELECTED "Freeze Selected"
IDS_PW_UNFREEZEALL "Unfreeze All"
@@ -1249,7 +1249,7 @@ BEGIN
IDS_PW_SCALE_UVW "Scale UVWs"
IDS_PW_WELD_UVW "Weld UVWs"
IDS_PW_LINECOLOR "Line Color"
- IDS_RB_UNSUPPORTED_MAP_TYPE
+ IDS_RB_UNSUPPORTED_MAP_TYPE
"The Displace modifier does not support the mapping type that has been selected to acquire."
IDS_MM_ACQ_MAPPING "Aquire Mapping"
IDS_PARAM_CHANGE "Parameter Change"
@@ -1261,7 +1261,7 @@ BEGIN
IDS_PW_MOUSE_CONSTRAIN "SHIFT constrains the mouse to X/Y"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_PW_MOUSE_SELECTTV "Select texture vertices"
IDS_PW_MOUSE_SELECTTRI "SHIFT selects triangle faces"
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
index 507d36ab5..6b8d7f88e 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc
@@ -34,7 +34,7 @@ STYLE WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Paint",IDC_PAINT,"CustButton",WS_TABSTOP,7,5,38,19
- CONTROL "Meshes",IDC_INCLUDE_MESHES,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Meshes",IDC_INCLUDE_MESHES,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,50,5,45,10
CONTROL "Preload Tiles",IDC_PRELOAD_TILES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,50,15,50,10
@@ -47,12 +47,12 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"modsres.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n"
@@ -61,7 +61,7 @@ BEGIN
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
@@ -76,7 +76,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_EDPATCH_OPS, DIALOG
BEGIN
@@ -96,8 +96,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 1, 0
- PRODUCTVERSION 0, 11, 1, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -116,14 +116,14 @@ BEGIN
VALUE "Comments", "TECH: cyril.corvazier\0"
VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileDescription", "NeL Patch Paint\0"
- VALUE "FileVersion", "0.11.1\0"
+ VALUE "FileVersion", "0.11.3\0"
VALUE "InternalName", "mods\0"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Ryzom Core\0"
- VALUE "ProductVersion", "0.11.1\0"
+ VALUE "ProductVersion", "0.11.3\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
index 4e70d1afc..8620d6170 100644
--- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
+++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc
@@ -72,7 +72,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_PANEL, DIALOG
BEGIN
@@ -90,18 +90,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
@@ -125,8 +125,8 @@ IDC_DROPPER_CURSOR CURSOR DISCARDABLE "dropcurs.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -145,13 +145,13 @@ BEGIN
VALUE "Comments", "TECH: \0"
VALUE "CompanyName", "Ryzom Core\0"
VALUE "FileDescription", "Vertex Tree Paint\0"
- VALUE "FileVersion", "0.11.0\0"
+ VALUE "FileVersion", "0.11.3\0"
VALUE "InternalName", "VertexTreePaint\0"
VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0"
VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX. The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0"
VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
VALUE "ProductName", "Ryzom Core\0"
- VALUE "ProductVersion", "0.11.0\0"
+ VALUE "ProductVersion", "0.11.3\0"
END
END
BLOCK "VarFileInfo"
@@ -179,11 +179,11 @@ IDB_BUTTON_MASK BITMAP DISCARDABLE "buttonmask.bmp"
IDD_PANEL DLGINIT
BEGIN
IDC_COMBO_TYPE, 0x403, 10, 0
-0x6e49, 0x6574, 0x736e, 0x7469, 0x0079,
+0x6e49, 0x6574, 0x736e, 0x7469, 0x0079,
IDC_COMBO_TYPE, 0x403, 14, 0
-0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0031,
+0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0031,
IDC_COMBO_TYPE, 0x403, 14, 0
-0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0032,
+0x6850, 0x7361, 0x2065, 0x654c, 0x6576, 0x206c, 0x0032,
0
END
@@ -193,7 +193,7 @@ END
// String Table
//
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_LIBDESCRIPTION "Vertex tree painting modifier (Kinetix/Nel)"
IDS_CATEGORY "NeL Tools"
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
index 80d1d390d..315747354 100644
--- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
+++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc
@@ -31,7 +31,7 @@ STYLE WS_CHILD | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
PUSHBUTTON "Button1",IDC_BANK_PATH,5,5,95,14
- COMBOBOX IDC_LAND,5,25,95,75,CBS_DROPDOWNLIST | CBS_SORT |
+ COMBOBOX IDC_LAND,5,25,95,75,CBS_DROPDOWNLIST | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Setup material",IDC_SETUP,20,80,70,15,WS_DISABLED
LTEXT "Static",IDC_TILE_COUNT1,10,45,85,8
@@ -56,9 +56,9 @@ BEGIN
CONTROL "",IDC_MAPON2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,
38,8,10
GROUPBOX "Alpha From:",IDC_STATIC,23,66,89,57
- CONTROL "Map #1",IDC_MULT_ALPHA1,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "Map #1",IDC_MULT_ALPHA1,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,36,77,41,10
- CONTROL "Map #2",IDC_MULT_ALPHA2,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "Map #2",IDC_MULT_ALPHA2,"Button",BS_AUTORADIOBUTTON |
WS_TABSTOP,36,91,41,10
CONTROL "Multiply Alphas",IDC_MULT_ALPHA3,"Button",
BS_AUTORADIOBUTTON | WS_TABSTOP,36,106,63,10
@@ -73,7 +73,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_PANEL, DIALOG
BEGIN
@@ -97,18 +97,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
@@ -124,8 +124,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 11, 0, 0
- PRODUCTVERSION 0, 11, 0, 0
+ FILEVERSION 0, 11, 3, 0
+ PRODUCTVERSION 0, 11, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -142,12 +142,12 @@ BEGIN
BEGIN
VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
VALUE "CompanyName", "Ryzom Core\0"
- VALUE "FileVersion", "0.11.0\0"
+ VALUE "FileVersion", "0.11.3\0"
VALUE "InternalName", "Tile_utility\0"
VALUE "LegalCopyright", "\0"
VALUE "OriginalFilename", "Tile_utility.dlu\0"
VALUE "ProductName", "Ryzom Core\0"
- VALUE "ProductVersion", "0.11.0\0"
+ VALUE "ProductVersion", "0.11.3\0"
VALUE "FileDescription", "Create material for tiles\0"
VALUE "Comments", "TECH: \0"
VALUE "LegalTrademarks", "\0"
@@ -167,7 +167,7 @@ END
// String Table
//
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_LIBDESCRIPTION "Create material for tiles"
IDS_CATEGORY "Rykol Tools"
@@ -177,7 +177,7 @@ BEGIN
IDS_COLOR1 "Color 1"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_PHASE "Phase"
IDS_DS_AMBIENT "Ambient Color"
@@ -185,7 +185,7 @@ BEGIN
IDS_DS_SPECULAR "Specular Color"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_WIREFRAME "Wire"
IDS_DS_SHININESS "Glossiness"
@@ -203,7 +203,7 @@ BEGIN
IDS_GRAD_TYPE "Gradient Type"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_JW_MAPENABLES "Map Enables"
IDS_DS_THRESH "Position"
@@ -223,7 +223,7 @@ BEGIN
IDS_DS_ANGLE "Angle"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_COLOR1 "Color 1"
IDS_DS_COLOR2 "Color 2"
@@ -243,7 +243,7 @@ BEGIN
IDS_DS_MIXAMT "Mix Amount"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_SHRINK_ENV "Shrink-wrap Environment"
IDS_DS_SCREEN "Screen"
@@ -263,7 +263,7 @@ BEGIN
IDS_JW_MAPS "Maps"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_JW_MAPAMOUNTS "Map Amounts"
IDS_DS_MATTE_SHADOW_PAR "Matte/Shadow Basic Parameters"
@@ -280,7 +280,7 @@ BEGIN
IDS_JW_SAMPLERBYNAME "Sampler Name"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_NOISEPARMS "Noise Parameters"
IDS_DS_MIXPARMS "Mix Parameters"
@@ -300,7 +300,7 @@ BEGIN
IDS_DS_CYL_ENV "Cylindrical Environment"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_XLABEL "X:"
IDS_DS_YLABEL "Y:"
@@ -311,7 +311,7 @@ BEGIN
IDS_DS_BITMAP_TEXTURE_ERR "Bitmap Texture Error"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_RB_NOISE "Noise"
IDS_RB_MULTISUBOBJECT "Multi/Sub-Object"
@@ -320,7 +320,7 @@ BEGIN
IDS_RB_BACK "Back"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_RB_FACING "Facing"
IDS_RB_MASK "Mask"
@@ -340,7 +340,7 @@ BEGIN
IDS_RB_CENTER2 "Color 2 Position"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_RB_HIGHTHRESHOLD "High Threshold"
IDS_RB_LOWTHRESHOLD "Low Threshold"
@@ -360,12 +360,12 @@ BEGIN
IDS_DS_BOTTOM "Bottom"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_RB_AMOUNT "Amount"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_RB_CURVITURE "Curvature"
IDS_RB_AMPLITUDE "Amplitude"
@@ -374,13 +374,13 @@ BEGIN
IDS_RB_DECAY "Decay"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_RB_LOWTHRESH "Low Threshold"
IDS_RB_HIGHTHRESH "High Threshold"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_MARBLE "Marble"
IDS_DS_MIX "Mix"
@@ -400,7 +400,7 @@ BEGIN
IDS_DS_CHECKER "Checker"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_NONE "None"
IDS_DS_TRANS "Opacity"
@@ -420,12 +420,12 @@ BEGIN
IDS_DS_CLIPV "Clip V Offset"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_PARAMCHG "Param Change"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_CLIPW "Clip U Width"
IDS_DS_CLIPH "Clip V Width"
@@ -445,7 +445,7 @@ BEGIN
IDS_DS_FALLOFF "Falloff"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_FALLOFFPARAMS "Falloff Parameters"
IDS_DS_PERVAL "Perpendicular Value:"
@@ -465,7 +465,7 @@ BEGIN
IDS_DS_PLATE_PARAMS "Thin Wall Refraction Parameters"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_THICKFACT "Thickness Offset"
IDS_DS_REFRAMT "Bump Map Effect"
@@ -485,7 +485,7 @@ BEGIN
IDS_DS_GREEN "Green"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_BLUE "Blue"
IDS_DS_SOFTEN "Soften Level"
@@ -505,7 +505,7 @@ BEGIN
IDS_KE_OREN_NAYAR_BLINN "Oren-Nayar-Blinn"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_KE_DIFF_LEVEL "Diffuse Level"
IDS_KE_DIFF_ROUGH "Diff. Roughness"
@@ -525,7 +525,7 @@ BEGIN
IDS_KE_COLOR "Color"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_KE_ANISOTROPY "Anisotropy"
IDS_KE_ORIENTATION "Orientation"
@@ -545,7 +545,7 @@ BEGIN
IDS_KE_GLOSS1 "Glossiness 1"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_KE_GLOSS2 "Glossiness 2"
IDS_KE_ANISO1 "Anisotropy 1"
@@ -565,7 +565,7 @@ BEGIN
IDS_JW_APPLYREFDIM "Apply Reflection Dimming"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_JW_PIXELSAMPLER "Pixel Sampler"
IDS_JW_SAMPLERQUAL "Sampler Quality"
@@ -585,7 +585,7 @@ BEGIN
IDS_RB_BLENDMAT_CDESC "Blend"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DS_MIX_CDESC "Mix"
IDS_DS_FLATMIRROR_CDESC "Flat Mirror"
@@ -602,7 +602,7 @@ BEGIN
IDS_JW_ADTEXLOCK "Ambient-Diffuse Texture Lock"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_JW_ADLOCK "Ambient-Diffuse Lock"
IDS_JW_DSLOCK "Diffuse-Specular Lock"
@@ -621,7 +621,7 @@ BEGIN
IDS_PW_APPLYATMOS "ApplyAtmosphere"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_PW_ATMOSDEPTH "AtmossphereDepth"
IDS_PW_RECEIVESHADOWS "RecieveShadows"
@@ -641,7 +641,7 @@ BEGIN
IDS_PW_STARTTIME "StartTime"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_PW_PLAYBACK "PlayBackRate"
IDS_PW_ENDCONDITION "EndCondition"
@@ -661,7 +661,7 @@ BEGIN
IDS_PW_APPLYBLUR "ApplyBlur"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_KE_FACETED "Faceted"
IDS_KE_ORIENTATION1 "Orientation 1"
@@ -680,7 +680,7 @@ BEGIN
IDS_PW_MAT "Mat."
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_PW_BASE "Base"
IDS_DS_USEREFL "UseReflMap"
@@ -695,7 +695,7 @@ BEGIN
IDS_ACUBIC_SELECT_INPUT_FILE "Select Input Reflection Map"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
65505 "RGB Level"
65506 "RGB Offset"
diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h
index d9fb89d18..a34715789 100644
--- a/code/ryzom/common/src/game_share/ryzom_version.h
+++ b/code/ryzom/common/src/game_share/ryzom_version.h
@@ -20,7 +20,7 @@
#define RYZOM_COMPATIBILITY_VERSION "2.1.0"
#define RYZOM_VERSION RYZOM_COMPATIBILITY_VERSION" (ryzom" \
"/" \
- "v0.11.2" \
+ "v0.11.3" \
")"
#endif // RYZOM_VERSION_H
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
index 4e94e633c..50d47d680 100644
--- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/settings.tpl
@@ -1,161 +1,161 @@
-{block name=content}
-
-
-
-
-
-
-
-
-
- Change Settings of {$target_username}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Change Password
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{/block}
-
+{block name=content}
+
+
+
+
+
+
+
+
+
+ Change Settings of {$target_username}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Change Password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{/block}
+
diff --git a/code/tool/increment_version/increment_version.py b/code/tool/increment_version/increment_version.py
new file mode 100644
index 000000000..43afec9ee
--- /dev/null
+++ b/code/tool/increment_version/increment_version.py
@@ -0,0 +1,162 @@
+#
+# Copyright (c) 2015 Jan Boon
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+import fileinput
+import os
+
+os.chdir('../../')
+RootDir = os.getcwd();
+
+MajorVersion = 0
+MinorVersion = 11
+PatchVersion = 3
+Revision = 0
+
+VersionString = str(MajorVersion) + "." + str(MinorVersion) + "." + str(PatchVersion)
+VersionComma = str(MajorVersion) + ", " + str(MinorVersion) + ", " + str(PatchVersion) + ", " + str(Revision)
+
+for line in fileinput.input("CMakeLists.txt", inplace = True):
+ if ("# Version" in line):
+ print "# Version: " + VersionString
+ elif ("SET(NL_VERSION_MAJOR" in line):
+ print "SET(NL_VERSION_MAJOR " + str(MajorVersion) + ")"
+ elif ("SET(NL_VERSION_MINOR" in line):
+ print "SET(NL_VERSION_MINOR " + str(MinorVersion) + ")"
+ elif ("SET(NL_VERSION_PATCH" in line):
+ print "SET(NL_VERSION_PATCH " + str(PatchVersion) + ")"
+ else:
+ print line.rstrip()
+
+os.chdir(RootDir)
+os.chdir("web/public_php/ams/templates/")
+
+for line in fileinput.input("layout.tpl", inplace = True):
+ if (" Powered by: " in line):
+ print "\t\t\t{if $permission > 1}AMS " + VersionString + " Powered by: Charisma
{/if}"
+ else:
+ print line.rstrip()
+
+os.chdir(RootDir)
+os.chdir("ryzom/common/src/game_share/")
+
+for line in fileinput.input("ryzom_version.h", inplace = True):
+ if (("\"v" in line) and (" \\" in line)):
+ print "\t\"v" + VersionString + "\" \\"
+ else:
+ print line.rstrip()
+
+os.chdir(RootDir)
+os.chdir("nel/tools/3d/plugin_max/")
+os.chdir("nel_export")
+
+for line in fileinput.input("nel_export.rc", inplace = True):
+ if ("FILEVERSION" in line):
+ print " FILEVERSION " + VersionComma
+ elif ("PRODUCTVERSION" in line):
+ print " PRODUCTVERSION " + VersionComma
+ elif (("FileVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+ elif (("ProductVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+ else:
+ print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_patch_converter")
+
+for line in fileinput.input("nel_patch_converter.rc", inplace = True):
+ if ("FILEVERSION" in line):
+ print " FILEVERSION " + VersionComma
+ elif ("PRODUCTVERSION" in line):
+ print " PRODUCTVERSION " + VersionComma
+ elif (("FileVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"FileVersion\", \"" + VersionString + "\""
+ elif (("ProductVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"ProductVersion\", \"" + VersionString + "\""
+ else:
+ print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_patch_edit")
+
+for line in fileinput.input("mods.rc", inplace = True):
+ if ("FILEVERSION" in line):
+ print " FILEVERSION " + VersionComma
+ elif ("PRODUCTVERSION" in line):
+ print " PRODUCTVERSION " + VersionComma
+ elif (("FileVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"FileVersion\", \"" + VersionString + "\""
+ elif (("ProductVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"ProductVersion\", \"" + VersionString + "\""
+ else:
+ print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_patch_paint")
+
+for line in fileinput.input("nel_patch_paint.rc", inplace = True):
+ if ("FILEVERSION" in line):
+ print " FILEVERSION " + VersionComma
+ elif ("PRODUCTVERSION" in line):
+ print " PRODUCTVERSION " + VersionComma
+ elif (("FileVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+ elif (("ProductVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+ else:
+ print line.rstrip()
+
+os.chdir("..")
+os.chdir("nel_vertex_tree_paint")
+
+for line in fileinput.input("vertex_tree_paint.rc", inplace = True):
+ if ("FILEVERSION" in line):
+ print " FILEVERSION " + VersionComma
+ elif ("PRODUCTVERSION" in line):
+ print " PRODUCTVERSION " + VersionComma
+ elif (("FileVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+ elif (("ProductVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+ else:
+ print line.rstrip()
+
+os.chdir("..")
+os.chdir("tile_utility")
+
+for line in fileinput.input("tile_utility.rc", inplace = True):
+ if ("FILEVERSION" in line):
+ print " FILEVERSION " + VersionComma
+ elif ("PRODUCTVERSION" in line):
+ print " PRODUCTVERSION " + VersionComma
+ elif (("FileVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"FileVersion\", \"" + VersionString + "\\0\""
+ elif (("ProductVersion" in line) and ("VALUE" in line)):
+ print " VALUE \"ProductVersion\", \"" + VersionString + "\\0\""
+ else:
+ print line.rstrip()
+
+# end of file
diff --git a/code/web/private_php/ams/ingame_templates/register.tpl b/code/web/private_php/ams/ingame_templates/register.tpl
index 7f34e8639..0f1d683a8 100644
--- a/code/web/private_php/ams/ingame_templates/register.tpl
+++ b/code/web/private_php/ams/ingame_templates/register.tpl
@@ -1,118 +1,118 @@
-{config_load file="ams_lib.conf" section="setup"}
-
- {$title}
-
-
-
- {$welcome_message}
-
-
- {if $userRegistration == '0'|| $userRegistration == '1'}
-
-
-
- {/if}
-
-
-
-
- {$username_tooltip}
-
-
-
-
- {$password_message}
-
-
-
- {$cpassword_message}
-
-
-
- {$email_message}
-
-
-
+{config_load file="ams_lib.conf" section="setup"}
+
+ {$title}
+
+
+
+ {$welcome_message}
+
+
+ {if $userRegistration == '0'|| $userRegistration == '1'}
+
+
+
+ {/if}
+
+
+
+
+ {$username_tooltip}
+
+
+
+
+ {$password_message}
+
+
+
+ {$cpassword_message}
+
+
+
+ {$email_message}
+
+
+
diff --git a/code/web/private_php/ams/ingame_templates/settings.tpl b/code/web/private_php/ams/ingame_templates/settings.tpl
index e256e4429..6049bddba 100644
--- a/code/web/private_php/ams/ingame_templates/settings.tpl
+++ b/code/web/private_php/ams/ingame_templates/settings.tpl
@@ -1,247 +1,247 @@
-{block name=content}
-
-
-
-
-
-
-
-
-
- Change Settings of {$target_username}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Change Password
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Ticket-Update Mail Settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{/block}
-
+{block name=content}
+
+
+
+
+
+
+
+
+
+ Change Settings of {$target_username}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Change Password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Ticket-Update Mail Settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{/block}
+
diff --git a/code/web/public_php/admin/templates/default/index_login.tpl b/code/web/public_php/admin/templates/default/index_login.tpl
index f62a03998..7b18df28e 100644
--- a/code/web/public_php/admin/templates/default/index_login.tpl
+++ b/code/web/public_php/admin/templates/default/index_login.tpl
@@ -1,25 +1,25 @@
-
-{include file="page_header_light.tpl"}
-
-Shard Administration Website
-
-Use login: guest and password: guest to login.
-
-
-
-{include file="page_footer_light.tpl"}
+
+{include file="page_header_light.tpl"}
+
+Shard Administration Website
+
+Use login: guest and password: guest to login.
+
+
+
+{include file="page_footer_light.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_actions.tpl b/code/web/public_php/admin/templates/default/tool_actions.tpl
index a8c9e614a..3ceacb946 100644
--- a/code/web/public_php/admin/templates/default/tool_actions.tpl
+++ b/code/web/public_php/admin/templates/default/tool_actions.tpl
@@ -1,6 +1,6 @@
-
-{include file="page_header.tpl"}
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_applications.tpl b/code/web/public_php/admin/templates/default/tool_administration_applications.tpl
index 824d34325..45dc12839 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_applications.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_applications.tpl
@@ -1,115 +1,115 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Applications
-
-
- ID
- Name
- URI
- Restriction
- Icon
- Order
- Visible
-
-{section name=application loop=$tool_application_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_application_list[application].application_id}
- {$tool_application_list[application].application_name}
- {$tool_application_list[application].application_uri}
- {$tool_application_list[application].application_restriction}
- {$tool_application_list[application].application_icon}
- {$tool_application_list[application].application_order}
- {if $tool_application_list[application].application_visible == 1}Yes{else}No{/if}
-
-{/section}
-
-
-
-
-
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Applications
+
+
+ ID
+ Name
+ URI
+ Restriction
+ Icon
+ Order
+ Visible
+
+{section name=application loop=$tool_application_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_application_list[application].application_id}
+ {$tool_application_list[application].application_name}
+ {$tool_application_list[application].application_uri}
+ {$tool_application_list[application].application_restriction}
+ {$tool_application_list[application].application_icon}
+ {$tool_application_list[application].application_order}
+ {if $tool_application_list[application].application_visible == 1}Yes{else}No{/if}
+
+{/section}
+
+
+
+
+
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_domains.tpl b/code/web/public_php/admin/templates/default/tool_administration_domains.tpl
index 3262aee9d..fa61386a5 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_domains.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_domains.tpl
@@ -1,185 +1,185 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Domains
-
-
- ID
- Name
- Application
- AS Host
- AS Port
- MFS Web
- RRD Path
- LAS Admin Path
- LAS Local Path
- Ring DB
- CS DB
- HD Check
-
-{section name=domain loop=$tool_domain_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_domain_list[domain].domain_id}
- {$tool_domain_list[domain].domain_name}
- {$tool_domain_list[domain].domain_application}
- {$tool_domain_list[domain].domain_as_host}
- {$tool_domain_list[domain].domain_as_port}
- {$tool_domain_list[domain].domain_mfs_web}
- {$tool_domain_list[domain].domain_rrd_path}
- {$tool_domain_list[domain].domain_las_admin_path}
- {$tool_domain_list[domain].domain_las_local_path}
- {if $tool_domain_list[domain].domain_sql_string != ''}True{else}False{/if}
- {if $tool_domain_list[domain].domain_cs_sql_string != ''}True{else}False{/if}
- {if $tool_domain_list[domain].domain_hd_check == 1}Yes{else}No{/if}
-
-{/section}
-
-
-
-
-
-
-
-{if $tool_domain_nel_data}
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Domains
+
+
+ ID
+ Name
+ Application
+ AS Host
+ AS Port
+ MFS Web
+ RRD Path
+ LAS Admin Path
+ LAS Local Path
+ Ring DB
+ CS DB
+ HD Check
+
+{section name=domain loop=$tool_domain_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_domain_list[domain].domain_id}
+ {$tool_domain_list[domain].domain_name}
+ {$tool_domain_list[domain].domain_application}
+ {$tool_domain_list[domain].domain_as_host}
+ {$tool_domain_list[domain].domain_as_port}
+ {$tool_domain_list[domain].domain_mfs_web}
+ {$tool_domain_list[domain].domain_rrd_path}
+ {$tool_domain_list[domain].domain_las_admin_path}
+ {$tool_domain_list[domain].domain_las_local_path}
+ {if $tool_domain_list[domain].domain_sql_string != ''}True{else}False{/if}
+ {if $tool_domain_list[domain].domain_cs_sql_string != ''}True{else}False{/if}
+ {if $tool_domain_list[domain].domain_hd_check == 1}Yes{else}No{/if}
+
+{/section}
+
+
+
+
+
+
+
+{if $tool_domain_nel_data}
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_groups.tpl b/code/web/public_php/admin/templates/default/tool_administration_groups.tpl
index 3dedf7067..be7235734 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_groups.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_groups.tpl
@@ -1,334 +1,334 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Groups
-
-
- ID
- Name
- Level
- Default
- Active
-
-{section name=group loop=$tool_group_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_group_list[group].group_id}
- {$tool_group_list[group].group_name}
- {$tool_group_list[group].group_level_name}
- {if $tool_group_list[group].group_default == 1}Yes{else}No{/if}
- {if $tool_group_list[group].group_active == 1}Yes{else}No{/if}
-
-{/section}
-
-
-{if $tool_group_user_list}
-
-
-
-
- Accounts
-
-
- ID
- Login
- Created
- Last Logged
- Num Logs
- Active
-
-{section name=user loop=$tool_group_user_list}
-{cycle assign="trclass2" values="row1,row0"}
-
- {$tool_group_user_list[user].user_id}
- {$tool_group_user_list[user].user_name}
- {$tool_group_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}
-{if $tool_group_user_list[user].user_logged_last > 0}
- {$tool_group_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}
-{else}
- never
-{/if}
- {$tool_group_user_list[user].user_logged_count}
- {if $tool_group_user_list[user].user_active == 1}Yes{else}No{/if}
-
-{/section}
-
-{/if}
-
-
-
-
-
-
-
-{if $tool_group_edit_data.group_id}
-
-
-
-
-{if $tool_group_edit_data.group_default_domain_id > 0}
-
-
-{/if}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Groups
+
+
+ ID
+ Name
+ Level
+ Default
+ Active
+
+{section name=group loop=$tool_group_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_group_list[group].group_id}
+ {$tool_group_list[group].group_name}
+ {$tool_group_list[group].group_level_name}
+ {if $tool_group_list[group].group_default == 1}Yes{else}No{/if}
+ {if $tool_group_list[group].group_active == 1}Yes{else}No{/if}
+
+{/section}
+
+
+{if $tool_group_user_list}
+
+
+
+
+ Accounts
+
+
+ ID
+ Login
+ Created
+ Last Logged
+ Num Logs
+ Active
+
+{section name=user loop=$tool_group_user_list}
+{cycle assign="trclass2" values="row1,row0"}
+
+ {$tool_group_user_list[user].user_id}
+ {$tool_group_user_list[user].user_name}
+ {$tool_group_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}
+{if $tool_group_user_list[user].user_logged_last > 0}
+ {$tool_group_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}
+{else}
+ never
+{/if}
+ {$tool_group_user_list[user].user_logged_count}
+ {if $tool_group_user_list[user].user_active == 1}Yes{else}No{/if}
+
+{/section}
+
+{/if}
+
+
+
+
+
+
+
+{if $tool_group_edit_data.group_id}
+
+
+
+
+{if $tool_group_edit_data.group_default_domain_id > 0}
+
+
+{/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_logs.tpl b/code/web/public_php/admin/templates/default/tool_administration_logs.tpl
index a2f537a8e..b44d3719b 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_logs.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_logs.tpl
@@ -1,56 +1,56 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Logs
-
-
- ID
- User
- Date
- Action
-
-{section name=log loop=$tool_log_list}
-
- {$tool_log_list[log].logs_id}
- {$tool_log_list[log].logs_user_name}
- {$tool_log_list[log].logs_date|date_format:"%Y/%m/%d %H:%M:%S"}
- {$tool_log_list[log].logs_data}
-
-{/section}
-
-
-|<
-<
-Page {$tool_log_page_current} / {$tool_log_page_total}
->
->|
-
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Logs
+
+
+ ID
+ User
+ Date
+ Action
+
+{section name=log loop=$tool_log_list}
+
+ {$tool_log_list[log].logs_id}
+ {$tool_log_list[log].logs_user_name}
+ {$tool_log_list[log].logs_date|date_format:"%Y/%m/%d %H:%M:%S"}
+ {$tool_log_list[log].logs_data}
+
+{/section}
+
+
+|<
+<
+Page {$tool_log_page_current} / {$tool_log_page_total}
+>
+>|
+
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl b/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
index 37e856f09..d31e4a65e 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_restarts.tpl
@@ -1,172 +1,172 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Restart Groups
-
-
- ID
- Name
- List
- Order
-
-{section name=restart loop=$tool_restart_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_restart_list[restart].restart_group_id}
- {$tool_restart_list[restart].restart_group_name}
- {$tool_restart_list[restart].restart_group_list}
- {$tool_restart_list[restart].restart_group_order}
-
-{/section}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Restart Messages
-
-
- ID
- Language
- Name
- Value
-
-{section name=msg loop=$tool_message_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_message_list[msg].restart_message_id}
- {$tool_message_list[msg].restart_message_lang}
- {$tool_message_list[msg].restart_message_name}
- {$tool_message_list[msg].restart_message_value}
-
-{/section}
-
-
-
-
-
-
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Restart Groups
+
+
+ ID
+ Name
+ List
+ Order
+
+{section name=restart loop=$tool_restart_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_restart_list[restart].restart_group_id}
+ {$tool_restart_list[restart].restart_group_name}
+ {$tool_restart_list[restart].restart_group_list}
+ {$tool_restart_list[restart].restart_group_order}
+
+{/section}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Restart Messages
+
+
+ ID
+ Language
+ Name
+ Value
+
+{section name=msg loop=$tool_message_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_message_list[msg].restart_message_id}
+ {$tool_message_list[msg].restart_message_lang}
+ {$tool_message_list[msg].restart_message_name}
+ {$tool_message_list[msg].restart_message_value}
+
+{/section}
+
+
+
+
+
+
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_shards.tpl b/code/web/public_php/admin/templates/default/tool_administration_shards.tpl
index c5ebdc00f..03ceb06b9 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_shards.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_shards.tpl
@@ -1,110 +1,110 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Shards
-
-
- ID
- Name
- Shard ID
- Domain
- Language
-
-{section name=shard loop=$tool_shard_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_shard_list[shard].shard_id}
- {$tool_shard_list[shard].shard_name}
- {$tool_shard_list[shard].shard_as_id}
- {$tool_shard_list[shard].domain_name}
- {$tool_shard_list[shard].shard_lang}
-
-{/section}
-
-
-
-
-
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Shards
+
+
+ ID
+ Name
+ Shard ID
+ Domain
+ Language
+
+{section name=shard loop=$tool_shard_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_shard_list[shard].shard_id}
+ {$tool_shard_list[shard].shard_name}
+ {$tool_shard_list[shard].shard_as_id}
+ {$tool_shard_list[shard].domain_name}
+ {$tool_shard_list[shard].shard_lang}
+
+{/section}
+
+
+
+
+
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_administration_users.tpl b/code/web/public_php/admin/templates/default/tool_administration_users.tpl
index d2d81a85b..5950d21ca 100644
--- a/code/web/public_php/admin/templates/default/tool_administration_users.tpl
+++ b/code/web/public_php/admin/templates/default/tool_administration_users.tpl
@@ -1,207 +1,207 @@
-
-{include file="page_header.tpl"}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Accounts
-
-
- ID
- Login
- Group
- Created
- Last Logged
- Num Logs
- Active
-
-{section name=user loop=$tool_user_list}
-{cycle assign="trclass" values="row1,row0"}
-
- {$tool_user_list[user].user_id}
- {$tool_user_list[user].user_name}
- {$tool_user_list[user].user_group_name}
- {$tool_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}
-{if $tool_user_list[user].user_logged_last > 0}
- {$tool_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}
-{else}
- never
-{/if}
- {$tool_user_list[user].user_logged_count}
- {if $tool_user_list[user].user_active == 1}Yes{else}No{/if}
-
-{/section}
-
-
-
-
-
-
-
-{if $tool_user_edit_data.user_id}
-
-
-
-
-
-
-
-
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Accounts
+
+
+ ID
+ Login
+ Group
+ Created
+ Last Logged
+ Num Logs
+ Active
+
+{section name=user loop=$tool_user_list}
+{cycle assign="trclass" values="row1,row0"}
+
+ {$tool_user_list[user].user_id}
+ {$tool_user_list[user].user_name}
+ {$tool_user_list[user].user_group_name}
+ {$tool_user_list[user].user_created|date_format:"%Y/%m/%d %H:%M:%S"}
+{if $tool_user_list[user].user_logged_last > 0}
+ {$tool_user_list[user].user_logged_last|date_format:"%Y/%m/%d %H:%M:%S"}
+{else}
+ never
+{/if}
+ {$tool_user_list[user].user_logged_count}
+ {if $tool_user_list[user].user_active == 1}Yes{else}No{/if}
+
+{/section}
+
+
+
+
+
+
+
+{if $tool_user_edit_data.user_id}
+
+
+
+
+
+
+
+
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs.tpl b/code/web/public_php/admin/templates/default/tool_graphs.tpl
index 24e2d4eaa..9dcd896a5 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs.tpl
@@ -1,274 +1,274 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-
-{/literal}
-
-
-
-
-
-
-
-
-
-{if $tool_domain_selected && $tool_shard_selected}
-
-
-{/if}
-
-
-
-{if $tool_domain_selected}
-
-
-
- Shards
-
-{section name=shard loop=$tool_shard_list}
-{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
-
- {$tool_shard_list[shard].shard_name}
-
-{/if}
-{/section}
-
-
-{if $tool_frame_list}
-
-{/if}
-
-{if $tool_graph_list}
-
-
-
- Graphs
-
-{section name=gvar loop=$tool_graph_variables}
-
- {$tool_graph_variables[gvar]}
-
- High
-
-{assign var="var_name" value=$tool_graph_variables[gvar]}
-{section name=gdata loop=$tool_graph_datas.$var_name}
-
- {$tool_graph_datas.$var_name[gdata].service}
-
- {if $tool_graph_datas.$var_name[gdata].high_file != ''}Yes{else}No{/if}
-
-{/section}
-{/section}
-
-{/if}
-
-{/if}
-
-
-
-
-
-
-
-{if $tool_domain_error}
-
-
- {$tool_domain_error}
-
-
-{elseif !$tool_domain_selected}
-
-
- You need to select a domain.
-
-
-{else}
-{if $tool_as_error}
-
-
-{/if}
-
-
-
-{if $tool_rrd_output}
-{section name=rrd loop=$tool_rrd_output}
- {$tool_rrd_output[rrd].desc}
-
-{/section}
-{/if}
-
-
-{if $tool_rrd_high_output}
-{section name=rrd loop=$tool_rrd_high_output}
- {$tool_rrd_high_output[rrd].desc}
-{if $tool_rrd_high_output[rrd].img != ''}
-
-{/if}
-{/section}
-{/if}
-
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+
+{/literal}
+
+
+
+
+
+
+
+
+
+{if $tool_domain_selected && $tool_shard_selected}
+
+
+{/if}
+
+
+
+{if $tool_domain_selected}
+
+
+
+ Shards
+
+{section name=shard loop=$tool_shard_list}
+{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
+
+ {$tool_shard_list[shard].shard_name}
+
+{/if}
+{/section}
+
+
+{if $tool_frame_list}
+
+{/if}
+
+{if $tool_graph_list}
+
+
+
+ Graphs
+
+{section name=gvar loop=$tool_graph_variables}
+
+ {$tool_graph_variables[gvar]}
+
+ High
+
+{assign var="var_name" value=$tool_graph_variables[gvar]}
+{section name=gdata loop=$tool_graph_datas.$var_name}
+
+ {$tool_graph_datas.$var_name[gdata].service}
+
+ {if $tool_graph_datas.$var_name[gdata].high_file != ''}Yes{else}No{/if}
+
+{/section}
+{/section}
+
+{/if}
+
+{/if}
+
+
+
+
+
+
+
+{if $tool_domain_error}
+
+
+ {$tool_domain_error}
+
+
+{elseif !$tool_domain_selected}
+
+
+ You need to select a domain.
+
+
+{else}
+{if $tool_as_error}
+
+
+{/if}
+
+
+
+{if $tool_rrd_output}
+{section name=rrd loop=$tool_rrd_output}
+ {$tool_rrd_output[rrd].desc}
+
+{/section}
+{/if}
+
+
+{if $tool_rrd_high_output}
+{section name=rrd loop=$tool_rrd_high_output}
+ {$tool_rrd_high_output[rrd].desc}
+{if $tool_rrd_high_output[rrd].img != ''}
+
+{/if}
+{/section}
+{/if}
+
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl b/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
index db9051058..2a9cf3f21 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs_ccu.tpl
@@ -1,230 +1,230 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-
-{/literal}
-
-
-
-
-
-
-
-
-
-{if $tool_domain_selected && $tool_frame_selected}
-
-
-{/if}
-
-
-
-{if $tool_domain_selected}
-
-
-
-{/if}
-
-
-
-
-
-
-
-{if $tool_domain_error}
-
-
- {$tool_domain_error}
-
-
-{elseif !$tool_domain_selected}
-
-
- You need to select a domain.
-
-
-{elseif !$tool_frame_selected}
-
-
- You need to select a time frame.
-
-
-{else}
-{if $tool_as_error}
-
-
-{/if}
-
-
-
-{if $tool_rrd_output}
-{section name=rrd loop=$tool_rrd_output}
- {$tool_rrd_output[rrd].desc}
-
-{/section}
-{/if}
-
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+
+{/literal}
+
+
+
+
+
+
+
+
+
+{if $tool_domain_selected && $tool_frame_selected}
+
+
+{/if}
+
+
+
+{if $tool_domain_selected}
+
+
+
+{/if}
+
+
+
+
+
+
+
+{if $tool_domain_error}
+
+
+ {$tool_domain_error}
+
+
+{elseif !$tool_domain_selected}
+
+
+ You need to select a domain.
+
+
+{elseif !$tool_frame_selected}
+
+
+ You need to select a time frame.
+
+
+{else}
+{if $tool_as_error}
+
+
+{/if}
+
+
+
+{if $tool_rrd_output}
+{section name=rrd loop=$tool_rrd_output}
+ {$tool_rrd_output[rrd].desc}
+
+{/section}
+{/if}
+
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl b/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
index 67288ac95..54d784934 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs_hires.tpl
@@ -1,252 +1,252 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-
-{/literal}
-
-
-
-
-
-
-
-
-
-{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
-
-
-{/if}
-
-
-
-{if $tool_domain_selected}
-
-
-
- Shards
-
-{section name=shard loop=$tool_shard_list}
-{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
-
- {$tool_shard_list[shard].shard_name}
-
-{/if}
-{/section}
-
-
-
-
-
-{/if}
-
-
-
-
-
-
-
-{if $tool_domain_error}
-
-
- {$tool_domain_error}
-
-
-{elseif !$tool_domain_selected}
-
-
- You need to select a domain.
-
-
-{elseif !$tool_shard_selected}
-
-
- You need to select a shard.
-
-
-{elseif !$tool_frame_selected}
-
-
- You need to select a time frame.
-
-
-{else}
-{if $tool_as_error}
-
-
-{/if}
-
-
-
-{if $tool_rrd_high_output}
-{section name=rrd loop=$tool_rrd_high_output}
- {$tool_rrd_high_output[rrd].desc}
-{if $tool_rrd_high_output[rrd].img != ''}
-
-{/if}
-{/section}
-{/if}
-
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+
+{/literal}
+
+
+
+
+
+
+
+
+
+{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
+
+
+{/if}
+
+
+
+{if $tool_domain_selected}
+
+
+
+ Shards
+
+{section name=shard loop=$tool_shard_list}
+{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
+
+ {$tool_shard_list[shard].shard_name}
+
+{/if}
+{/section}
+
+
+
+
+
+{/if}
+
+
+
+
+
+
+
+{if $tool_domain_error}
+
+
+ {$tool_domain_error}
+
+
+{elseif !$tool_domain_selected}
+
+
+ You need to select a domain.
+
+
+{elseif !$tool_shard_selected}
+
+
+ You need to select a shard.
+
+
+{elseif !$tool_frame_selected}
+
+
+ You need to select a time frame.
+
+
+{else}
+{if $tool_as_error}
+
+
+{/if}
+
+
+
+{if $tool_rrd_high_output}
+{section name=rrd loop=$tool_rrd_high_output}
+ {$tool_rrd_high_output[rrd].desc}
+{if $tool_rrd_high_output[rrd].img != ''}
+
+{/if}
+{/section}
+{/if}
+
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl b/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
index c1c96d189..79299b7ab 100644
--- a/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
+++ b/code/web/public_php/admin/templates/default/tool_graphs_tech.tpl
@@ -1,250 +1,250 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-
-{/literal}
-
-
-
-
-
-
-
-
-
-{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
-
-
-{/if}
-
-
-
-{if $tool_domain_selected}
-
-
-
- Shards
-
-{section name=shard loop=$tool_shard_list}
-{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
-
- {$tool_shard_list[shard].shard_name}
-
-{/if}
-{/section}
-
-
-
-
-
-{/if}
-
-
-
-
-
-
-
-{if $tool_domain_error}
-
-
- {$tool_domain_error}
-
-
-{elseif !$tool_domain_selected}
-
-
- You need to select a domain.
-
-
-{elseif !$tool_shard_selected}
-
-
- You need to select a shard.
-
-
-{elseif !$tool_frame_selected}
-
-
- You need to select a time frame.
-
-
-{else}
-{if $tool_as_error}
-
-
-{/if}
-
-
-
-{if $tool_rrd_output}
-{section name=rrd loop=$tool_rrd_output}
- {$tool_rrd_output[rrd].desc}
-
-{/section}
-{/if}
-
-
-
-{/if}
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+
+{/literal}
+
+
+
+
+
+
+
+
+
+{if $tool_domain_selected && $tool_shard_selected && $tool_frame_selected}
+
+
+{/if}
+
+
+
+{if $tool_domain_selected}
+
+
+
+ Shards
+
+{section name=shard loop=$tool_shard_list}
+{if $tool_domain_selected == $tool_shard_list[shard].shard_domain_id}
+
+ {$tool_shard_list[shard].shard_name}
+
+{/if}
+{/section}
+
+
+
+
+
+{/if}
+
+
+
+
+
+
+
+{if $tool_domain_error}
+
+
+ {$tool_domain_error}
+
+
+{elseif !$tool_domain_selected}
+
+
+ You need to select a domain.
+
+
+{elseif !$tool_shard_selected}
+
+
+ You need to select a shard.
+
+
+{elseif !$tool_frame_selected}
+
+
+ You need to select a time frame.
+
+
+{else}
+{if $tool_as_error}
+
+
+{/if}
+
+
+
+{if $tool_rrd_output}
+{section name=rrd loop=$tool_rrd_output}
+ {$tool_rrd_output[rrd].desc}
+
+{/section}
+{/if}
+
+
+
+{/if}
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/admin/templates/default/tool_notes.tpl b/code/web/public_php/admin/templates/default/tool_notes.tpl
index 56a35c4cf..e0e04106d 100644
--- a/code/web/public_php/admin/templates/default/tool_notes.tpl
+++ b/code/web/public_php/admin/templates/default/tool_notes.tpl
@@ -1,164 +1,164 @@
-
-{include file="page_header.tpl"}
-
-{literal}
-
-
-
-{/literal}
-
-
-
- {$tool_alert_message}
-
-
-
-
-
-
-
-
-
-
- Notes
-
-
- ID
- Title
- Mode
- Last Update
- Active
-{if $restriction_tool_notes_global}
- Global
-{/if}
-
- {section name=note loop=$tool_note_list}
-
- {$tool_note_list[note].note_id}
- {$tool_note_list[note].note_title}
- {if $tool_note_list[note].note_mode == 0}Text{else}Popup{/if}
- {$tool_note_list[note].note_date|date_format:"%Y/%m/%d %H:%M:%S"}
- {if $tool_note_list[note].note_active == 1}Yes{else}No{/if}
-{if $restriction_tool_notes_global}
- {if $tool_note_list[note].note_global == 1}Yes{else}No{/if}
-{/if}
-
- {/section}
-
-
-
-
-
-
-
-
-
-
-
-
-
-{include file="page_footer.tpl"}
+
+{include file="page_header.tpl"}
+
+{literal}
+
+
+
+{/literal}
+
+
+
+ {$tool_alert_message}
+
+
+
+
+
+
+
+
+
+
+ Notes
+
+
+ ID
+ Title
+ Mode
+ Last Update
+ Active
+{if $restriction_tool_notes_global}
+ Global
+{/if}
+
+ {section name=note loop=$tool_note_list}
+
+ {$tool_note_list[note].note_id}
+ {$tool_note_list[note].note_title}
+ {if $tool_note_list[note].note_mode == 0}Text{else}Popup{/if}
+ {$tool_note_list[note].note_date|date_format:"%Y/%m/%d %H:%M:%S"}
+ {if $tool_note_list[note].note_active == 1}Yes{else}No{/if}
+{if $restriction_tool_notes_global}
+ {if $tool_note_list[note].note_global == 1}Yes{else}No{/if}
+{/if}
+
+ {/section}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{include file="page_footer.tpl"}
diff --git a/code/web/public_php/ams/templates/forgot_password.tpl b/code/web/public_php/ams/templates/forgot_password.tpl
index 80bea346b..f6fae04d1 100644
--- a/code/web/public_php/ams/templates/forgot_password.tpl
+++ b/code/web/public_php/ams/templates/forgot_password.tpl
@@ -1,54 +1,54 @@
-{extends file="layout.tpl"}
-{block name=content}
-
-
-
-
-
-
-
-
- {$forgot_password_message}
-
-
- {$title}
-
-
-
- {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
-
- ×
- {$email_doesnt_exist}
-
- {/if}
- {if isset($EMAIL_SUCCESS) and $EMAIL_SUCCESS eq "TRUE"}
-
- ×
- {$email_sent}
-
- {/if}
-
-
- Send me the reset link
-
-
-
-
-
-
-
-{/block}
-
-
+{extends file="layout.tpl"}
+{block name=content}
+
+
+
+
+
+
+
+
+ {$forgot_password_message}
+
+
+ {$title}
+
+
+
+ {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
+
+ ×
+ {$email_doesnt_exist}
+
+ {/if}
+ {if isset($EMAIL_SUCCESS) and $EMAIL_SUCCESS eq "TRUE"}
+
+ ×
+ {$email_sent}
+
+ {/if}
+
+
+ Send me the reset link
+
+
+
+
+
+
+
+{/block}
+
+
diff --git a/code/web/public_php/ams/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl
index 33dbf3be0..94cf0b4dd 100644
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@@ -140,7 +140,7 @@
{if isset($smarty.get.page) and $smarty.get.page eq 'layout_plugin' and $smarty.get.name eq $arrkey}
{include file=$hook_info[$smarty.get.name]['TemplatePath']}
{/if}
- {/foreach}
+ {/foreach}
{/if}
@@ -167,7 +167,7 @@
{/if}
diff --git a/code/web/public_php/ams/templates/register.tpl b/code/web/public_php/ams/templates/register.tpl
index 24aac42a2..f14ef9a6c 100644
--- a/code/web/public_php/ams/templates/register.tpl
+++ b/code/web/public_php/ams/templates/register.tpl
@@ -1,124 +1,124 @@
-{extends file="layout.tpl"}
-{block name=content}
-
-
-
-
-
-
-
-
- {$welcome_message}
-
- {if $userRegistration == '0'|| $userRegistration == '2'}
-
- {$title}
-
-
-
-
-
-
-
-
-
-
-
-
- {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}
-
- ×
- Username Error {$USERNAME}
-
- {/if}
-
- {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}
-
- ×
- Password Error {$PASSWORD}
-
- {/if}
-
- {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE" and $CPASSWORD != ""}
-
- ×
- Confirmation Password Error {$CPASSWORD}
-
- {/if}
-
- {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
-
- ×
- Email Error {$EMAIL}
-
- {/if}
-
- {if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}
-
- ×
- Terms of Service Error {$tac_message}
-
- {/if}
-
-
-
- Create My Account
-
-
-
- {else}
- Registration Disabled!
- {/if}
-
-
-
-
-{/block}
-
-
+{extends file="layout.tpl"}
+{block name=content}
+
+
+
+
+
+
+
+
+ {$welcome_message}
+
+ {if $userRegistration == '0'|| $userRegistration == '2'}
+
+ {$title}
+
+
+
+
+
+
+
+
+
+
+
+
+ {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}
+
+ ×
+ Username Error {$USERNAME}
+
+ {/if}
+
+ {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}
+
+ ×
+ Password Error {$PASSWORD}
+
+ {/if}
+
+ {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE" and $CPASSWORD != ""}
+
+ ×
+ Confirmation Password Error {$CPASSWORD}
+
+ {/if}
+
+ {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
+
+ ×
+ Email Error {$EMAIL}
+
+ {/if}
+
+ {if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}
+
+ ×
+ Terms of Service Error {$tac_message}
+
+ {/if}
+
+
+
+ Create My Account
+
+
+
+ {else}
+ Registration Disabled!
+ {/if}
+
+
+
+
+{/block}
+
+
diff --git a/code/web/public_php/ams/templates/reset_password.tpl b/code/web/public_php/ams/templates/reset_password.tpl
index 4c5bca351..57d0567ff 100644
--- a/code/web/public_php/ams/templates/reset_password.tpl
+++ b/code/web/public_php/ams/templates/reset_password.tpl
@@ -1,66 +1,66 @@
-{extends file="layout.tpl"}
-{block name=content}
-
-
-
-
-
-
-
-
-
- {$title}
-
-
-
New Password
-
-
-
-
- {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}{$newpass_error_message} {/if}
-
-
-
-
-
-
Confirm New Password
-
-
-
-
- {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}{$confirmnewpass_error_message} {/if}
-
-
-
-
-
-
- {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-
- The password has been changed!
-
- {/if}
-
- {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
-
- The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-
- {/if}
-
-
-
- Reset the password!
-
-
-
-
-
-
-
-{/block}
-
-
+{extends file="layout.tpl"}
+{block name=content}
+
+
+
+
+
+
+
+
+
+ {$title}
+
+
+
New Password
+
+
+
+
+ {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}{$newpass_error_message} {/if}
+
+
+
+
+
+
Confirm New Password
+
+
+
+
+ {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}{$confirmnewpass_error_message} {/if}
+
+
+
+
+
+
+ {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
+
+ The password has been changed!
+
+ {/if}
+
+ {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
+
+ The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
+
+ {/if}
+
+
+
+ Reset the password!
+
+
+
+
+
+
+
+{/block}
+
+
diff --git a/code/web/public_php/ams/templates/settings.tpl b/code/web/public_php/ams/templates/settings.tpl
index 94883c9de..0e04cab17 100644
--- a/code/web/public_php/ams/templates/settings.tpl
+++ b/code/web/public_php/ams/templates/settings.tpl
@@ -1,382 +1,382 @@
-{block name=content}
-
-
-
-
- Change Password
-
-
-
-
- Change Password
-
- {if !isset($changesOther) or $changesOther eq "FALSE"}
-
-
Current Password
-
-
-
-
- {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}The password is incorrect {/if}
-
-
-
- {/if}
-
-
New Password
-
-
-
-
- {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}{$newpass_error_message} {/if}
-
-
-
-
-
-
Confirm New Password
-
-
-
-
- {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}{$confirmnewpass_error_message} {/if}
-
-
-
-
-
-
- {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-
- The password has been changed!
-
- {/if}
-
- {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
-
- The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-
- {/if}
-
-
-
-
-
-
- Change Password
-
-
-
-
-
-
-
-
- {if $permission != '1'}
-
-
-
- Add User
-
-
-
-
- Add User
-
-
-
Username
-
-
-
-
- {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}{$USERNAME} {/if}
-
-
-
-
-
-
Password
-
-
-
-
- {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}{$PASSWORD} {/if}
-
-
-
-
-
-
Confirm Password
-
-
-
-
- {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}{$CPASSWORD} {/if}
-
-
-
-
-
-
Email
-
-
-
-
- {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE" and isset($do)}{$EMAIL} {/if}
-
-
-
-
-
- {if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "ok"}
-
- The user has been created!
-
- {/if}
-
- {if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "shardoffline"}
-
- The user is created, though the shard seems offline, it may take some time to see the change on the shard.
-
- {/if}
-
-
-
-
-
-
-
-
-
- {/if}
-
-
-
-
- Change Email
-
-
-
-
- Change Email
-
-
New Email
-
-
-
-
- {if isset($CEMAIL_ERROR) and $CEMAIL_ERROR eq "TRUE"}{$EMAIL} {/if}
-
-
-
-
-
-
- {if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
-
- The email has been changed!
-
- {/if}
-
- {if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "SHARDOFF"}
-
- The email has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-
- {/if}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Ticket updates
-
-
-
-
-
-
- Ticket-Update Mail Settings
-
-
-
Receive ticket updates
-
-
- Yes
- No
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Change Info
-
-
-
-
- Change Info
-
-
-
-
-
-
-
Country
-
-
- {foreach from=$country_array key=k item=v}
- {$v}
- {/foreach}
-
-
-
-
-
-
Gender
-
-
-
- Secret
-
-
-
-
- Male
-
-
-
-
- Female
-
-
-
-
- {if isset($info_updated) and $info_updated eq "OK"}
-
- The Info has been updated!
-
- {/if}
-
-
-
-
-
-
-
-
-
-
- {if $permission == '3'}
-
-
-
- User Registration
-
-
-
-
- User Registration
-
-
-
-
-
- In-Game and Web Registration
-
-
-
-
- In-Game Registration Only
-
-
-
-
- Web Registration Only
-
-
-
-
- No Registration
-
-
-
-
-
-
-
-
-
-
-
-
- {/if}
-
-
-
-
-
-{/block}
-
+{block name=content}
+
+
+
+
+ Change Password
+
+
+
+
+ Change Password
+
+ {if !isset($changesOther) or $changesOther eq "FALSE"}
+
+
Current Password
+
+
+
+
+ {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}The password is incorrect {/if}
+
+
+
+ {/if}
+
+
New Password
+
+
+
+
+ {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}{$newpass_error_message} {/if}
+
+
+
+
+
+
Confirm New Password
+
+
+
+
+ {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}{$confirmnewpass_error_message} {/if}
+
+
+
+
+
+
+ {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
+
+ The password has been changed!
+
+ {/if}
+
+ {if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
+
+ The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
+
+ {/if}
+
+
+
+
+
+
+ Change Password
+
+
+
+
+
+
+
+
+ {if $permission != '1'}
+
+
+
+ Add User
+
+
+
+
+ Add User
+
+
+
Username
+
+
+
+
+ {if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}{$USERNAME} {/if}
+
+
+
+
+
+
Password
+
+
+
+
+ {if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}{$PASSWORD} {/if}
+
+
+
+
+
+
Confirm Password
+
+
+
+
+ {if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}{$CPASSWORD} {/if}
+
+
+
+
+
+
Email
+
+
+
+
+ {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE" and isset($do)}{$EMAIL} {/if}
+
+
+
+
+
+ {if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "ok"}
+
+ The user has been created!
+
+ {/if}
+
+ {if isset($SUCCESS_ADD) and $SUCCESS_ADD eq "shardoffline"}
+
+ The user is created, though the shard seems offline, it may take some time to see the change on the shard.
+
+ {/if}
+
+
+
+
+
+
+
+
+
+ {/if}
+
+
+
+
+ Change Email
+
+
+
+
+ Change Email
+
+
New Email
+
+
+
+
+ {if isset($CEMAIL_ERROR) and $CEMAIL_ERROR eq "TRUE"}{$EMAIL} {/if}
+
+
+
+
+
+
+ {if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
+
+ The email has been changed!
+
+ {/if}
+
+ {if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "SHARDOFF"}
+
+ The email has been changed, though the shard seems offline, it may take some time to see the change on the shard.
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ticket updates
+
+
+
+
+
+
+ Ticket-Update Mail Settings
+
+
+
Receive ticket updates
+
+
+ Yes
+ No
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Change Info
+
+
+
+
+ Change Info
+
+
+
+
+
+
+
Country
+
+
+ {foreach from=$country_array key=k item=v}
+ {$v}
+ {/foreach}
+
+
+
+
+
+
Gender
+
+
+
+ Secret
+
+
+
+
+ Male
+
+
+
+
+ Female
+
+
+
+
+ {if isset($info_updated) and $info_updated eq "OK"}
+
+ The Info has been updated!
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+ {if $permission == '3'}
+
+
+
+ User Registration
+
+
+
+
+ User Registration
+
+
+
+
+
+ In-Game and Web Registration
+
+
+
+
+ In-Game Registration Only
+
+
+
+
+ Web Registration Only
+
+
+
+
+ No Registration
+
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
+
+
+
+
+
+{/block}
+