Merge from Git repository

--HG--
branch : develop
This commit is contained in:
NO-BREAK SPACE OÜ 2019-05-09 11:30:51 +00:00
commit 4ad51d82a4
103 changed files with 157 additions and 47 deletions

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(anim_builder ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_clod_bank ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_clodtex ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_coarse_mesh ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_far_bank ${SRC})

View file

@ -1,4 +1,4 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_shadow_skin ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_smallbank ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(get_neighbors ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,5 +1,7 @@
FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h)
FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(hls_bank_maker ${SRC})
TARGET_LINK_LIBRARIES(hls_bank_maker s3tc_compressor nelmisc nel3d)

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ig_add ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ig_elevation ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ig_lighter ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(lightmap_optimizer ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,9 +1,10 @@
FILE(GLOB SRCS *.cpp)
FILE(GLOB HDRS *.h)
FILE(GLOB RECS *.rc)
SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
SOURCE_GROUP("" FILES ${SRCS} ${HDRS} ${RECS})
ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS})
ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS} ${RECS})
TARGET_LINK_LIBRARIES(mesh_export mesh_utils nel3d nelmisc)
NL_DEFAULT_PROPS(mesh_export "NeL, Tools, 3D: Mesh Export")

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(panoply_maker ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(shapes_exporter WIN32 ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(tga2dds ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(tga_cut ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,11 +1,11 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(unbuild_interface ${SRC})
TARGET_LINK_LIBRARIES(unbuild_interface nelmisc)
NL_DEFAULT_PROPS(unbuild_interface "NeL, Tools, 3D: unbuild_interface")
NL_DEFAULT_PROPS(unbuild_interface "NeL, Tools, 3D: Unbuild Interface")
NL_ADD_RUNTIME_FLAGS(unbuild_interface)
INSTALL(TARGETS unbuild_interface RUNTIME DESTINATION bin COMPONENT tools3d)

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(zone_dependencies ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(zone_ig_lighter ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(zone_lighter ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(zone_welder ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(bnp_make ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(exec_timeout ${SRC})

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "yellow_pill.ico"

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(make_sheet_id ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(message_box WIN32 ${SRC})

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "yellow_pill.ico"

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -5,7 +5,9 @@ ENDIF()
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
FILE(GLOB MESSAGE_BOX_SRC *.cpp)
FILE(GLOB MESSAGE_BOX_SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${MESSAGE_BOX_SRC})
SET( QT_USE_QT3SUPPORT TRUE)
SET( QT_USE_QTXML TRUE)

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "yellow_pill.ico"

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_ig_boxes ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_indoor_rbank ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_rbank ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(r2_islands_textures ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(prim_export ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(land_export ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,14 +1,14 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/client/src/seven_zip)
SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h patch_gen.rc)
SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h patch_gen_service.rc)
ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
ADD_EXECUTABLE(patch_gen ${MAIN_SRC} ${RECS})
TARGET_LINK_LIBRARIES(patch_gen ryzom_sevenzip ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator")
NL_ADD_RUNTIME_FLAGS(patch_gen)
ADD_EXECUTABLE(patch_gen_service WIN32 ${SERVICE_SRC})
ADD_EXECUTABLE(patch_gen_service WIN32 ${SERVICE_SRC} ${RECS})
TARGET_LINK_LIBRARIES(patch_gen_service ryzom_sevenzip ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator Service")
NL_ADD_RUNTIME_FLAGS(patch_gen_service)

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "red_pill.ico"

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(ai_build_wmap ${SRC})

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp)
FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.cpp *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(build_world_packed_col ${SRC})

View file

@ -1,4 +1,6 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
ADD_EXECUTABLE(sheets_packer ${SRC}
${CMAKE_SOURCE_DIR}/ryzom/client/src/continent_manager_build.cpp

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

View file

@ -1,6 +1,12 @@
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB SRC *.cpp *.h *.rc)
SOURCE_GROUP("" FILES ${SRC})
FILE(GLOB EGSSHEETS ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service/egs_sheets/*.cpp ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service/egs_sheets/*.h)
SOURCE_GROUP("" FILES ${SRC})
SOURCE_GROUP("EGS Sheets" FILES ${EGSSHEETS})
ADD_EXECUTABLE(sheets_packer_shard ${SRC} ${EGSSHEETS}
${CMAKE_SOURCE_DIR}/ryzom/server/src/input_output_service/string_manager_sheet.cpp
${CMAKE_SOURCE_DIR}/ryzom/server/src/input_output_service/string_manager.h

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

@ -0,0 +1 @@
IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"

Some files were not shown because too many files have changed in this diff Show more