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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-04-25 19:49:15 +02:00
commit a21ebfe544
13 changed files with 34 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/include/nel/gui/group_html.h
View file

@ -457,7 +457,7 @@ namespace NLGUI
} }
std::vector<bool> _FontOblique; std::vector<bool> _FontOblique;
inline uint getFontOblique() const inline bool getFontOblique() const
{ {
if (_FontOblique.empty()) if (_FontOblique.empty())
return false; return false;
@ -465,7 +465,7 @@ namespace NLGUI
} }
std::vector<bool> _FontUnderlined; std::vector<bool> _FontUnderlined;
inline uint getFontUnderlined() const inline bool getFontUnderlined() const
{ {
if (_FontUnderlined.empty()) if (_FontUnderlined.empty())
return false; return false;
@ -473,7 +473,7 @@ namespace NLGUI
} }
std::vector<bool> _FontStrikeThrough; std::vector<bool> _FontStrikeThrough;
inline uint getFontStrikeThrough() const inline bool getFontStrikeThrough() const
{ {
if (_FontStrikeThrough.empty()) if (_FontStrikeThrough.empty())
return false; return false;

2
code/ryzom/client/src/CMakeLists.txt
View file

@ -88,7 +88,6 @@ INCLUDE_DIRECTORIES(
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
${LUABIND_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR}
${LIBWWW_INCLUDE_DIR}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
) )
@ -108,7 +107,6 @@ TARGET_LINK_LIBRARIES(ryzom_client
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${LUABIND_LIBRARIES} ${LUABIND_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${LIBWWW_LIBRARIES}
${SEVENZIP_LIBRARY} ${SEVENZIP_LIBRARY}
) )

12
code/ryzom/client/src/character_cl.cpp
View file

@ -8369,7 +8369,7 @@ ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) /
// Display the Run Factor. // Display the Run Factor.
TextContext->printfAt(x, y, "(Walk)Run Factor: %f", runFactor()); TextContext->printfAt(x, y, "(Walk)Run Factor: %f", runFactor());
y += lineStep; y += lineStep;
// Display the current animation name(id)(offset)(nbloop) pour le channel MOVE. // Display the current animation name(id)(offset)(nbloop) for channel MOVE.
TextContext->printfAt(x, y, "Current Animation: %s(%u)(%lf)(%u loops)", animId(MOVE)==std::numeric_limits<uint>::max()?"[NONE]":currentAnimationName().c_str(), animId(MOVE), animOffset(MOVE), _NbLoopAnim); TextContext->printfAt(x, y, "Current Animation: %s(%u)(%lf)(%u loops)", animId(MOVE)==std::numeric_limits<uint>::max()?"[NONE]":currentAnimationName().c_str(), animId(MOVE), animOffset(MOVE), _NbLoopAnim);
y += lineStep; y += lineStep;
// First Pos // First Pos
@ -8388,14 +8388,8 @@ ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) /
TextContext->printfAt(x, y, "Prim Pos: %f %f %f", primFinalPos.x, primFinalPos.y, primFinalPos.z); TextContext->printfAt(x, y, "Prim Pos: %f %f %f", primFinalPos.x, primFinalPos.y, primFinalPos.z);
y += lineStep; y += lineStep;
} }
// Skeleton Ptr // Skeleton Ptr, Animset Ptr and Current State Ptr
TextContext->printfAt(x, y, "Skel Ptr: %p", &_Skeleton); TextContext->printfAt(x, y, "Skel Ptr: %p - AnimSet Ptr: %p - State Ptr: %p", &_Skeleton, _CurrentAnimSet[MOVE], _CurrentState);
y += lineStep;
// Animset Ptr
TextContext->printfAt(x, y, "AnimSet Ptr: %p", _CurrentAnimSet[MOVE]);
y += lineStep;
// Current State Ptr
TextContext->printfAt(x, y, "State Ptr: %p", _CurrentState);
y += lineStep; y += lineStep;
// Display the target mount and rider. // Display the target mount and rider.
TextContext->printfAt(x, y, "Mount: %3u(Theoretical: %3u) Rider: %3u(Theoretical: %3u)", mount(), _TheoreticalMount, rider(), _TheoreticalRider); TextContext->printfAt(x, y, "Mount: %3u(Theoretical: %3u) Rider: %3u(Theoretical: %3u)", mount(), _TheoreticalMount, rider(), _TheoreticalRider);

