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
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
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
ZhengPeiRu21
e9143a2c0b
Merge branch 'azerothcore:master' into Playerbot
2023-03-21 08:46:26 -06:00
Skjalf
f887e000b7
refactor(Scripts/Mechanar): Modernize Mechano Lord Capacitus script ( #15491 )
2023-03-19 19:52:08 -03:00
qudzy
0e6a5bddbb
Declare strToLower method in utilities
2022-05-06 16:55:21 +02:00
UltraNix
12d41d1314
Big update.
2022-03-12 22:28:00 +01:00
Kargatum
de13bf426e
feat(Core/DBLayer): replace char const* to std::string_view ( #10211 )
...
* feat(Core/DBLayer): replace `char const*` to `std::string_view`
* CString
* 1
* chore(Core/Misc): code cleanup
* cl
* db fix
* fmt style sql
* to fmt
* py
* del old
* 1
* 2
* 3
* 1
* 1
2022-02-05 00:37:11 +01:00
Kitzunu
f4c6a4ce27
fix(Core/Misc): Remove c++ check for c++11 ( #10439 )
2022-02-04 19:00:33 +01:00
Kargatum
3a0a9ba088
feat(Core/Common): move EventMap to separated files, add support chrono ( #10209 )
2022-02-04 15:12:45 +01:00
Kargatum
6d7f58e6ed
feat(Core/Common): delete old Tokenizer ( #10121 )
2022-01-21 14:59:05 +07:00
Kargatum
259b9133f6
feat(Core/Common): add new helpers for time utility ( #10207 )
2022-01-19 12:01:59 +07:00
Francesco Borzì
9dc88def35
refactor(Core): apply clang-tidy modernize-* ( #9975 )
...
Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com >
2022-01-17 14:35:07 +01:00
Kargatum
0b507d531d
refactor(Scripts/Commands): convert cs_modify to new system ( #9474 )
2021-12-04 11:56:47 -03:00
Kargatum
f62664c987
refactor(Core/Misc): headers cleanup ( #9259 )
2021-11-22 17:24:39 +07:00
Kargatum
bc9473482e
feat(Core/Chat): new argument parsing and unify chat hyperlink parsing ( #6243 )
2021-10-23 10:15:42 +02:00
Kargatum
52aa0e9966
feat(License): add new headers information about license ( #7941 )
...
Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com >
2021-09-30 13:40:52 +07:00
Kargatum
8568c4fb33
feat(Core): replace ACE network with Boost.Asio ( #6574 )
2021-07-16 10:43:56 +02:00
Kargatum
3c24b511f2
refactor(Core/Misc): add braces and impove codestyle ( #6402 )
2021-06-24 19:50:18 +02:00
Kargatum
8202da358b
refactor(Core/Common): alphabetical sorting inlcudes ( #6282 )
...
- Part https://github.com/WarheadCore/WarheadBand/pull/37
2021-06-23 01:01:53 +02:00
Kitzunu
897a02bb75
refactor(Core/Misc): acore to Acore ( #6043 )
2021-05-31 14:21:54 +02:00
Kitzunu
a9ed64e600
feat(Core/Util): AsUnderlyingType ( #6117 )
...
* Add AsUnderlyingType function to cast enum value to its underlying type (avoids repeating std::underlying_type everywhere)
(cherry picked from commit fdd9227b23 )
Co-Authored-By: Shauren <shauren.trinity@gmail.com >
2021-05-30 03:46:04 +02:00
Kargatum
13f71c9c4d
feat(Core/Random): port random system from TrinityCore ( #5454 )
...
* feat(Core/Random): port random system from TrinityCore
* lic
* logic correct
* MultimapErasePair move
* whitespace
17:13:34 1. 'Containers.h'. Replace (1)
17:13:40 2. 'LootMgr.h'. Replace (1)
17:13:44 3. 'World.cpp'. Replace (1)
17:13:47 4. 'instance_scholomance.cpp'. Replace (1)
* correct debug build
2021-05-16 21:53:21 +02:00
UltraNix
485f7e7639
feat(Core/DB/Authserver): remove sha_pass_hash ( #4827 )
2021-03-21 15:17:57 +01:00
Francesco Borzì
f6a17164be
fix(Core/License): issue with old files license ( #4762 )
2021-03-17 09:46:01 -06:00
Kargatum
dbefa17a53
feat(Core/Config): rework config and delete ACE inherited ( #4608 )
2021-02-28 14:37:03 +01:00
Francesco Borzì
c5a35efd7b
refactor(Core): apply clang-tidy modernize-use-default-member-init ( #3827 )
2020-12-07 13:34:06 -06:00
Francesco Borzì
0b8ec1f6ee
refactor(Core): apply clang-tidy modernize-loop-convert ( #3822 )
2020-12-07 19:04:19 +01:00
Francesco Borzì
161302252e
refactor(Core): apply clang-tidy modernize-use-nodiscard ( #3835 )
2020-12-06 19:39:48 +01:00
Kargatum
7f26c9ddad
refactor(Core/Common): restyle tools with astyle ( #3706 )
2020-11-17 16:59:58 +07:00
Andrius Peleckas
ab5933effa
fix(Core/Util): EventMap::RepeatEvent when eventId is retrieved by ExecuteEvent() call ( #3426 )
2020-10-17 14:59:22 +02:00
Kargatum
3a0b0356ac
refactor(Core/Common): restyle common lib with astyle ( #3461 )
2020-09-12 03:50:48 +07:00
Kargatum
e15a493927
feat(Core/Time): remove inherited ACE Time ( #3455 )
...
Co-authored-by: Viste <viste02@gmail.com >
2020-09-11 14:03:26 +02:00
mishaparem
a12e58b105
fix(Core): C++ 11 rule of 3 compiant constructors ( #3023 )
2020-06-15 12:45:04 +02:00
Viste
435190979e
fix(Core/Tools): fix build ( #2529 )
2019-12-29 03:07:17 +07:00
Shard
067d9e791f
fix(Core/Battlegrounds) Rewrite RandomBG and enabling bg/arenas weights ( #2516 )
2019-12-28 09:40:13 +01:00
Viste
ec808793ae
fix(Core/Misc): few improvements to ut8 handling ( #2455 )
2019-12-02 08:33:44 +01:00
Viste
854b426978
feat(Core): Added ABORT() macro to prevent the usage of ASSERT(false) as a quick hack to crash the core misusing assert ( #2273 )
2019-09-26 09:51:33 +02:00
Nefertumm
dd300003e2
Update license links ( #783 )
2018-03-12 10:54:57 +01:00
Yehonal
17332304fd
Using TC structure allowing easier patches importing
2017-12-21 00:20:29 +01:00