Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Master -> C17 #67

Draft
wants to merge 29 commits into
base: C17
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f8a3c2a
Add Additional Badges
billy1arm Jul 8, 2022
ff9ee9a
Fix broken link image
billy1arm Jul 8, 2022
1235117
Fix Eluna logging by defining ENABLE_ELUNA (#179)
Rochet2 Sep 11, 2022
9947baf
Fix Docker build CMake version (#180)
PargeLenis Oct 7, 2022
909aa45
Update DockerFile-mangosd (#190)
fly-man- Oct 7, 2022
d4a229e
Add maximum check for OpenSSL versions greater then supported version.
Meltie2013 Oct 7, 2022
bf1c52e
Update submodule related files
billy1arm Dec 31, 2022
ce3aaf1
Happy New Year 2023 from everyone at getMangos.eu :tada:
billy1arm Dec 31, 2022
8760ab1
Nuke whitespaces from previous commits
Meltie2013 Jan 5, 2023
1e8f2a6
Fix character creation
billy1arm Jan 11, 2023
5188625
Player Taxi Refactor (#31)
Meltie2013 Jan 13, 2023
1c27e68
[Core/PacketIO] Use ByteBuffer from UpdateData
Meltie2013 Jan 13, 2023
32717c9
Implement Optional helper class
Meltie2013 Jan 14, 2023
53b3153
Improve timezone handling (#62)
Meltie2013 Jan 14, 2023
36659de
Ported Ticketing system changes from M1
billy1arm Jan 17, 2023
1a86e20
[DEP] Fix compile warning
billy1arm Jan 18, 2023
c7621e9
Fix compile warning
billy1arm Jan 18, 2023
c73fc71
[DEP] Updated zlib to 1.2.13. Thanks @Muehe for pointing
billy1arm Jan 18, 2023
3cffd86
Updated Easybuild to 2.3.0 and fixed Pre-Req file download
billy1arm Jan 21, 2023
1f1970b
Unordered Macro Refactor (#64)
Meltie2013 Jan 23, 2023
9ab6fb5
Merge Master -> C17 (#1)
Meltie2013 Jan 23, 2023
1ff23ee
Fix compiling error with unordered_map namespace
Meltie2013 Jan 24, 2023
73a1661
Move std::ptr_fun into a lumda
Meltie2013 Jan 24, 2023
8054d71
Fix PlayerTaxi class not being found
Meltie2013 Jan 24, 2023
4cc8a10
Disable PCH for windows build
billy1arm Jan 24, 2023
08e397b
Disable PCH for Linux Build
billy1arm Jan 24, 2023
6fcc47a
Another attempt on a fix
Meltie2013 Jan 24, 2023
f8bcc2e
Merge branch 'master' of github.com:mangosthree/server into C17
Meltie2013 Jan 24, 2023
f8fefac
Update workflow for Windows
Meltie2013 Jun 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/.git
14 changes: 9 additions & 5 deletions .github/workflows/core_windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,18 @@ jobs:
strategy:
fail-fast: false

runs-on: windows-2019
name: Windows Server 2019
runs-on: windows-latest

steps:
- uses: actions/checkout@v2

- name: Configure Windows
run: choco install --no-progress openssl
- name: Setup Windows 10 SDK Action
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 22621

- name: Install OpenSSL
run: choco install --no-progress openssl --version=3.3.1

- name: Checkout Submodules
shell: bash
Expand All @@ -28,5 +32,5 @@ jobs:
shell: bash
run: |
mkdir -p build && cd build
cmake .. -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=0 -DUSE_STORMLIB:BOOL=1 -DBUILD_SHARED_LIBS:BOOL=1
cmake .. -DCMAKE_SYSTEM_VERSION=10.0.22621.0 -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=1 -DUSE_STORMLIB:BOOL=1
cmake --build . --config Release --parallel 4
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MaNGOS is a full featured server for World of Warcraft, supporting
# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
#
# Copyright (C) 2005-2022 MaNGOS <https://getmangos.eu>
# Copyright (C) 2005-2023 MaNGOS <https://getmangos.eu>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[<img src='https://www.getmangos.eu/!assets_mangos/currentlogo.gif' width="48" border=0>][8]
[<img src='https://www.getmangos.eu/!assets_mangos/logo2.png' border=0>][3]
[<img alt="Latest GitHub release" src="https://img.shields.io/github/release/mangosthree/server.svg?style=flat-square" border=0 valign="top"/>][60]
[<img src="https://img.shields.io/github/last-commit/mangosthree/server.svg?style=flat-square&logo=github&logoColor=white"
alt="GitHub last commit" border=0 valign="top"/>][61]
[<img alt="Downloads on GitHub" src="https://img.shields.io/github/downloads/mangosthree/server/total.svg?style=flat-square" border=0 valign="top"/>][61]

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Build Status:</b>
Linux/MAC: [<img src='https://github.com/mangosthree/server/actions/workflows/core_build.yml/badge.svg' border=0 valign="middle">][10]
Windows: [<img src='https://ci.appveyor.com/api/projects/status/github/mangosthree/server?branch=master&svg=true' border=0 valign="middle">][11]
<br><b>Repository Status:</b>
[<img src='https://api.codacy.com/project/badge/Grade/58227f14b9024384a22e4e12e3cf7a89' border=0 valign="middle"/>][12]
[<img src='https://api.codacy.com/project/badge/Grade/d54b4c8fec4746498fd05f84a4e7e5d4' border=0 valign="middle"/>][12]
[<img src='https://www.codefactor.io/repository/github/mangosthree/server/badge' border=0 valign="middle"/>][13]
[<img src='https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat' border=0 valign="middle"/>][14]
[<img src='https://img.shields.io/discord/286167585270005763.svg' border=0 valign="middle"/>][9]
Expand Down Expand Up @@ -203,3 +207,6 @@ World of Warcraft, and all related art, images, and lore are copyright [Blizzard
[53]: http://www.zlib.net/ "Zlib"
[54]: http://www.bzip.org/ "Bzip2"
[55]: http://slproweb.com/products/Win32OpenSSL.html "OpenSSL for Windows"
[60]: https://github.com/mangosthree/server/releases/latest
[61]: https://github.com/mangosthree/server/releases
[62]: https://github.com/mangosthree/server/commits/master
2 changes: 1 addition & 1 deletion apps/ci/ci-compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ time test -d _install || mkdir _install
time cd _build

# Run CMake Configurations
time cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=1 -DUSE_STORMLIB:BOOL=1 -DBUILD_SHARED_LIBS:BOOL=1
time cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=1 -DUSE_STORMLIB:BOOL=1 -DBUILD_SHARED_LIBS:BOOL=1 -DPCH:BOOL=0

# Compile the Project
time make -j 6
2 changes: 1 addition & 1 deletion cmake/EnsureVersion.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MaNGOS is a full featured server for World of Warcraft, supporting
# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
#
# Copyright (C) 2005-2022 MaNGOS <https://getmangos.eu>
# Copyright (C) 2005-2023 MaNGOS <https://getmangos.eu>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion cmake/MangosParams.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(MANGOS_EXP "CATA")
set(MANGOS_PKG "Mangos Three")
set(MANGOS_WORLD_VER 2021010100)
set(MANGOS_WORLD_VER 2023011700)
set(MANGOS_REALM_VER 2021010100)
set(MANGOS_AHBOT_VER 2021010100)
2 changes: 1 addition & 1 deletion cmake/win/VersionInfo.rc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BEGIN
VALUE "ProductName", PRODUCT_BUNDLE
VALUE "ProductVersion", PRODUCT_VERSION_RESOURCE_STR
VALUE "FileDescription", PRODUCT_FILE_DESCRIPTION
VALUE "LegalCopyright", "Copyright (C) 2005-2022 MaNGOS"
VALUE "LegalCopyright", "Copyright (C) 2005-2023 MaNGOS"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion contrib/soap/example.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* MaNGOS is a full featured server for World of Warcraft, supporting
* the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
*
* Copyright (C) 2005-2022 MaNGOS <https://getmangos.eu>
* Copyright (C) 2005-2023 MaNGOS <https://getmangos.eu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
8 changes: 4 additions & 4 deletions dep/StormLib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,10 @@ else()
endif()

if (NOT STORM_SKIP_INSTALL)
install(TARGETS ${LIBRARY_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
install(TARGETS ${LIBRARY_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
FRAMEWORK DESTINATION /Library/Frameworks
PUBLIC_HEADER DESTINATION include
INCLUDES DESTINATION include)
Expand Down
Loading
Loading