From 53892c7f7e1d298607da08ef8ad548f40dd9184e Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 29 Jan 2022 14:44:28 +0800 Subject: [PATCH 1/3] Remove temporary debugging code, ref kaetemi/ryzomclassic#152 --- ryzom/server/src/ai_service/ai_outpost.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ryzom/server/src/ai_service/ai_outpost.cpp b/ryzom/server/src/ai_service/ai_outpost.cpp index 99dcbcee1..981fb62e5 100644 --- a/ryzom/server/src/ai_service/ai_outpost.cpp +++ b/ryzom/server/src/ai_service/ai_outpost.cpp @@ -883,7 +883,6 @@ void COutpost::createSquad(CGroupDesc const* groupDesc, COu grp->_UpdateNbTicks = 10; grp->respawnTime() = respawTimeGC; - grp->getDebugHistory()->setRecording(true); // FIXME: https://github.com/kaetemi/ryzomclassic/issues/152 grp->updateStateInstance(); // Directly call his first state (to retrieve associated params). if (createOrder!=0) From 401d2cbc3aa7bf6dde0f200671cbbd46500187d4 Mon Sep 17 00:00:00 2001 From: nimetu Date: Sat, 29 Jan 2022 11:29:43 +0200 Subject: [PATCH 2/3] Update hunter to 0.23.321 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c7103cfe..d5300a609 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,8 +41,8 @@ OPTION(HUNTER_ENABLED "Enable Hunter package manager" OFF) IF(HUNTER_ENABLED) INCLUDE("CMakeModules/HunterGate.cmake") HunterGate( - URL "https://github.com/cpp-pm/hunter/archive/v0.23.317.tar.gz" - SHA1 "fbdd94b1966d351384e27b02c8d134915b1131d6" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz" + SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492" FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake" ) From 4a3490945970de70ec60c61bf0cf5fd274968dea Mon Sep 17 00:00:00 2001 From: nimetu Date: Sat, 29 Jan 2022 11:31:10 +0200 Subject: [PATCH 3/3] Update azure-pipelines.yml with new hunter tag --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dc9524d24..6894e2055 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -127,7 +127,7 @@ jobs: condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON') - task: Cache@2 inputs: - key: 'hunter317-$(releaseName)' + key: 'hunter321-$(releaseName)' path: '$(Pipeline.Workspace)/.hunter/_Base/Cache' - task: CMake@1 displayName: 'Configure'