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

Merged mainline

Browse source 
--HG--
branch : hotfix
This commit is contained in:
dfighter1985 2015-02-02 02:03:00 +01:00
commit f902bf6ed6
7 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeLists.txt
View file

@ -2,7 +2,7 @@
# #
# NeL # NeL
# Authors: Nevrax and the NeL Community # Authors: Nevrax and the NeL Community
# Version: 0.11.1 # Version: 0.11.2
# #
# Notes: # Notes:
# * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path # * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path
@ -48,7 +48,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(RyzomCore CXX C) PROJECT(RyzomCore CXX C)
SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MAJOR 0)
SET(NL_VERSION_MINOR 11) SET(NL_VERSION_MINOR 11)
SET(NL_VERSION_PATCH 1) SET(NL_VERSION_PATCH 2)
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}") SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

1
code/nel/include/nel/gui/ctrl_text_button.h
View file

@ -51,6 +51,7 @@ namespace NLGUI
// Init part // Init part
virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup); virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup);
virtual void checkCoords();
virtual void updateCoords(); virtual void updateCoords();
virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); } virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); }

9
code/nel/src/gui/ctrl_text_button.cpp
View file

@ -868,6 +868,15 @@ namespace NLGUI
} }
} }
// ***************************************************************************
void CCtrlTextButton::checkCoords()
{
if( _ViewText != NULL )
_ViewText->checkCoords();
CCtrlBaseButton::checkCoords();
}
// *************************************************************************** // ***************************************************************************
void CCtrlTextButton::updateCoords() void CCtrlTextButton::updateCoords()

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

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

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

@ -138,7 +138,7 @@ void initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
#define TYPE_BOT_TRADE_SELECTOR2 uint64 #define TYPE_BOT_TRADE_SELECTOR2 uint64
#define TYPE_EVENT_FACTION_ID uint32 #define TYPE_EVENT_FACTION_ID uint32
#define TYPE_PVP_MODE uint32 #define TYPE_PVP_MODE uint16
#define TYPE_PVP_CLAN uint32 #define TYPE_PVP_CLAN uint32
#define TYPE_FUEL bool #define TYPE_FUEL bool

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

@ -17,7 +17,10 @@
#ifndef RYZOM_VERSION_H #ifndef RYZOM_VERSION_H
#define RYZOM_VERSION_H #define RYZOM_VERSION_H
#define RYZOM_VERSION "ryzomcore/v0.11.1" #define RYZOM_VERSION "ryzomcore" \
"/" \
"v0.11.2" \
""
#endif // RYZOM_VERSION_H #endif // RYZOM_VERSION_H

4
code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
View file

@ -292,14 +292,14 @@
</STRUCT> </STRUCT>
<STRUCT> <STRUCT>
<ATOM Name="name" Value="PvpMode"/> <ATOM Name="name" Value="PvpMode"/>
<ATOM Name="type" Value="uint8"/> <ATOM Name="type" Value="uint16"/>
<ATOM Name="persistant" Value="true"/> <ATOM Name="persistant" Value="true"/>
<ATOM Name="mirror" Value="true"/> <ATOM Name="mirror" Value="true"/>
<ATOM Name="weight" Value="1"/> <ATOM Name="weight" Value="1"/>
</STRUCT> </STRUCT>
<STRUCT> <STRUCT>
<ATOM Name="name" Value="PvpClan"/> <ATOM Name="name" Value="PvpClan"/>
<ATOM Name="type" Value="uint8"/> <ATOM Name="type" Value="uint32"/>
<ATOM Name="persistant" Value="true"/> <ATOM Name="persistant" Value="true"/>
<ATOM Name="mirror" Value="true"/> <ATOM Name="mirror" Value="true"/>
<ATOM Name="weight" Value="1"/> <ATOM Name="weight" Value="1"/>