Skip to content

Commit 839abaf

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-vas-autobalance
2 parents 3b29a3f + 06b0384 commit 839abaf

255 files changed

Lines changed: 30665 additions & 23795 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ![logo](https://trinitycore.org/images/logo2.png) TrinityCore (3.3.5)
1+
# ![logo](https://community.trinitycore.org/public/style_images/1_trinitycore.png) TrinityCore (3.3.5)
22

33
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/TrinityCore/TrinityCore.svg)](https://isitmaintained.com/project/TrinityCore/TrinityCore "Average time to resolve an issue") [![Percentage of issues still open](https://isitmaintained.com/badge/open/TrinityCore/TrinityCore.svg)](https://isitmaintained.com/project/TrinityCore/TrinityCore "Percentage of issues still open")
44

cmake/compiler/msvc/settings.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ target_compile_options(trinity-warning-interface
2626
# disable permissive mode to make msvc more eager to reject code that other compilers don't already accept
2727
target_compile_options(trinity-compile-option-interface
2828
INTERFACE
29-
/permissive-)
29+
/permissive-
30+
/utf-8)
3031

3132
if(PLATFORM EQUAL 32)
3233
# mark 32 bit executables large address aware so they can use > 2GB address space

dep/PackageList.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ efsw (Entropia File System Watcher - crossplatform file system watcher)
1818

1919
fmt (a small, safe and fast formatting library)
2020
https://github.com/fmtlib/fmt
21-
Version: 10.2.1 https://github.com/fmtlib/fmt/releases/tag/10.2.1
21+
Version: 12.0.0 https://github.com/fmtlib/fmt/releases/tag/12.0.0
2222

2323
G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
2424
http://g3d.sourceforge.net/
2525
Version: 9.0-Release r4036
2626

2727
jemalloc (a general-purpose scalable concurrent malloc-implementation)
2828
https://github.com/jemalloc/jemalloc
29-
Version: 5.3.0
29+
Version: 5.3.1
3030

3131
libMPQ (a library for reading MPQ files)
3232
https://github.com/mbroemme/libmpq/

dep/fmt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
set(FMT_HEADERS
1212
include/fmt/args.h
13+
include/fmt/base.h
1314
include/fmt/chrono.h
1415
include/fmt/color.h
1516
include/fmt/compile.h

0 commit comments

Comments
 (0)