bash
|
0a0ba0a53f
|
minimize delta, legacy and merge mistakes over the years
|
2026-01-08 00:50:49 +01:00 |
|
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 |
|
Quentin Dawans
|
dc8318cf6a
|
feat(Core): Linux: Support systemd socket activation for the worldserver game socket (#21998)
|
2025-11-29 21:53:48 +01:00 |
|
Tereneckla
|
2f7f9bd72f
|
fix(Core/Spells): Implement TrinityCore spell_group and spell_group_stack_rules (#23346)
Co-authored-by: treeston <treeston.mmoc@gmail.com>
Co-authored-by: Trisjdc <trisjdc@gmail.com>
Co-authored-by: QAston <none@none>
Co-authored-by: ariel- <ariel-@users.noreply.github.com>
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Co-authored-by: Jelle Meeus <sogladev@gmail.com>
|
2025-11-28 16:01:25 -03:00 |
|
bash
|
bc9ca38d78
|
changed into the current license model
|
2025-11-24 15:42:51 +01:00 |
|
bashermens
|
454a4f34f0
|
Revert "Core merge 17112025 (#104)"
This reverts commit 236c842934.
|
2025-11-23 23:02:15 +01:00 |
|
kadeshar
|
236c842934
|
Core merge 17112025 (#104)
* fix(DB/SmartAI): improve Harry surrendering during quest 'Gambling Debt' (#23598)
* fix(DB/Quest): The Kalu'ak dailies reward 500 rep (#23600)
* chore(DB): import pending files
Referenced commit(s): fb03f41b2a
* fix(DB/GameEvent): Remove midsummer pole in K3 (#23614)
* chore(DB): import pending files
Referenced commit(s): 7b0000d6ee
* fix(DB/SmartAI): increase reliability of quest event Foolish Endeavors (#23612)
* chore(DB): import pending files
Referenced commit(s): 86f219abbc
* fix(Scripts/AreaTrigger): players become stuck after Last Rites (#23613)
* chore(DB): import pending files
Referenced commit(s): c1a8047cf1
* fix(Core/Vmaps): Fix inconsistency of hitInstance and hitModel to cause wrong area ids (#23233)
Co-authored-by: ModoX <moardox@gmail.com>
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Co-authored-by: Grimdhex <237474256+Grimdhex@users.noreply.github.com>
Co-authored-by: sudlud <sudlud@users.noreply.github.com>
* fix(DB/Gameobject): Sniffed Values for 'Wild Mustard' spawns (#23608)
* fix(DB/SmartAI): remove large combat distance of Frostbrood Sentry (#23607)
* chore(DB): import pending files
Referenced commit(s): 41d40b236f
* fix(DB/ReputationRewardRate): Patch 3.0.0 gain for Northrend factions (#23597)
* chore(DB): import pending files
Referenced commit(s): 067a898caa
* fix(Core/Map): It should be ensured that the instance is unloaded only after the Creature Respawn. (#23103)
* fix(Scripts/Northrend): Sniffing Out The Perpetrator horde (#23620)
* fix(Scripts/Northrend): ensure Drakuru stays in place during Betrayal (#23619)
* chore(DB): import pending files
Referenced commit(s): 928e145694
* fix(DB/SmartAI): quest 'Reconnaissance Flight' (#23628)
Co-authored-by: dr-j <dr-j@users.noreply.github.com>
Co-authored-by: Killyana <morphone1@gmail.com>
* fix(DB/QuestOfferReward): remove mention of a beta recipe in text (#23629)
* fix(DB/Conditions): update quest conditions to drop chokers (#23610)
* chore(DB): import pending files
Referenced commit(s): bca8f7ce07
* refactor(Core/PlayerScript): Delete OnPlayerChat, use OnPlayerCanUseChat (#23617)
* fix(Core/SmartAI): startup warnings unused params (#23551)
* fix(Core/Unit): Druid Talent Survival of the Fittest lacking immunity to creature daze (#23471)
* fix(DB/SAI): Fix Fizzcrank Paradrop teleporters (#23633)
* chore(DB): import pending files
Referenced commit(s): 94ba1c210d
* fix(Core): Fix waterwalking after dying in instance (#23593)
* fix(DB/SAI): don't remove all auras when mounting flamebringer (#23640)
* chore(DB): import pending files
Referenced commit(s): 22f91f3802
* fix(DB/SAI): Emerald Lasher goes out of the terrain when aggroed. (#23642)
* chore(DB): import pending files
Referenced commit(s): f9d6fe41de
* fix(DB/SAI): Burning Depths Necromancer no longer stays in place. (#23641)
* chore(DB): import pending files
Referenced commit(s): 1037471c8d
* fix(DB/SAI): Remove SmartAI from Valkyrion Harpoon Gun. (#23646)
* chore(DB): import pending files
Referenced commit(s): 8e3a7e6dcf
* fix(DB/Creature): Fix Weakened Reanimated Frost Wyrm inhabit type (#23645)
* chore(DB): import pending files
Referenced commit(s): 3baa18ef5b
* fix(DB/Spell): Infectious Bites should stack from different casters (#23647)
* chore(DB): import pending files
Referenced commit(s): 5aede412ab
* fix(DB/SAI): Solve various issues with It Goes to 11... quest. (#23651)
* fix(DB/Loot): Fireproof Satchel will now always drop the Ritual of Torch (#23585)
* chore(DB): import pending files
Referenced commit(s): 1090c209b3
* fix(Scripts/Northrend): Betrayal quest (#23650)
* fix(Script/BlackTemple): Reliquary of Souls will use 45 degree in front to set incombat (#22938)
* fix(Scripts/Spell): Fix Animal Blood spawning when it shouldn't (#23656)
* fix(Scripts/BoreanTundra): Script Bloodspore Haze/Psychosis (#23657)
* chore(DB): import pending files
Referenced commit(s): baf7957e36
* fix(DB/SAI): Sibling Rivalry quest credit if mounted (#23659)
* chore(DB): import pending files
Referenced commit(s): 6919cc679d
* fix(docs/license): use GPLv2 as MaNGOS-based project (#23655)
* fix(Core/Achievements): a character can only have 1 race realm first (#23626)
* chore: fix leftover license header (#23678)
* fix(Scripts/HoL): Update Loken script (#23587)
* fix(Scripts/DTK): Update King Dred script (#23572)
* fix(DB/SAI): Bitter Departure quest credit (#23658)
* chore(DB): import pending files
Referenced commit(s): e595425578
* fix(DB/Conditions): Ice Shard require Icy Imprisonment (#23661)
* chore(DB): import pending files
Referenced commit(s): 8294652e77
* fix(DB/Loot): add Scourge Curio drop to Lost Shandaral Spirit (#23686)
* chore(DB): import pending files
Referenced commit(s): b6ed4347fe
* fix(DB/Gameobject): fix spell focus location for 'Will of the Titans' (#23683)
* chore(DB): import pending files
Referenced commit(s): 388f18895d
* fix(DB/Creature): update IOC Demolisher spells (#23685)
* chore(DB): import pending files
Referenced commit(s): cdfa50c990
* fix(Scripts/Northrend): IOC boss cast ability Mortal Strike (#23684)
* fix(Scripts/BoreanTundra): Fix Beryl Sorcerer engaging mobs (#23690)
* fix(Core/Entities): Improve interactions between taxis and players regarding PvP flag. (#23681)
* fix(DB/Creature): Peon Gakra should be an innkeeper (#23699)
* chore(DB): import pending files
Referenced commit(s): 6abff4ac2b
* fix(Scripts/SholazarBasin): Fix Song of Wind and Water double credit (#23707)
* fix(DB/SAI): Reanimated Frost Wyrm engage after being hit by quest spell (#23697)
* fix(DB/SAI): Timely respawn Nesingwary Trappers (#23703)
* fix(DB/Creature): Fix Fjord Hawk Matriarch unit flags (#23696)
* fix(DB/Conditions): Fix Fordragon Resolve target conditions (#23701)
* chore(DB): import pending files
Referenced commit(s): 2942d63125
* fix(DB/Script): Move Tailhorn Stag and Amberpine Woodsman behavior into SmartAI. (#23708)
* fix(DB/Creature): Set Trigger flag on Steam Vent. (#23710)
* chore(DB): import pending files
Referenced commit(s): 435ca302ef
* fix(DB/SAI): To Stars' Rest! taxi flight (#23712)
* chore(DB): import pending files
Referenced commit(s): ab4d59ac9d
* fix (DB/Creature): Set Surveyor Orlond flags. (#23714)
* chore(DB): import pending files
Referenced commit(s): e8ec77dca7
* fix(DB/Loot): Fix Master Summoner Staff drop chance (#23717)
* chore(DB): import pending files
Referenced commit(s): 182c055e6e
* fix(Scripts/DTK): Fix Oh Novos! achievement (#23539) (#23718)
* fix(Core/Spells): Remove King Mrgl-Mrgl costume on spell casting (#23713)
* chore(DB): import pending files
Referenced commit(s): 8c963a11ce
* fix(DB/Reputation): Utigarde Pinnacle normal reputation (#23719)
* chore(DB): import pending files
Referenced commit(s): 88ed7d66d5
* fix(Scripts/HoS): Clean up faction update hacks (#23720)
* fix(DB/Reputation): Lower reputation according to rates handling (#23722)
* fix(DB/Reputation): Oculus normal & UP correction (#23723)
* chore(DB): import pending files
Referenced commit(s): abc2cf3028
* fix(Scripts/Oculus): Implement crossfaction support for drakes (#23704)
* fix(DB/Quest): Correct prerequisite for Reclaimed Ration (#23736)
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
* fix(DB/Quest): Correct prerequisite for Salvaging Life's Strength (#23734)
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
* chore(DB): import pending files
Referenced commit(s): afd8197588
* fix(Core/Movement): Fix SummonMovementInform for summons (#23725)
* refactor(Core/Movement): Fix Build (#23739)
* fix(DB/SAI): Update Iron Rune Construct SAI to use DO_ACTION instead … (#23716)
* chore(DB): import pending files
Referenced commit(s): 7cc39f78e2
* fix(DB/SAI): Fix Flamebringer gossip interaction (#23740)
* chore(DB): import pending files
Referenced commit(s): 9cb683cfcd
* fix(DB/SAI): Nerub'ar member packs now attack together. (#23727)
* chore(DB): import pending files
Referenced commit(s): 6f5a1b7ccc
* fix(DB/SAI): Remove Harrison Johnes quest flag on escort accept (#23700)
* chore(DB): import pending files
Referenced commit(s): bacf15d356
* Update crash issue template with log submission guidelines (#23754)
* Merge
* Updated OnPlayerChat method name to OnPlayerCanUseChat
---------
Co-authored-by: sogladev <sogladev@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: 天鹭 <18535853+PkllonG@users.noreply.github.com>
Co-authored-by: ModoX <moardox@gmail.com>
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Co-authored-by: Grimdhex <237474256+Grimdhex@users.noreply.github.com>
Co-authored-by: sudlud <sudlud@users.noreply.github.com>
Co-authored-by: dr-j <dr-j@users.noreply.github.com>
Co-authored-by: Killyana <morphone1@gmail.com>
Co-authored-by: Undo <50205200+UndoUreche@users.noreply.github.com>
Co-authored-by: Andrew <47818697+Nyeriah@users.noreply.github.com>
Co-authored-by: killerwife <killerwife@gmail.com>
Co-authored-by: Tereneckla <Tereneckla@pm.me>
Co-authored-by: Rocco Silipo <108557877+Rorschach91@users.noreply.github.com>
Co-authored-by: Ryan Turner <16946913+TheSCREWEDSoftware@users.noreply.github.com>
Co-authored-by: blinkysc <37940565+blinkysc@users.noreply.github.com>
Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
Co-authored-by: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com>
Co-authored-by: Traesh <Traesh@users.noreply.github.com>
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
|
2025-11-23 20:45:22 +01:00 |
|
Francesco Borzì
|
50b36e842a
|
fix(docs/license): use GPLv2 as MaNGOS-based project (#23655)
|
2025-11-14 08:44:25 -03:00 |
|
天鹭
|
8f5d50435b
|
fix(Core/Map): It should be ensured that the instance is unloaded only after the Creature Respawn. (#23103)
|
2025-11-11 02:59:57 -03:00 |
|
bash
|
fac127718d
|
core merge fixes for playerbots
|
2025-10-19 23:55:38 +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 |
|
天鹭
|
058f7acac6
|
refactor(Core): AddEventAtOffset (#23140)
|
2025-10-17 06:09:57 +02:00 |
|
天鹭
|
9c49349e1e
|
refactor(Core/EventMap): Refactor EventMap and related scripts (#23121)
Co-authored-by: Kelno <3866946+kelno@users.noreply.github.com>
Co-authored-by: Peter Keresztes Schmidt <carbenium@outlook.com>
|
2025-10-12 22:19:24 -03:00 |
|
Yunfan Li
|
c3fbb2da20
|
Merge branch 'master' into Playerbot
|
2025-06-28 10:46:23 +08:00 |
|
Jelle Meeus
|
7fc8b14e3e
|
feat(Core/Utilities): add Seconds overload for randtime (#22337)
|
2025-06-20 23:18:05 +02:00 |
|
Yunfan Li
|
ce9343d916
|
Merge branch 'master' into Playerbot
|
2025-05-02 16:50:45 +08:00 |
|
Anton Popovichenko
|
7162294f1b
|
fix(Deps/Boost): Fix build for boost 1.88. (#21952)
|
2025-04-19 21:01:40 +02:00 |
|
Yunfan Li
|
7d431dc796
|
Merge branch 'master' into Playerbot
|
2025-02-19 22:29:36 +08:00 |
|
Patrick Müssig
|
f89a8e0b81
|
fix(UnitTest): fixes unit tests not compiling under windows (#21299)
|
2025-02-17 06:17:51 +01:00 |
|
Jelle Meeus
|
a05833eeed
|
fix(Core/Common): Container fixes use after free (#21460)
|
2025-02-15 22:22:30 +01:00 |
|
Yunfan Li
|
36987b8a96
|
Merge branch 'master' into Playerbot
|
2025-01-09 19:56:11 +08:00 |
|
Dan
|
72ae994a65
|
fix(Scripts/ZulAman): make sure Malacrass timer is delayed only when it should be triggered during channel of Spirit Bolts (#21089)
|
2025-01-06 18:44:44 +01:00 |
|
Yunfan Li
|
1294d79764
|
Merge branch 'master' into Playerbot
|
2024-11-25 23:22:31 +08:00 |
|
Andrew
|
ab7f49b220
|
feat(Core/Scripting): Implement TaskScheduler GetNextGroupOccurrence() (#20714)
|
2024-11-24 12:02:56 -03:00 |
|
Yunfan Li
|
545bb18af4
|
Merge branch 'master' into Playerbot
|
2024-11-08 20:58:52 +08:00 |
|
Francesco Borzì
|
4dcaee1816
|
refactor(src/common|server): remove unused import (big part 2) (#20388)
|
2024-11-01 08:42:31 +01:00 |
|
Francesco Borzì
|
c06cadfe75
|
refactor(src/common|server): remove unused import (big part 1) (#20377)
* refactor(src/common|server): remove unused import (big part 1)
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: attempt to fix damn linkin error
|
2024-10-31 21:46:11 +01:00 |
|
Yunfan Li
|
66c55bc450
|
Merge branch 'master' into Playerbot
|
2024-09-22 21:56:15 +08:00 |
|
Kitzunu
|
386aea03ee
|
chore(Core/Misc): Some cleanup (#19970)
* remove weird blanks
* update if
* ) ) to ))
* missed some ) )
* now switch
* .
|
2024-09-21 19:34:31 +02:00 |
|
Yunfan Li
|
414805e692
|
Merge branch 'master' into Playerbot
|
2024-09-04 23:46:34 +08:00 |
|
Kitzunu
|
de2bcbdabf
|
refactor(Core/Misc): Acore::StringFormat to fmt format (#19838)
refactor(Core/Utilities): Acore::StringFormat to fmt format
* closes https://github.com/azerothcore/azerothcore-wotlk/issues/10356
|
2024-09-03 07:59:37 -03:00 |
|
Yunfan Li
|
f8a28b6883
|
Merge branch 'master' into Playerbot
|
2024-08-30 22:38:08 +08:00 |
|
Tereneckla
|
1fd59e2831
|
feature(Core/Chat): allow fmt-chrono formatting (#19794)
|
2024-08-30 07:44:45 -03:00 |
|
Yunfan Li
|
27b243e7b2
|
Merge branch 'master' into Playerbot
|
2024-08-18 23:02:22 +08:00 |
|
Grimdhex
|
a0689fb4ef
|
fix(Dep/Boost): corrects a warning about path changes in boost process (#19629)
|
2024-08-18 13:39:06 +02:00 |
|
Yunfan Li
|
f5e44cd8a6
|
Merge branch 'master' into Playerbot
|
2024-08-01 15:41:23 +08:00 |
|
Francesco Borzì
|
02a05fbd4c
|
refactor(src/common): remove unused imports (#19506)
* refactor(src/common): remove unused imports
* fix: build
* chore: fix build
* chore: size_t -> std::size_t
* chore: fix fuckup from previous commit
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build with std::size_t
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
* chore: fix build
|
2024-07-30 20:06:46 -03:00 |
|
Yunfan Li
|
d7a07b2397
|
Merge branch 'master' into Playerbot
|
2024-06-29 21:57:41 +08:00 |
|
Vitaly Kogogin
|
02b58ff02e
|
fix(core/character-creation): get main part of cyrillic name (#18971)
fix(character/creation): get main part of cyrillic name
|
2024-06-29 10:56:06 -03:00 |
|
Yunfan Li
|
971b2f8316
|
Merge branch 'master' into Playerbot
|
2024-06-03 23:16:28 +08:00 |
|
Emmanuel Ferdman
|
4884e33f07
|
fix(LICENSE): update license file paths (#18972)
Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>
|
2024-05-29 20:10:39 +02:00 |
|
Yunfan Li
|
7915f79d04
|
Merge branch 'master' into Playerbot
|
2023-12-12 20:52:42 +08:00 |
|
Kitzunu
|
ef1b3c2ea0
|
chore(Core/Misc): Clean up workarounds (#17870)
* Clean advstd to use std c++20 features
* Use ABORT instead of std::abort
Co-authored-by: Shauren <shauren.trinity@gmail.com>
|
2023-11-27 00:07:39 +01:00 |
|
Winfidonarleyan
|
9ecb85acb5
|
chore(Cleanup): added new lines to the end of files where they are not present (#17774)
|
2023-11-19 11:57:37 +07:00 |
|
Tristan 'Natrist' Cormier
|
c827a0c1c1
|
fix(Core/Misc): Mac build (#17714)
|
2023-11-15 13:37:14 +01:00 |
|
Winfidonarleyan
|
c5564e1363
|
feat(Deps/Fmt): update fmt lib to 10.1.1 (#17643)
|
2023-11-05 13:15:45 +07:00 |
|
Yunfan Li
|
2dd1490c18
|
Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot
|
2023-09-23 22:44:15 +08:00 |
|
Kitzunu
|
f1111be152
|
chore(misc): cleanup (#17274)
|
2023-09-17 10:19:09 -03:00 |
|
Kitzunu
|
4b21f01b91
|
fix(Core/TaskScheduler): warning (#17275)
|
2023-09-17 10:14:28 -03:00 |
|
Kitzunu
|
fbf7ba2191
|
chore(Core/enumutils): regenerate enumutils (#17087)
* chore(misc/enumutils): update enumutils
* fix build
* latest update
|
2023-09-16 14:26:08 +02:00 |
|