Commit Graph

16 Commits

Author SHA1 Message Date
bash
58c1c49610 Merge remote-tracking branch 'upstream/master' into Playerbot
# Conflicts:
#	src/server/game/Spells/SpellInfoCorrections.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
2025-12-07 12:04:32 +01:00
iThorgrim
621641f1e1 fix(Modules): Propagate lualib to Sol2 (#23838) 2025-11-24 23:59:38 +00:00
bash
39187083b0 Merge remote-tracking branch 'upstream/master' into Playerbot
# Conflicts:
#	modules/CMakeLists.txt
2025-10-25 00:48:25 +02:00
Foe
bb2f2daacb chore(Core/modules): necessary core changes for mod-eluna rename (#22962)
Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
2025-10-23 12:52:13 +02:00
bash
1aac4fbef6 Merge remote-tracking branch 'upstream/master' into feature/core_merge_10_2025
# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
2025-10-19 22:34:18 +02:00
Tereneckla
9ce8bd0cc6 fix(Core/Module): don't fallback to .dist for module configs (#22874) 2025-10-10 18:37:36 -03:00
Yunfan Li
91edb92f7a Merge branch 'master' into Playerbot 2025-01-15 20:49:11 +08:00
iThorgrim
03c263f88e feat(CMake/Eluna): Update CMakeLists for modules to allow Eluna to switch Lua version (#21123) 2025-01-11 13:03:20 +01:00
ZhengPeiRu21
2759a5ee1d Merge branch 'azerothcore:master' into Playerbot 2022-08-29 09:30:33 -06:00
David Strickland
8925125350 feat(CMake): Minor CMake Update to Modules Cmake File to Allow Custom Modules to make changes without changing Core. (#12846)
* Added in a the ability for module developers to create a cmake file that gets run inline with the module CMakeLists.txt. Minor Perf hit on the build but will allow for Modules to be more flexible in how they work with CMake.

* Comments and Documentation
2022-08-25 17:30:24 -03:00
ZhengPeiRu21
2d7cba14db Merge branch 'azerothcore:master' into Playerbot 2022-06-10 08:51:40 -06:00
Kargatum
94528cd44d feat(Tools/DbImport): implement separated app for importing DB (#11614) 2022-06-09 08:23:38 -03:00
ZhengPeiRu21
1c11bde14f Merge branch 'azerothcore:master' into Playerbot 2022-03-28 17:33:20 -06:00
Axel Cocat
04211a7adb fix(modules/CMakeLists): new Eluna module name (#11164) 2022-03-28 18:09:00 +02:00
UltraNix
12d41d1314 Big update. 2022-03-12 22:28:00 +01:00
Kargatum
51adbffae4 feat(Core/Modules): add separated lib for modules (#9281) 2021-12-02 20:28:58 +07:00