aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-12-06 20:29:22 +01:00
commit 5ce03c278b
9 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeModules/nel.cmake
View file

@ -881,14 +881,14 @@ MACRO(NL_SETUP_BUILD)
ENDIF() ENDIF()
IF(WITH_WARNINGS) IF(WITH_WARNINGS)
ADD_PLATFORM_FLAGS("-Wall -W") ADD_PLATFORM_FLAGS("-Wall")
ELSE() ELSE()
# Check wrong formats in printf-like functions # Check wrong formats in printf-like functions
ADD_PLATFORM_FLAGS("-Wformat -Werror=format-security") ADD_PLATFORM_FLAGS("-Wformat -Werror=format-security")
ENDIF() ENDIF()
# never display these warnings because they are minor # never display these warnings because they are minor
ADD_PLATFORM_FLAGS("-Wno-unused-parameter") ADD_PLATFORM_FLAGS("-Wno-unused-parameter -Wno-unused-private-field -Wno-unused-local-typedef -Wno-unused-variable")
IF(ANDROID) IF(ANDROID)
ADD_PLATFORM_FLAGS("--sysroot=${PLATFORM_ROOT}") ADD_PLATFORM_FLAGS("--sysroot=${PLATFORM_ROOT}")

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

@ -501,8 +501,11 @@ bool CDriverGL::unInit()
// restore default X errors handler // restore default X errors handler
XSetErrorHandler(NULL); XSetErrorHandler(NULL);
XCloseDisplay(_dpy); if (_dpy)
_dpy = NULL; {
XCloseDisplay(_dpy);
_dpy = NULL;
}
#endif // NL_OS_UNIX #endif // NL_OS_UNIX

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

@ -724,7 +724,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
nlassert (node); nlassert (node);
// Insert in the map // Insert in the map
weightMap.insert (std::map<float, INode*>::value_type (1, node)); weightMap.insert (std::map<float, INode*>::value_type (1.f, node));
} }
} }

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

@ -589,10 +589,10 @@ void EditPatchMod::UpdateSelectDisplay()
for (j = 0; j < thePatch->tileSel.GetSize(); j++) for (j = 0; j < thePatch->tileSel.GetSize(); j++)
if (thePatch->tileSel[j]) if (thePatch->tileSel[j])
break; break;
buf.printf("Tile %d Selected", j + 1); buf.printf(_T("Tile %d Selected"), j + 1);
} }
else else
buf.printf("%d Tiles Selected", num); buf.printf(_T("%d Tiles Selected"), num);
} }
break; break;
} }
@ -733,7 +733,7 @@ void EditPatchMod::DoVertReset ()
} }
ResolveTopoChanges(); ResolveTopoChanges();
theHold.Accept("Reset Vertex"); theHold.Accept(_M("Reset Vertex"));
/*if (holdNeeded) /*if (holdNeeded)
{ {
ResolveTopoChanges(); ResolveTopoChanges();

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

@ -223,7 +223,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
ep =(EditPatchMod *)lParam; ep =(EditPatchMod *)lParam;
ep->hSurfPanel = hDlg; ep->hSurfPanel = hDlg;
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG)ep); SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
if (!ep->settingViewportTess && ep->settingDisp && ep->GetProdTess().type == TESS_SET) if (!ep->settingViewportTess && ep->settingDisp && ep->GetProdTess().type == TESS_SET)
ep->settingDisp = FALSE; ep->settingDisp = FALSE;
TessApprox t; TessApprox t;

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

@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
__declspec( dllexport ) const TCHAR * __declspec( dllexport ) const TCHAR *
LibDescription() LibDescription()
{ {
return "NeL patch painter"; return _T("NeL patch painter");
} }

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

@ -8852,7 +8852,7 @@ void CCharacterCL::animIndex(TAnimationType channel, CAnimation::TAnimId index)
else else
{ {
// Check the AnimSet needed to get the animation Id. // Check the AnimSet needed to get the animation Id.
CHECK(_CurrentAnimSet[channel]); CHECK(_CurrentAnimSet[channel] != NULL);
// Get the Pointer on the animation state, if Null, return empty // Get the Pointer on the animation state, if Null, return empty
const CAnimationState *animStatePtr = _CurrentAnimSet[channel]->getAnimationState( (animState(channel)==CAnimationStateSheet::Emote)?_SubStateKey:animState(channel)); const CAnimationState *animStatePtr = _CurrentAnimSet[channel]->getAnimationState( (animState(channel)==CAnimationStateSheet::Emote)?_SubStateKey:animState(channel));
if(animStatePtr == 0) if(animStatePtr == 0)

2
code/ryzom/client/src/r2/instance_map_deco.cpp
View file

@ -386,7 +386,7 @@ void CInstanceMapDeco::onUpdate(CGroupMap &groupMap)
} }
float size = CV_MapEntityFarArrowSize.get(); float size = CV_MapEntityFarArrowSize.get();
// TMP TMP // TMP TMP
size = size; // size = size;
float bias = 1.f; float bias = 1.f;
dir.normalize(); dir.normalize();
CVector2f winInter; CVector2f winInter;

5
dist/snap/readme.txt vendored Normal file
View file

@ -0,0 +1,5 @@
- to install snapcraft : sudo apt-get install snapcraft snapd
- to generate snap : snapcraft
- to clean build directory : snapcraft clean ryzom --step build
- to install a .snap : sudo snap install <file .snap> --dangerous
- to uninstall an installed .snap : sudo snap remove ryzom