14
code/ryzom/client/src/entity_cl.cpp
View file

@ -2104,11 +2104,8 @@ void CEntityCL::setEntityName(const ucstring &name)
//--------------------------------------------------- //---------------------------------------------------
void CEntityCL::displayDebug(float x, float &y, float lineStep) // virtual void CEntityCL::displayDebug(float x, float &y, float lineStep) // virtual
{ {
// Type // Type and slot
TextContext->printfAt(x, y, "Type: %d", Type); TextContext->printfAt(x, y, "Type: %d - Slot: %d", Type, _Slot);
y += lineStep;
// Slot
TextContext->printfAt(x, y, "Slot: %d", _Slot);
y += lineStep; y += lineStep;
// Outpost // Outpost
TextContext->printfAt(x, y, "Outpost id:%d side:%s",this->getOutpostId(),OUTPOSTENUMS::toString(this->getOutpostSide()).c_str() ); TextContext->printfAt(x, y, "Outpost id:%d side:%s",this->getOutpostId(),OUTPOSTENUMS::toString(this->getOutpostSide()).c_str() );
@ -2119,11 +2116,8 @@ void CEntityCL::displayDebug(float x, float &y, float lineStep) // virtual
else else
TextContext->printfAt(x, y, "Name not received"); TextContext->printfAt(x, y, "Name not received");
y += lineStep; y += lineStep;
// Target // Target and DataSet Id
TextContext->printfAt(x, y, "Target: %d", _TargetSlot); TextContext->printfAt(x, y, "Target: %d - DataSet Id: %u", _TargetSlot, _DataSetId);
y += lineStep;
// DataSet Id
TextContext->printfAt(x, y, "DataSet Id: %u", _DataSetId);
y += lineStep; y += lineStep;
// Sheet Id // Sheet Id
TextContext->printfAt(x, y, "Sheet: %d(%s)", _SheetId.asInt(), _SheetId.toString().c_str()); TextContext->printfAt(x, y, "Sheet: %d(%s)", _SheetId.asInt(), _SheetId.toString().c_str());

5
code/ryzom/client/src/interface_v3/chat_displayer.h
View file

@ -25,11 +25,6 @@
#include "nel/misc/mutex.h" #include "nel/misc/mutex.h"
// to fix a conflict with syslog.h being included by libwww
#ifdef LOG_WARNING
#undef LOG_WARNING
#endif
/** /**
* class used to display console text commands in the chat window * class used to display console text commands in the chat window
* \author Nicolas Brigand * \author Nicolas Brigand

10
dist/debian/precise/debian/control vendored
View file

@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore
Package: libnel0 Package: libnel0
Section: libdevel Section: libdevel

2
dist/debian/precise/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install

10
dist/debian/trusty/debian/control vendored
View file

@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore
Package: libnel0 Package: libnel0
Section: libdevel Section: libdevel

2
dist/debian/trusty/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install

10
dist/debian/utopic/debian/control vendored
View file

@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore
Package: libnel0 Package: libnel0
Section: libdevel Section: libdevel

2
dist/debian/utopic/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install

10
dist/debian/vivid/debian/control vendored
View file

@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev,
libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev,
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
libboost-dev, libwww-dev, libmysqlclient-dev, libboost-dev, libmysqlclient-dev,
libcpptest-dev, libqt4-dev, libqt4-opengl-dev libcpptest-dev, libqt4-dev, libqt4-opengl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Section: games Section: games
Bugs: http://dev.ryzom.com/projects/ryzom/issues Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
Homepage: http://dev.ryzom.com Homepage: https://bitbucket.org/ryzom/ryzomcore/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore
Package: libnel0 Package: libnel0
Section: libdevel Section: libdevel

2
dist/debian/vivid/debian/rules vendored
View file

@ -12,7 +12,7 @@ override_dh_strip:
dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON
override_dh_install: override_dh_install:
dh_install dh_install