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

[pull] master from ElunaLuaEngine:master #60

Merged
merged 49 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
88a6d9f
Reorganization of Method headers
Foereaper Jul 26, 2023
88979e6
Comment unused arguments
Foereaper Jul 26, 2023
2345a26
Comment another unused argument
Foereaper Jul 26, 2023
faa42cd
Some more cleanup and fixes
Foereaper Jul 26, 2023
61e2e43
CMaNGOS specific fixes
Niam5 Jul 28, 2023
2c0573c
Merge pull request #439 from Niam5/reorg-cmangos
Niam5 Jul 29, 2023
ca7db39
New structure compatibility for Mangos
Foereaper Jul 29, 2023
444fab1
More Eluna reorganization cleanup for TC
Foereaper Jul 30, 2023
f2507a0
CMangos method header cleanup
Foereaper Jul 30, 2023
e53e406
Mangos method header cleanup
Foereaper Jul 30, 2023
9ffa66a
CMaNGOS method header cleanup
Niam5 Jul 30, 2023
b00639d
Update CI build file
Niam5 Jul 31, 2023
d2ace63
Merge pull request #440 from Niam5/cm-cleanup
Foereaper Jul 31, 2023
96e6bb5
Update compiler version to match requirement (#442)
Rochet2 Aug 16, 2023
166fbd3
Fix windows build
Rochet2 Aug 21, 2023
bcb6487
Fix triggered flag for spellcasting for cmangos, fix docs
Rochet2 Sep 10, 2023
112d10e
Cata Preservation Project Changes
Niam5 Jun 16, 2023
d985240
Merge pull request #444 from Niam5/eluna-tcpp
Niam5 Sep 20, 2023
50f159f
Update CI build file
Niam5 Jun 27, 2023
4dbe18b
Merge pull request #445 from Niam5/CI-build-update
Niam5 Sep 20, 2023
46bed6d
Fix Mangos Two build
Foereaper Sep 20, 2023
e38a8fd
Update TC define name
Niam5 Oct 11, 2023
0dca017
Add new environmental death hook
Foereaper Oct 12, 2023
dc040cc
Add new environmental death hook support to CMaNGOS
Niam5 Oct 12, 2023
7a83897
Add initial VMaNGOS support
Niam5 Oct 13, 2023
90bd45d
Add new Player and Item hooks
Foereaper Oct 13, 2023
c403f8d
Fix wrong event ID in new hook
Foereaper Oct 13, 2023
34c27ce
Added Trade Init and Accept hooks
Foereaper Oct 13, 2023
3b9cf46
Update documentation for new Player, Item, and Trade(Init and Accept)…
Niam5 Oct 13, 2023
e422547
Add SendMail hook
Foereaper Oct 13, 2023
11ee36a
Add SendMail return comment
Foereaper Oct 13, 2023
752db0d
Add SendMail hook documentation
Niam5 Oct 13, 2023
2bd9d0c
Add Group OnMemberAccept hook
Foereaper Oct 14, 2023
1edc007
Add Group OnMemberAccept hook
Niam5 Oct 14, 2023
1e94624
Add new Player methods
Foereaper Oct 14, 2023
8720eef
Add new Group methods
Foereaper Oct 14, 2023
12797aa
Fix TC formatting
Rochet2 Oct 14, 2023
e8cb7dc
Disable new methods on Cata for now
Foereaper Oct 14, 2023
5a0bf9d
Fix Cataclysm build
Foereaper Oct 14, 2023
3d9603b
Move header to fix Cata build
Rochet2 Oct 14, 2023
248a4bf
Cast GetAITargetsCount to double
Foereaper Oct 14, 2023
41be34f
Update GetAITargetsCount for all cores
Foereaper Oct 14, 2023
3751893
Add new Player methods
Niam5 Oct 15, 2023
ac2b4b3
Add new Player hook
Niam5 Oct 15, 2023
f8f97c5
Fix builds
Niam5 Oct 15, 2023
2470f52
Replace old Social link with new one
Foereaper Oct 21, 2023
058ffa1
Update copyright date for documentation
Foereaper Oct 22, 2023
851a35d
Fix placement of not implemented functions for TCPP
Niam5 Nov 5, 2023
a9bd6da
Update StackTracePlus.ext
Rochet2 Nov 19, 2023
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
65 changes: 54 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ jobs:
eluna: [ON]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: false
repository: ElunaLuaEngine/ElunaTrinityWotlk
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: src/server/game/LuaEngine
- name: Dependencies
run: |
sudo apt-get update && sudo apt-get install -yq libboost-all-dev
sudo apt-get update && sudo apt-get install -yq libboost-all-dev g++-10
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
- name: Setup
env:
ELUNA: ${{ matrix.eluna }}
Expand All @@ -44,6 +45,46 @@ jobs:
./authserver --version
./worldserver --version

CataPres-Eluna:
strategy:
fail-fast: false
matrix:
eluna: [ON]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
submodules: false
repository: Niam5/ElunaCataPreservation
- uses: actions/checkout@v3
with:
path: src/server/game/LuaEngine
- name: Dependencies
run: |
sudo apt-get update && sudo apt-get install -yq libboost-all-dev
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
- name: Setup
env:
ELUNA: ${{ matrix.eluna }}
run: |
mkdir bin
cd bin
cmake ../ -DELUNA=$ELUNA -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
cd ..
- name: Build
run: |
cd bin
make -j 4 -k && make install
- name: Unit tests
run: |
cd bin
make test
- name: Check executables
run: |
cd bin/check_install/bin
./bnetserver --version
./worldserver --version

# AC-Eluna:
# strategy:
# fail-fast: false
Expand Down Expand Up @@ -108,12 +149,12 @@ jobs:
patch: [zero, one, two]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
repository: mangos${{ matrix.patch }}/server
ref: master
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: src/modules/Eluna
- name: Configure
Expand All @@ -122,7 +163,7 @@ jobs:
run: |
mkdir bin
cd bin
cmake .. -DELUNA=$ELUNA -DCMAKE_INSTALL_PREFIX=install -DSOAP=1 -DPLAYERBOTS=0 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/
cmake .. -DSCRIPT_LIB_ELUNA=$ELUNA -DCMAKE_INSTALL_PREFIX=install -DSOAP=1 -DPLAYERBOTS=0 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/
cd ..
- name: Build
run: |
Expand All @@ -135,19 +176,21 @@ jobs:
fail-fast: false
matrix:
eluna: [ON, OFF]
patch: [Classic, TBC, WotLK]
runs-on: ubuntu-20.04
patch: [Classic, TBC, WotLK, Cata]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: false
repository: Niam5/Eluna-CMaNGOS-${{ matrix.patch }}
ref: master
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: src/game/LuaEngine
- name: Dependencies
- name: Dependencies and Environment
run: |
echo "CC=gcc-12" >> $GITHUB_ENV
echo "CXX=g++-12" >> $GITHUB_ENV
sudo apt-get update && sudo apt-get install -yq libboost-all-dev
- name: Configure
env:
Expand Down
80 changes: 0 additions & 80 deletions CMakeLists.txt

This file was deleted.

Loading