merge

code/nel/tools/3d/ligo/plugin_max/script.cpp

@@ -64,7 +64,7 @@
 #include "nel/../../src/ligo/ligo_error.h"
 #include "nel/../../src/ligo/ligo_material.h"
 #include "nel/../../src/ligo/transition.h"
-#include "nel/../../src/ligo/zone_bank.h"
+#include "nel/ligo/zone_bank.h"
 
 #include "max_to_ligo.h"
 

code/nel/tools/3d/tile_edit_qt/browser_model.cpp

@@ -36,14 +36,6 @@ static const char* comp[]={"Red", "Green", "Blue", "Alpha", ""};
 
 bool RemovePath (std::string& path, const char* absolutePathToRemplace);
 
-
-//TODO titegus: Get rid of that .... F2 Key not cross-platform ?? What the point in not performing Border Check ??
-bool zouille ()
-{
-	//return (GetAsyncKeyState(VK_F2)&(1<<15)) != 0;
-	return false;
-};
-
 // Rotate a buffer
 void rotateBuffer (std::vector<NLMISC::CBGRA> &Buffer, uint &Width, uint &Height)
 {
@@ -303,7 +295,7 @@ bool TileList::setTile128 (int tile, const std::string& name, NL3D::CTile::TBitm
 			else
 				error=tileBankBrowser.getTileSet(_tileSet)->checkTile128 (type, border, pixel, composante);
 
-			if ((error!=CTileSet::ok)&&(error!=CTileSet::addFirstA128128)&&!zouille ())
+			if ((error!=CTileSet::ok)&&(error!=CTileSet::addFirstA128128))
 			{
 				QString pixelMessage = QObject::tr("%1\nPixel: %2(%3).\nContinue ?").arg(CTileSet::getErrorMessage (error)).arg(pixel).arg(comp[composante]);
 				return ( QMessageBox::Yes == QMessageBox::question( NULL, QObject::tr("Can't set Bitmap"),  pixelMessage, QMessageBox::Yes | QMessageBox::No) );
@@ -367,7 +359,7 @@ bool TileList::setTile256 (int tile, const std::string& name, NL3D::CTile::TBitm
 				error=CTileSet::ok;
 			else
 				error=tileBankBrowser.getTileSet(_tileSet)->checkTile256 (type, border, pixel, composante);
-			if ((error!=CTileSet::ok)&&!zouille())
+			if ((error!=CTileSet::ok))
 			{
 				QString pixelMessage = QObject::tr("%1\nPixel: %2(%3).\nContinue ?").arg(CTileSet::getErrorMessage (error)).arg(pixel).arg(comp[composante]);
 				return ( QMessageBox::Yes == QMessageBox::question( NULL, QObject::tr("Can't set Bitmap"),  pixelMessage, QMessageBox::Yes | QMessageBox::No) );
@@ -429,7 +421,7 @@ bool TileList::setTileTransition (int tile, const std::string& name, NL3D::CTile
 				error=CTileSet::ok;
 			else
 				error=tileBankBrowser.getTileSet(_tileSet)->checkTile128 (type, border, pixel, composante);
-			if ((error!=CTileSet::ok)&&(error!=CTileSet::addFirstA128128)&&!zouille ())
+			if ((error!=CTileSet::ok)&&(error!=CTileSet::addFirstA128128))
 			{
 				QString pixelMessage = QObject::tr("%1\nPixel: %2(%3).\nContinue ?").arg(CTileSet::getErrorMessage (error)).arg(pixel).arg(comp[composante]);
 				return ( QMessageBox::Yes == QMessageBox::question( NULL, QObject::tr("Can't set Bitmap"),  pixelMessage, QMessageBox::Yes | QMessageBox::No) );
@@ -540,7 +532,7 @@ bool TileList::setTileTransitionAlpha (int tile, const std::string& name, int ro
 			int pixel=-1;
 			int composante=4;
 			if (((error=tileBankBrowser.getTileSet(_tileSet)->checkTileTransition ((CTileSet::TTransition)tile, CTile::alpha, border, indexError,
-				pixel, composante))!=CTileSet::ok)&&!zouille ())
+				pixel, composante))!=CTileSet::ok))
 			{
 				QString pixelMessage;
 				if ((error==CTileSet::topInterfaceProblem)||(error==CTileSet::bottomInterfaceProblem)||(error==CTileSet::leftInterfaceProblem)

code/ryzom/server/shard_start_cmake.bat

@@ -0,0 +1,105 @@
+@echo off
+
+REM This script will start all the services with good parameters
+
+REM set MODE=Debug
+set MODE=..\..\build\bin\Release
+
+rem AS
+start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  bms_master
+start %MODE%\ryzom_backup_service --writepid -P49990
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  egs
+start %MODE%\ryzom_entities_game_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  gpms
+start %MODE%\ryzom_gpm_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  ios
+start %MODE%\ryzom_ios_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  rns
+start %MODE%\ryzom_naming_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  rws
+start %MODE%\ryzom_welcome_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  ts
+start %MODE%\ryzom_tick_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  ms
+start %MODE%\ryzom_mirror_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  ais_newbyland
+start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  mfs
+start %MODE%\ryzom_mail_forum_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  su
+start %MODE%\ryzom_shard_unifier_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  fes
+start %MODE%\ryzom_frontend_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  sbs
+start %MODE%\ryzom_session_browser_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  lgs
+start %MODE%\ryzom_logger_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  lgs
+start %MODE%\ryzom_dynamic_scenario_service --writepid
+
+rem wait 2s (yes, i didn't find a better way to wait N seconds)
+ping -n 2 127.0.0.1 > NUL 2>&1
+
+rem  ras
+start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid

code/ryzom/server/shard_stop_cmake.bat

@@ -0,0 +1,54 @@
+@echo off
+
+REM This script will kill all the services launched by shard_start.bat
+
+rem AS
+taskkill /IM ryzom_admin_service.exe
+
+rem  bms_master
+taskkill /IM ryzom_backup_service.exe
+
+rem  egs
+taskkill /IM ryzom_entities_game_service.exe
+
+rem  gpms
+taskkill /IM ryzom_gpm_service.exe
+
+rem  ios
+taskkill /IM ryzom_ios_service.exe
+
+rem  rns
+taskkill /IM ryzom_naming_service.exe
+
+rem  rws
+taskkill /IM ryzom_welcome_service.exe
+
+rem  ts
+taskkill /IM ryzom_tick_service.exe
+
+rem  ms
+taskkill /IM ryzom_mirror_service.exe
+
+rem  ais_newbyland
+taskkill /IM ryzom_ai_service.exe
+
+rem  mfs
+taskkill /IM ryzom_mail_forum_service.exe
+
+rem  su
+taskkill /IM ryzom_shard_unifier_service.exe
+
+rem  fes
+taskkill /IM ryzom_frontend_service.exe
+
+rem  sbs
+taskkill /IM ryzom_session_browser_server.exe
+
+rem  lgs
+taskkill /IM ryzom_logger_service.exe
+
+rem  dss
+taskkill /IM ryzom_dynamic_scenario_service.exe
+
+rem  ras
+taskkill /IM ryzom_admin_service.exe

code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt

@@ -1,3 +1,8 @@
 ADD_SUBDIRECTORY(land_export)
 ADD_SUBDIRECTORY(land_export_lib)
 
+ADD_SUBDIRECTORY(world_editor)
+ADD_SUBDIRECTORY(world_editor_primitive_plugin)
+
+# This is an old plugin and is deprecated. It doesn't even compile anymore.
+#ADD_SUBDIRECTORY(world_editor_plugin)

code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt

@@ -0,0 +1,30 @@
+FILE(GLOB SRC *.cpp *.h)
+
+LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/export_cb_dlg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/builder_logic.cpp)
+
+ENABLE_LANGUAGE(RC)
+ADD_DEFINITIONS(${MFC_DEFINITIONS})
+SET(CMAKE_MFC_FLAG 2)
+
+ADD_EXECUTABLE(world_editor WIN32 ${SRC} world_editor.rc res/world_editor.rc2)
+
+SOURCE_GROUP(Resources FILES world_editor.rc res/world_editor.rc2)
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(world_editor	
+					nelmisc
+					nelligo
+					nel3d
+					nelgeorges
+					nelpacs
+					${LIBXML2_LIBRARIES})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
+NL_DEFAULT_PROPS(world_editor "Ryzom, Tools, World: World Editor")
+NL_ADD_RUNTIME_FLAGS(world_editor)
+
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(world_editor ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.cpp)
+ENDIF(WITH_PCH)
+
+INSTALL(TARGETS world_editor RUNTIME DESTINATION bin COMPONENT tools)

code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h

@@ -105,8 +105,8 @@
 #include <nel/pacs/u_global_retriever.h>
 #include <nel/ligo/ligo_config.h>
 
-#include <ligo/zone_bank.h>
+#include <nel/ligo/zone_bank.h>
-#include <ligo/zone_region.h>
+#include <nel/ligo/zone_region.h>
 
 extern bool	DontUse3D;
 

code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h

@@ -22,7 +22,7 @@
 #define AFX_WORLD_EDITOR_DOC_H__79C92BF7_274F_4B2C_A546_91B7E5218C49__INCLUDED_
 
 #include <nel/ligo/primitive_class.h>
-#include <nel/../../src/ligo/zone_region.h>
+#include <nel/ligo/zone_region.h>
 #include <hash_set>
 
 #if _MSC_VER > 1000

code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt

@@ -0,0 +1,26 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_LIBRARY(world_editor_plugin SHARED ${SRC} world_editor_plugin.rc)
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(world_editor_plugin 
+							nelmisc
+							nel3d
+							nelsound
+							nelsnd_lowlevel
+							Version.lib)
+							
+NL_DEFAULT_PROPS(world_editor_plugin "Ryzom, Tools, World: World Editor Plugin DLL")
+NL_ADD_RUNTIME_FLAGS(world_editor_plugin)
+NL_ADD_LIB_SUFFIX(world_editor_plugin)
+
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
+
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(world_editor_plugin ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
+ENDIF(WITH_PCH)
+
+INSTALL(TARGETS world_editor_plugin LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
+INSTALL(FILES WorldEditorPlugin.cfg DESTINATION bin COMPONENT tools3d)
+

code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt

@@ -0,0 +1,21 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_LIBRARY(world_editor_primitive_plugin SHARED ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(world_editor_primitive_plugin 
+							nelmisc
+							nel3d
+							nelsound
+							nelsnd_lowlevel)
+							
+NL_DEFAULT_PROPS(world_editor_primitive_plugin "Ryzom, Tools, World: World Editor Primitive Plugin")
+NL_ADD_RUNTIME_FLAGS(world_editor_primitive_plugin)
+NL_ADD_LIB_SUFFIX(world_editor_primitive_plugin)
+
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
+
+
+INSTALL(TARGETS world_editor_primitive_plugin LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
+