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

Merge with v0.11

Browse source
This commit is contained in:
kaetemi 2014-11-24 15:01:48 +01:00
commit a64c4b962c
5 changed files with 11 additions and 11 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
# Authors: Nevrax and the NeL Community
# Version: 0.11.0
# Version: 0.11.1
#
# 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 0)
SET(NL_VERSION_PATCH 1)
SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
#-----------------------------------------------------------------------------

1
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -463,6 +463,7 @@ bool CDriverGL::unInit()
{
nlwarning("Can't unregister NLClass");
}
_Registered = 0;
// Restaure monitor color parameters
if (_NeedToRestaureGammaRamp)

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

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

7
code/ryzom/client/src/events_listener.cpp
View file

@ -184,8 +184,8 @@ void CEventsListener::operator()(const CEvent& event)
}
// NOTE: No 0, 0 center mouse message in Windows (lower mouse message rate), but safe to assume any movement messages are requeued relative to our new position
// In case free look bugs on other platform, we may need to push in our own message on setMousePos for Windows
if (s_MouseFreeLookWaitCenter) // scX == 0 && scY == 0)
bool outsideBounds = ((abs(scX) > (drW >> 3)) || (abs(scY) > (drH >> 3)));
if (s_MouseFreeLookWaitCenter && !outsideBounds)
{
// Centered, set last to 0
s_MouseFreeLookLastX = 0;
@ -204,8 +204,7 @@ void CEventsListener::operator()(const CEvent& event)
// updateFreeLookPos is called in updateMouseSmoothing per frame
// Center cursor
bool outsideBounds = ((abs(scX) > (drW >> 3)) || (abs(scY) > (drH >> 3)));
if (outsideBounds)
if (outsideBounds && !s_MouseFreeLookWaitCenter)
{
s_MouseFreeLookWaitCenter = true;
Driver->setMousePos(0.5f, 0.5f);

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

@ -17,7 +17,7 @@
#ifndef RYZOM_VERSION_H
#define RYZOM_VERSION_H
#define RYZOM_VERSION "ryzomcore/v0.11.0-dev"
#define RYZOM_VERSION "ryzomcore/v0.11.1"
#endif // RYZOM_VERSION_H