Merge remote-tracking branch 'upstream/main' into fix-balloons

omarcopires · Oct 31, 2024 · 6c76fcf · 6c76fcf
2 parents d914f73 + ff57174
commit 6c76fcf
Show file tree

Hide file tree

Showing 653 changed files with 24,348 additions and 18,618 deletions.
diff --git a/cmake/modules/CanaryLib.cmake b/cmake/modules/CanaryLib.cmake
@@ -62,6 +62,7 @@ target_include_directories(${PROJECT_NAME}_lib
         ${GMP_INCLUDE_DIRS}
         ${LUAJIT_INCLUDE_DIRS}
         ${PARALLEL_HASHMAP_INCLUDE_DIRS}
+        ${ATOMIC_QUEUE_INCLUDE_DIRS}
 )
 
 # *****************************************************************************

diff --git a/data-otservbr-global/lib/core/quests.lua b/data-otservbr-global/lib/core/quests.lua