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.

Sign up for GitHub

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

[pull] master from mangostwo:master #171

Merged
merged 3 commits into from
Feb 13, 2025
Merged

[pull] master from mangostwo:master #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da1eac4
Fixed a typo
disturbedalive2011 Dec 1, 2020
81ceed3
Fix Actions runner issues (#206)
Foereaper Feb 13, 2025
39a7880
Fix up Eluna build for latest revision. Thanks @FoeReaper
Foereaper Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/core_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: sudo apt-get update -y

- name: Install Required Packages
run: sudo apt-get install -y git make cmake clang libssl-dev libbz2-dev build-essential default-libmysqlclient-dev libace-dev
run: sudo apt-get install -y git make cmake clang libssl-dev libbz2-dev build-essential default-libmysqlclient-dev libace-dev libreadline-dev

- name: Update Compilers
run: source ./apps/ci/ci-compiler-update.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/core_windows_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
sdk-version: 22621

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

- name: Checkout Submodules
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions src/game/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ if(SCRIPT_LIB_ELUNA)
${CMAKE_SOURCE_DIR}/src/modules/Eluna/*.h
${CMAKE_SOURCE_DIR}/src/modules/Eluna/hooks/*.cpp
${CMAKE_SOURCE_DIR}/src/modules/Eluna/hooks/*.h
${CMAKE_SOURCE_DIR}/src/modules/Eluna/methods/*.cpp
${CMAKE_SOURCE_DIR}/src/modules/Eluna/methods/*.h
${CMAKE_SOURCE_DIR}/src/modules/Eluna/methods/Mangos/*.cpp
${CMAKE_SOURCE_DIR}/src/modules/Eluna/methods/Mangos/*.h
)
Expand Down
2 changes: 1 addition & 1 deletion src/game/Warden/Modules/WardenModuleWin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Seed: 4D808D2C77D905C41A6380EC08586AFE (0x05 packet)
Hash: 568C054C781A972A6037A2290C22B52571A06F4E (0x04 packet)
Module MD5: 79C0768D657977D697E10BAD956CCED1
New Client Key: 7F 96 EE FD A5 B6 3D 20 A4 DF 8E 00 CB F4 83 04
New Cerver Key: C2 B7 AD ED FC CC A9 C2 BF B3 F8 56 02 BA 80 9B
New Server Key: C2 B7 AD ED FC CC A9 C2 BF B3 F8 56 02 BA 80 9B
*/

struct Module_79C0768D657977D697E10BAD956CCED1
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Eluna
Open in desktop
Submodule Eluna updated 49 files
+2 −2 .github/workflows/build.yml
+7 −13 ElunaLoader.cpp
+87 −0 ElunaTemplate.cpp
+46 −2 ElunaTemplate.h
+14 −11 LuaEngine.cpp
+0 −4 LuaEngine.h
+0 −227 LuaFunctions.cpp
+36 −44 README.md
+2 −2 docs/ElunaDoc/__main__.py
+75 −29 docs/ElunaDoc/parser.py
+ − docs/ElunaDoc/static/eluna-logo.png
+311 −0 docs/ElunaDoc/static/highlight.css
+323 −0 docs/ElunaDoc/static/highlight.min.js
+15 −0 docs/ElunaDoc/static/lua.min.js
+172 −68 docs/ElunaDoc/static/main.css
+0 −7 docs/ElunaDoc/static/main.js
+22 −0 docs/ElunaDoc/static/theme.js
+34 −13 docs/ElunaDoc/templates/_base.html
+2 −4 docs/ElunaDoc/templates/method.html
+27 −0 methods/CMangos/CustomMethods.h
+17 −1 methods/CMangos/GameObjectMethods.h
+17 −4 methods/CMangos/GlobalMethods.h
+115 −1 methods/CMangos/ItemMethods.h
+18 −1 methods/CMangos/PlayerMethods.h
+0 −7 methods/CMangos/UnitMethods.h
+27 −0 methods/Mangos/CustomMethods.h
+2 −1 methods/Mangos/GameObjectMethods.h
+17 −4 methods/Mangos/GlobalMethods.h
+7 −1 methods/Mangos/ItemMethods.h
+4 −1 methods/Mangos/PlayerMethods.h
+122 −0 methods/Methods.cpp
+5 −6 methods/TrinityCore/CorpseMethods.h
+78 −85 methods/TrinityCore/CreatureMethods.h
+41 −0 methods/TrinityCore/CustomMethods.h
+38 −34 methods/TrinityCore/GameObjectMethods.h
+319 −240 methods/TrinityCore/GlobalMethods.h
+16 −26 methods/TrinityCore/GroupMethods.h
+115 −14 methods/TrinityCore/ItemMethods.h
+13 −15 methods/TrinityCore/MapMethods.h
+10 −11 methods/TrinityCore/ObjectMethods.h
+235 −58 methods/TrinityCore/PlayerMethods.h
+23 −29 methods/TrinityCore/QuestMethods.h
+282 −321 methods/TrinityCore/UnitMethods.h
+12 −13 methods/TrinityCore/WorldObjectMethods.h
+27 −0 methods/VMangos/CustomMethods.h
+16 −0 methods/VMangos/GameObjectMethods.h
+17 −4 methods/VMangos/GlobalMethods.h
+104 −0 methods/VMangos/ItemMethods.h
+4 −1 methods/VMangos/PlayerMethods.h