Merge remote-tracking branch 'origin/core4' into feature/quick-start-py

feature/quick-start-py
kaetemi 3 years ago
commit 7199733e4a
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -41,8 +41,8 @@ OPTION(HUNTER_ENABLED "Enable Hunter package manager" OFF)
IF(HUNTER_ENABLED) IF(HUNTER_ENABLED)
INCLUDE("CMakeModules/HunterGate.cmake") INCLUDE("CMakeModules/HunterGate.cmake")
HunterGate( HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.23.317.tar.gz" URL "https://github.com/cpp-pm/hunter/archive/v0.23.321.tar.gz"
SHA1 "fbdd94b1966d351384e27b02c8d134915b1131d6" SHA1 "5e53cbb0429037ea8e2592bfd92704b8ff3ab492"
FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake" FILEPATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules/HunterConfig.cmake"
) )

@ -127,7 +127,7 @@ jobs:
condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON') condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON')
- task: Cache@2 - task: Cache@2
inputs: inputs:
key: 'hunter317-$(releaseName)' key: 'hunter321-$(releaseName)'
path: '$(Pipeline.Workspace)/.hunter/_Base/Cache' path: '$(Pipeline.Workspace)/.hunter/_Base/Cache'
- task: CMake@1 - task: CMake@1
displayName: 'Configure' displayName: 'Configure'

@ -883,7 +883,6 @@ void COutpost::createSquad(CGroupDesc<COutpostSquadFamily> const* groupDesc, COu
grp->_UpdateNbTicks = 10; grp->_UpdateNbTicks = 10;
grp->respawnTime() = respawTimeGC; 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). grp->updateStateInstance(); // Directly call his first state (to retrieve associated params).
if (createOrder!=0) if (createOrder!=0)

Loading…
Cancel
Save