472 Commits

Author SHA1 Message Date
bashermens
b9345774f9 Merge pull request #126 from mod-playerbots/hermensbas-patch-1
Oopsie hotfix
2025-12-18 23:55:51 +01:00
bashermens
97ee5f7459 Oopsie 2025-12-18 23:45:50 +01:00
bashermens
f262dc7835 Merge pull request #125 from mod-playerbots/core-update-correction
Core-update-correction-fix
2025-12-18 11:33:39 +01:00
bashermens
fc7c7055ba fix 2025-12-16 23:04:46 +01:00
bashermens
3ba00be179 Fix MotionMaster.cpp
https://github.com/mod-playerbots/azerothcore-wotlk/issues/122
2025-12-16 19:08:47 +01:00
bashermens
8f84271af8 Merge pull request #119 from mod-playerbots/core_update_2025_12_7
Core update: 2025-12-7
2025-12-07 15:22:03 +01:00
bash
7b41eb5c90 core_merge_fix_due_header_split 2025-12-07 12:09:42 +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
kadeshar
08323af7a5 Merge pull request #115 from mod-playerbots/license_syncing
License update
2025-12-04 19:14:11 +01:00
bash
bc9ca38d78 changed into the current license model 2025-11-24 15:42:51 +01:00
bashermens
7be3d24c1e merge_conflict_fix 2025-11-24 14:51:47 +01:00
bash
87d3f3ba3a fix 2025-11-24 14:03:13 +01:00
bashermens
6b5da02e78 Merge pull request #110 from hermensbas/core_update_no_squash
2. Core update at 2025_11_23 (without squash)
2025-11-24 12:20:58 +01:00
bashermens
821f854318 Merge branch 'Playerbot' into core_update_no_squash 2025-11-24 12:18:01 +01:00
SaW
7228e76355 Merge pull request #109 from mod-playerbots/revert-104-core-merge-17112025
1. Revert "Core merge 17112025"
2025-11-24 12:15:10 +01:00
bashermens
528e590f10 Merge branch 'Playerbot' into core_update_no_squash 2025-11-23 23:11:12 +01:00
bash
eef1980923 fix 2025-11-23 23:09:26 +01:00
bash
1ed9aee631 Merge remote-tracking branch 'upstream/master' into core_update_no_squash 2025-11-23 23:08:23 +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
SaW
3732047b9e Fix https://github.com/mod-playerbots/azerothcore-wotlk/issues/96
Fix https://github.com/mod-playerbots/azerothcore-wotlk/issues/96
2025-11-17 21:02:36 +01:00
SaW
3d29de2844 Fix codestyle nag 2025-11-17 20:54:25 +01:00
bashermens
a2a4a4f7cf Fix
https://github.com/mod-playerbots/azerothcore-wotlk/issues/96
2025-11-17 12:17:39 +01:00
bashermens
923cccdc25 Merge branch 'azerothcore:master' into Playerbot 2025-11-10 13:52:10 +01:00
bashermens
cd799aa1c6 Merge branch 'azerothcore:master' into Playerbot 2025-11-09 21:14:51 +01:00
bashermens
0bb40fddc4 Merge branch 'azerothcore:master' into Playerbot 2025-11-08 23:31:01 +01:00
bashermens
e68fa57fd6 Merge branch 'azerothcore:master' into Playerbot 2025-11-08 10:01:09 +01:00
bashermens
838628a25d Merge branch 'azerothcore:master' into Playerbot 2025-11-07 13:00:19 +01:00
bashermens
7c5b199489 Merge branch 'azerothcore:master' into Playerbot 2025-11-07 06:44:08 +01:00
bash
b5cdb0e63e Merge branch 'azerothcore:master' into Playerbot 2025-11-05 23:18:17 +01:00
bash
12909c1958 Merge branch 'azerothcore:master' into Playerbot 2025-11-05 15:00:25 +01:00
bash
b7c92a52aa Merge branch 'azerothcore:master' into Playerbot 2025-11-05 10:53:28 +01:00
bash
6bee45a1c8 Merge pull request #92 from mod-playerbots/update/core_4_11_2025
update/core 4 11 2025
2025-11-05 10:53:09 +01:00
bash
8c2409ff06 naxx merge fixes 2025-11-04 21:21:59 +01:00
bash
52a09fbf54 Merge remote-tracking branch 'upstream/master' into update/core_4_11_2025
# Conflicts:
#	src/server/game/Guilds/Guild.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
#	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_heigan.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
2025-11-04 20:07:10 +01:00
kadeshar
c96314a9b3 Merge pull request #91 from mod-playerbots/Playerbot_merge29102025
Playerbot merge
2025-10-31 06:45:52 +01:00
kadeshar
1b0eef2e6c Merge branch 'azerothcore:master' into Playerbot_merge29102025 2025-10-29 06:37:33 +01:00
bash
c6c90e0034 Merge branch 'azerothcore:master' into Playerbot 2025-10-25 20:37:41 +02:00
bash
39187083b0 Merge remote-tracking branch 'upstream/master' into Playerbot
# Conflicts:
#	modules/CMakeLists.txt
2025-10-25 00:48:25 +02:00
bash
2607df754b Merge branch 'azerothcore:master' into Playerbot 2025-10-23 01:57:59 +02:00
bash
880529a5b4 Merge pull request #87 from hermensbas/hermensbas-patch-1
fix: MotionMaster.cpp
2025-10-21 19:36:44 +02:00
bash
e846fdc8b9 Update MotionMaster.cpp 2025-10-21 18:42:31 +02:00
bash
6d42ab1797 fix: MotionMaster.cpp
knockback movement fix
2025-10-21 18:06:39 +02:00
bash
fc1d8e2a64 Merge branch 'azerothcore:master' into Playerbot 2025-10-21 10:38:27 +02:00
bash
4f9b4d5470 Merge branch 'azerothcore:master' into Playerbot 2025-10-20 14:13:31 +02:00
bash
f96e7c577b Merge pull request #85 from hermensbas/feature/core_merge_10_2025
CORE_UPDATE_10_2025
2025-10-20 14:12:45 +02:00
bash
be3d55f770 added comments for future merge conflicts 2025-10-20 00:53:13 +02: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
bash
dae1f55536 Update core-build-playerbots.yml 2025-10-19 17:12:13 +02:00
bash
ec7bb81473 Update core-build-playerbots.yml 2025-10-19 03:24:29 +02:00
bash
d9c7330434 Update core-build-playerbots.yml 2025-10-18 15:45:13 +02:00
bash
2eda59a0dc Update core-build-playerbots.yml 2025-10-18 12:34:54 +02:00
bash
21e313a7f1 Update core-build-playerbots.yml 2025-10-18 09:09:01 +02:00
bash
96f1fe67d9 Update core-build-playerbots.yml 2025-10-17 20:22:20 +02:00
Yunfan Li
798589fb5d Merge pull request #75 from mod-playerbots/project_transfer
Preparation for project transfer
2025-10-14 00:08:36 +08:00
bash
6aef3aae5f Merge branch 'azerothcore:master' into Playerbot 2025-10-03 19:43:33 +02:00
bash
945fdff66c Merge branch 'azerothcore:master' into Playerbot 2025-10-03 02:36:11 +02:00
bash
245fe501f1 Merge pull request #72 from kadeshar/relic-usage-fix
Fix to make bots roll and equip for correct relic
2025-10-01 21:07:58 +02:00
kadeshar
19a834fa55 - Added method BotCanUseItem 2025-10-01 20:39:57 +02:00
bash
152b1cc455 Merge branch 'azerothcore:master' into Playerbot 2025-10-01 12:16:44 +02:00
bash
5fbcb45727 Merge branch 'azerothcore:master' into Playerbot 2025-09-30 15:27:48 +02:00
kadeshar
0145bebb10 - Fix to make bots roll and equip for correct relic 2025-09-29 20:41:21 +02:00
bash
59c1233d98 Merge branch 'azerothcore:master' into Playerbot 2025-09-29 20:09:38 +02:00
bash
f67b86df8b Merge branch 'azerothcore:master' into Playerbot 2025-09-28 00:12:50 +02:00
bash
1125d84fb2 Merge branch 'azerothcore:master' into Playerbot 2025-09-25 16:35:37 +02:00
bash
1665fefb1a Merge branch 'azerothcore:master' into Playerbot 2025-09-24 01:59:18 +02:00
bash
9d82a35671 Merge branch 'azerothcore:master' into Playerbot 2025-09-23 14:43:56 +02:00
bash
861058f657 Merge branch 'azerothcore:master' into Playerbot 2025-09-22 21:59:40 +02:00
bash
c092fb1581 Merge branch 'azerothcore:master' into Playerbot 2025-09-20 22:17:46 +02:00
bash
fd567ddcfa Merge pull request #70 from kadeshar/guild-crash-fix
Possible crash fix while adding member to guild
2025-09-19 20:01:08 +02:00
kadeshar
dc6be0655f Merge pull request #69 from hermensbas/core/update_2025_09_18
update 2025 09 18
2025-09-19 10:59:42 +02:00
kadeshar
c0aec97676 - Possible crash fix while adding member to guild 2025-09-18 20:39:39 +02:00
bash
ced3cf9b22 Merge remote-tracking branch 'upstream/master' into core/update_2025_09_18 2025-09-18 20:09:00 +02:00
bash
93c0ab5b6b Merge pull request #67 from kadeshar/guild-cross-faction-fix
Fixed cross faction guilds not allowed by config
2025-09-14 10:51:02 +02:00
kadeshar
9bc46a7b77 - Fixed cross faction guilds not allowed by config 2025-09-13 16:33:09 +02:00
Yunfan Li
18a5a2be5c Merge pull request #65 from liyunfan1223/Playerbot-250911
Playerbot 250911
2025-09-11 13:42:52 +08:00
Yunfan Li
fdb71c521e Merge branch 'master' into Playerbot-updated 2025-09-11 12:20:54 +08:00
kadeshar
830e1fc5c2 Merge pull request #8 from azerothcore/master
Merge
2025-08-30 21:23:42 +02:00
kadeshar
234268e3bf Merge pull request #7 from azerothcore/master
Merge
2025-08-27 21:04:10 +02:00
Yunfan Li
4514980791 Merge pull request #56 from liyunfan1223/Playerbot_sync_0809
Playerbot sync 0809
2025-08-09 19:17:18 +08:00
Yunfan Li
025aaacf20 Merge branch 'master' into Playerbot 2025-08-09 15:02:41 +08:00
Yunfan Li
32b3e6331d Merge pull request #54 from liyunfan1223/Playerbot_sync
Playerbot sync
2025-08-02 16:10:42 +08:00
Yunfan Li
8ff1d2ccc1 Merge pull request #52 from Rochet2/patch-1
Fix scriptmgr hook double call on whisper
2025-08-02 15:32:26 +08:00
Yunfan Li
55bc26f505 Merge branch 'master' into Playerbot 2025-08-02 11:35:47 +08:00
Yunfan Li
21c2c3e0ee Merge branch 'master' into Playerbot 2025-07-25 21:18:51 +08:00
Rochet2
1620d6d64b Fix scriptmgr hook double call on whisper 2025-07-22 18:34:00 +03:00
Yunfan Li
c167fef89c Merge branch 'master' into Playerbot 2025-07-15 20:34:44 +08:00
Yunfan Li
475e5a42c4 Merge branch 'master' into Playerbot 2025-07-04 22:41:14 +08:00
Yunfan Li
24fa79040f Merge branch 'master' into Playerbot 2025-06-29 10:55:43 +08:00
Yunfan Li
c3fbb2da20 Merge branch 'master' into Playerbot 2025-06-28 10:46:23 +08:00
Yunfan Li
1e88fccd3c Merge branch 'master' into Playerbot 2025-06-14 21:33:35 +08:00
Yunfan Li
13edac562c Merge branch 'master' into Playerbot 2025-06-01 14:55:09 +08:00
Yunfan Li
4ace49c95a Merge branch 'master' into Playerbot 2025-05-23 19:55:02 +08:00
Yunfan Li
c6222b9aa3 Merge branch 'master' into Playerbot 2025-05-16 19:42:56 +08:00
Yunfan Li
58fd50651d Merge branch 'master' into Playerbot 2025-05-09 22:07:43 +08:00
Yunfan Li
ce9343d916 Merge branch 'master' into Playerbot 2025-05-02 16:50:45 +08:00
Yunfan Li
c304ccee57 Merge branch 'master' into Playerbot 2025-04-18 22:57:30 +08:00
Yunfan Li
97342b05e7 Merge branch 'master' into Playerbot 2025-04-09 23:35:21 +08:00
Yunfan Li
95fc3f0932 Merge branch 'master' into Playerbot 2025-03-29 17:25:52 +08:00
Yunfan Li
4deb6ec311 Merge branch 'master' into Playerbot 2025-03-22 11:15:08 +08:00
Yunfan Li
565019ed27 Merge branch 'master' into Playerbot 2025-03-14 21:37:02 +08:00
Yunfan Li
34811a047a Merge branch 'master' into Playerbot 2025-03-04 21:57:19 +08:00
Yunfan Li
f332b07140 Merge pull request #40 from liyunfan1223/Playerbot_20250219
Merge branch 'master' into Playerbot
2025-02-22 12:08:24 +08:00
Yunfan Li
bd0302605a Merge branch 'master' into Playerbot_20250219 2025-02-22 10:36:10 +08:00
Yunfan Li
990c85c2cd Remove MOD_PLAYERBOTS macro to compile without mod-playerbots 2025-02-19 23:01:53 +08:00
Yunfan Li
7d431dc796 Merge branch 'master' into Playerbot 2025-02-19 22:29:36 +08:00
kadeshar
d1032678ff - Added support for playerbots message hyperlink (#37) 2025-02-16 22:27:55 +08:00
Yunfan Li
41415bb3c3 Merge branch 'master' into Playerbot 2025-02-11 22:35:57 +08:00
Yunfan Li
de3c2b553e Merge branch 'master' into Playerbot 2025-02-04 23:40:06 +08:00
Yunfan Li
e5c67bd47d Merge branch 'master' into Playerbot 2025-01-31 18:29:34 +08:00
Yunfan Li
cf035b5e5e Merge branch 'master' into Playerbot 2025-01-23 23:23:53 +08:00
Yunfan Li
91edb92f7a Merge branch 'master' into Playerbot 2025-01-15 20:49:11 +08:00
Yunfan Li
36987b8a96 Merge branch 'master' into Playerbot 2025-01-09 19:56:11 +08:00
Yunfan Li
8e5802da4e Merge branch 'master' into Playerbot 2025-01-06 23:04:02 +08:00
Yunfan Li
36ac083814 Merge branch 'master' into Playerbot 2024-12-31 17:18:40 +08:00
Yunfan Li
5035e880f4 Merge pull request #33 from liyunfan1223/move_backwards
Add MovePointBackwards in MotionMaster.h
2024-12-29 21:24:02 +08:00
Yunfan Li
b603c8c1e8 Add MovePointBackwards in MotionMaster.h 2024-12-29 21:16:33 +08:00
Yunfan Li
2bab8ee807 Merge pull request #32 from liyunfan1223/modify_char_sel
Add class and race to CHAR_SEL_CHARS_BY_ACCOUNT_ID
2024-12-25 22:41:10 +08:00
Yunfan Li
4e8524bd13 Add class and race to CHAR_SEL_CHARS_BY_ACCOUNT_ID 2024-12-25 21:39:39 +08:00
Yunfan Li
c76e70a364 Merge branch 'master' into Playerbot 2024-12-22 13:24:03 +08:00
Yunfan Li
7347f64938 Merge branch 'master' into Playerbot 2024-12-13 18:51:37 +08:00
Yunfan Li
889b509313 Merge branch 'master' into Playerbot 2024-12-05 00:08:25 +08:00
Yunfan Li
ba56317506 Merge pull request #30 from noisiver/update-character-online
Add a new statement to update character online by guid
2024-12-01 11:46:32 +08:00
Yunfan Li
e8679bc13b Merge pull request #29 from Raz0r1337/Playerbot
Update worldserver.conf.dist
2024-12-01 11:45:38 +08:00
Revision
3d3fff1a2e Add a new statement to update character online by guid 2024-11-30 17:18:01 +01:00
Sascha
9e5f551b58 Update worldserver.conf.dist
logging stuff inserted into the correct area of ​​the config file
2024-11-29 13:13:01 +01:00
Yunfan Li
1294d79764 Merge branch 'master' into Playerbot 2024-11-25 23:22:31 +08:00
Yunfan Li
4cd23792db Merge pull request #27 from hermensbas/feature/alignment_core_data_folder
placed playerbot sql folder into data folder as core/module describes
2024-11-18 15:36:20 +08:00
bash
4183a34608 placed sql into the data folder as core/module describes 2024-11-16 21:37:24 +00:00
Yunfan Li
fce06946e1 Merge branch 'master' into Playerbot 2024-11-16 13:15:00 +08:00
Yunfan Li
545bb18af4 Merge branch 'master' into Playerbot 2024-11-08 20:58:52 +08:00
Yunfan Li
abd9b4ebb8 Merge branch 'master' into Playerbot 2024-10-30 21:43:42 +08:00
Yunfan Li
2e37c1ff1d Merge branch 'master' into Playerbot 2024-10-21 11:43:19 +08:00
Yunfan Li
418afce6d7 Merge branch 'master' into Playerbot 2024-10-10 23:13:20 +08:00
Yunfan Li
0e1fb788c1 Merge pull request #24 from liyunfan1223/fix_header_include
Fix header include for playerbots
2024-10-05 00:12:41 +08:00
Yunfan Li
b4ca46c3af Fix header include for playerbots 2024-10-04 23:07:08 +08:00
Yunfan Li
6eb5070cbc Merge branch 'master' into Playerbot 2024-10-04 21:57:35 +08:00
Yunfan Li
9ebdbd8459 Merge branch 'master' into Playerbot 2024-09-29 23:22:47 +08:00
Yunfan Li
66c55bc450 Merge branch 'master' into Playerbot 2024-09-22 21:56:15 +08:00
Yunfan Li
9780dbab7e Merge branch 'master' into Playerbot 2024-09-17 23:15:28 +08:00
Yunfan Li
910848c51b Revert "Revert "Merge branch 'master' into Playerbot""
This reverts commit 2358b256f2.
2024-09-17 23:14:42 +08:00
Yunfan Li
57b7a6a4eb Merge pull request #22 from manstfu/Playerbot
Fixed spells not granted by quest
2024-09-15 10:57:28 +08:00
manstfu
ddd7c1fb6c Updated with master branch 2024-09-14 18:25:46 +02:00
manstfu
c85e9772a8 Update PlayerQuest.cpp
Fixed spells not granted by quests
2024-09-14 09:12:52 +02:00
Yunfan Li
af776520db Merge pull request #21 from liyunfan1223/revert_spell_crash
Revert "Merge branch 'master' into Playerbot"
2024-09-13 17:45:21 +08:00
Yunfan Li
2358b256f2 Revert "Merge branch 'master' into Playerbot"
This reverts commit 9973151927, reversing
changes made to 6f5b504e4c.
2024-09-13 17:13:32 +08:00
Yunfan Li
7e8c2d2887 Fix continuous integration workflow 2024-09-12 22:52:49 +08:00
Yunfan Li
9973151927 Merge branch 'master' into Playerbot 2024-09-12 22:49:08 +08:00
Yunfan Li
6f5b504e4c Merge branch 'master' into Playerbot 2024-09-07 14:27:11 +08:00
Yunfan Li
414805e692 Merge branch 'master' into Playerbot 2024-09-04 23:46:34 +08:00
Yunfan Li
f8a28b6883 Merge branch 'master' into Playerbot 2024-08-30 22:38:08 +08:00
Yunfan Li
fdb6fedc00 Naxx scripts header 2024-08-26 23:05:53 +08:00
Yunfan Li
a642358a43 Merge branch 'master' into Playerbot 2024-08-26 22:29:54 +08:00
Yunfan Li
1bf88ad3a3 Merge branch 'master' into Playerbot 2024-08-19 18:59:50 +08:00
Yunfan Li
27b243e7b2 Merge branch 'master' into Playerbot 2024-08-18 23:02:22 +08:00
Yunfan Li
33e4bc8390 Merge branch 'master' into Playerbot 2024-08-12 01:07:20 +08:00
Yunfan Li
c3be0fa2a8 Merge branch 'master' into Playerbot 2024-08-05 01:22:16 +08:00
Yunfan Li
3e2509e20c Merge pull request #20 from atidot3/Playerbot
Fix last modification warning chat.h
2024-08-03 21:44:04 +08:00
Atidote
2cde786785 Merge branch 'liyunfan1223:Playerbot' into Playerbot 2024-08-03 15:13:32 +02:00
Atidot3
0406652bae fix chat warning 2024-08-03 15:11:13 +02:00
Yunfan Li
f5e44cd8a6 Merge branch 'master' into Playerbot 2024-08-01 15:41:23 +08:00
Yunfan Li
7227e78f54 Merge pull request #19 from liyunfan1223/movement-rewrite
Add MoveKnockbackFromForPlayer
2024-08-01 11:40:40 +08:00
Yunfan Li
0ba424a853 Merge pull request #18 from atidot3/Playerbot
Playerbot helper
2024-08-01 11:40:24 +08:00
Yunfan Li
7a1986da61 Merge pull request #17 from noisiver/playerbots
Fix compiler warnings
2024-08-01 11:39:42 +08:00
Yunfan Li
f6a9b1f97d Add MoveKnockbackFromForPlayer 2024-07-31 23:47:24 +08:00
antony
bba6c86364 Playerbot helper 2024-07-31 17:24:20 +02:00
Revision
84c12b0402 Fix warnings 2024-07-30 15:42:07 +02:00
Yunfan Li
e6fa5732dc Fix macos build 2024-07-29 23:08:30 +08:00
Yunfan Li
172f54b49a Merge branch 'master' into Playerbot 2024-07-29 15:40:17 +08:00
Yunfan Li
f7ad415b3f Merge pull request #15 from atidot3/Playerbot
Playerbot fixes and functionnality to talk in channels
2024-07-27 23:56:51 +08:00
antony
4a48e18d5b Playerbot fixes and functionnality to talk in channels 2024-07-26 11:34:32 +02:00
Yunfan Li
5276676a11 Merge branch 'master' into Playerbot 2024-07-24 20:57:52 +08:00
Yunfan Li
c72188467a Merge branch 'master' into Playerbot 2024-07-23 18:23:10 +08:00
Yunfan Li
22132addce Merge branch 'master' into Playerbot 2024-07-19 17:25:43 +08:00
Yunfan Li
05c9a96ba9 Merge branch 'master' into Playerbot 2024-07-11 12:32:13 +08:00
Yunfan Li
1f54cb14fa Merge branch 'master' into Playerbot 2024-07-07 13:33:14 +08:00
Yunfan Li
223ec63ba5 Merge branch 'master' into Playerbot 2024-07-03 22:54:06 +08:00
Yunfan Li
2a2e2ec445 Rollback name check 2024-07-03 20:01:14 +08:00
Yunfan Li
cc5adebbe4 Merge branch 'master' into Playerbot 2024-07-03 16:04:51 +08:00
Yunfan Li
d7a07b2397 Merge branch 'master' into Playerbot 2024-06-29 21:57:41 +08:00
Yunfan Li
9a11d9dd5b Merge branch 'master' into Playerbot 2024-06-28 18:36:45 +08:00
Yunfan Li
fb4dbdd604 Merge branch 'master' into Playerbot 2024-06-24 18:51:01 +08:00
Yunfan Li
20f917c48f Merge branch 'master' into Playerbot 2024-06-22 16:09:16 +08:00
Yunfan Li
72725635ba Merge branch 'master' into Playerbot 2024-06-19 14:32:16 +08:00
Yunfan Li
7ca3db8bd0 Merge branch 'master' into Playerbot 2024-06-10 00:03:20 +08:00
Yunfan Li
72634b2829 Merge branch 'master' into Playerbot 2024-06-07 22:28:03 +08:00
Yunfan Li
971b2f8316 Merge branch 'master' into Playerbot 2024-06-03 23:16:28 +08:00
Yunfan Li
12ea82a57f [Scripts] Naxxramas scripts refactor with namespace 2024-05-26 23:41:04 +08:00
Yunfan Li
1e22c4dc94 Merge branch 'master' into Playerbot 2024-05-26 23:00:39 +08:00
Yunfan Li
5079750396 Merge branch 'master' into Playerbot 2024-05-07 22:22:40 +08:00
Yunfan Li
9bbe90d388 Merge branch 'master' into Playerbot 2024-05-04 23:35:53 +08:00
Yunfan Li
0a1570ec52 Merge branch 'master' into Playerbot 2024-04-29 20:00:32 +08:00
Yunfan Li
99bc841ff6 Merge branch 'master' into Playerbot 2024-04-26 18:56:32 +08:00
Yunfan Li
c010742289 Merge branch 'master' into Playerbot 2024-04-22 21:50:43 +08:00
Yunfan Li
10bd872f2d Merge branch 'master' into Playerbot 2024-04-15 21:02:03 +08:00
Yunfan Li
ab9fe20600 Merge branch 'master' into Playerbot 2024-04-14 21:08:07 +08:00
Yunfan Li
65cb23b56a Merge branch 'master' into Playerbot 2024-04-10 23:50:39 +08:00
Yunfan Li
f0be01a5d7 Merge branch 'master' into Playerbot 2024-04-07 21:49:34 +08:00
Yunfan Li
d74a6dd960 Merge branch 'master' into Playerbot 2024-03-31 12:44:21 +08:00
Yunfan Li
6338010e09 Merge branch 'master' into Playerbot 2024-03-28 19:15:09 +08:00
Yunfan Li
97604fab77 Merge branch 'master' into Playerbot 2024-03-22 20:41:43 +08:00
Yunfan Li
91870c9ccd Merge branch 'azerothcore:master' into Playerbot 2024-03-19 20:12:59 +08:00
Yunfan Li
4387de8b82 Fix macos CI 2024-03-18 22:17:56 +08:00
Yunfan Li
e0ddd7f610 Disable test build for macos CI 2024-03-18 19:55:39 +08:00
Yunfan Li
0024602d42 CI ignore warnings 2024-03-18 17:35:29 +08:00
Yunfan Li
b1ee6cfe06 Fix macos compilation 2024-03-18 14:25:49 +08:00
Yunfan Li
af717c592f Fix macos CI 2024-03-18 09:07:56 +08:00
Yunfan Li
ce59a892c7 Fix macos CI 2024-03-17 19:48:03 +08:00
Yunfan Li
68219e6f55 Merge branch 'azerothcore:master' into Playerbot 2024-03-17 12:05:57 +08:00
Yunfan Li
a42219e17d Merge branch 'azerothcore:master' into Playerbot 2024-03-12 16:54:14 +08:00
Yunfan Li
b3f96a2bc1 Update core-build.yml 2024-03-12 14:52:37 +08:00
Yunfan Li
23cf1a3aab Update workflows 2024-03-12 14:50:04 +08:00
Yunfan Li
f0cb94cb3f Fix variable unused warning 2024-03-12 13:56:48 +08:00
Yunfan Li
6d5b402c2c Fix workflows 2024-03-12 13:15:19 +08:00
Yunfan Li
60b624a3ac Fix workflows 2024-03-12 13:10:51 +08:00
Yunfan Li
19cd29ff6d Merge pull request #6 from liyunfan1223/revert-5-Playerbot
Revert "Split Ulduar's script files"
2024-03-12 12:46:05 +08:00
Yunfan Li
c36a7a25a0 Revert "Split Ulduar's script files" 2024-03-12 12:41:20 +08:00
Yunfan Li
187db6f688 Merge pull request #5 from Garashan/Playerbot
Split Ulduar's script files
2024-03-12 11:38:04 +08:00
Garashan
984e03db18 Split Ulduar's script files
Split Ulduar script .cpp files into .h and .cpp files.
2024-03-11 19:25:24 +01:00
Yunfan Li
01a6bd65bf Merge branch 'master' into Playerbot 2024-03-09 10:30:25 +08:00
Yunfan Li
5ef572eaf9 Merge pull request #4 from MrSlntGhost/Playerbot
Fix docker load metadata error
2024-03-06 19:02:55 +08:00
MrSlntGhost
8a1635bc6e Fix docker load metadata error 2024-03-05 21:46:31 +01:00
Yunfan Li
0b0eeb05c9 Merge branch 'master' into Playerbot 2024-03-04 17:13:57 +08:00
Yunfan Li
8e5731ff60 Fix ServerScript.h 2024-03-03 12:37:43 +08:00
Yunfan Li
51219291a3 Merge branch 'master' into Playerbot 2024-03-03 11:58:01 +08:00
Yunfan Li
7c856eaf63 Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot 2024-02-24 22:48:16 +08:00
Yunfan Li
b4046d48d7 Merge branch 'master' into Playerbot 2024-02-22 23:34:59 +08:00
Yunfan Li
ccff9469fc Merge branch 'master' into Playerbot 2024-02-19 23:10:00 +08:00
Yunfan Li
cd5826f283 Merge branch 'master' into Playerbot 2024-02-14 01:02:12 +08:00
Yunfan Li
5699c97d8c Merge branch 'master' into Playerbot 2024-02-11 23:45:22 +08:00
Yunfan Li
9784f932e9 Merge branch 'master' into Playerbot 2024-02-06 17:51:47 +08:00
Yunfan Li
1ef5b9a6b4 Merge branch 'master' into Playerbot 2024-01-29 11:46:32 +08:00
Yunfan Li
b314b04001 Merge branch 'master' into Playerbot 2024-01-23 12:31:39 +08:00
Yunfan Li
9e172c9113 Merge branch 'master' into Playerbot 2024-01-15 21:00:38 +08:00
Yunfan Li
b70e64dbcf Merge branch 'master' into Playerbot 2024-01-14 15:23:52 +08:00
Yunfan Li
600b0873e7 Merge branch 'master' into Playerbot 2024-01-08 23:30:50 +08:00
Yunfan Li
cb795ae5d4 Merge branch 'master' into Playerbot 2024-01-07 22:41:44 +08:00
Yunfan Li
213300bf66 Merge branch 'master' into Playerbot 2024-01-06 17:54:45 +08:00
Yunfan Li
ccf92f481d Merge branch 'master' into Playerbot 2024-01-04 19:22:20 +08:00
Yunfan Li
19f7e753ba Merge pull request #2 from oiuv/Playerbot
Playerbot
2023-12-28 22:08:00 +08:00
Yunfan Li
68c8fad239 Merge pull request #1 from AlvinZhu/Playerbot
Force playerbots locale enUS and Fix multi-language DBC loading
2023-12-28 22:07:05 +08:00
Oiuv
f68f398e59 Merge branch 'master' into Playerbot 2023-12-28 17:33:26 +08:00
Alvin Zhu
608ff291cb Force playerbots locale enUS 2023-12-27 17:00:20 +08:00
Alvin Zhu
7c91ec9bf9 Fix multi-language DBC loading 2023-12-27 16:59:26 +08:00
Yunfan Li
452584a155 Merge branch 'master' into Playerbot 2023-12-17 22:42:51 +08:00
Yunfan Li
80a8896dfe playerbot logout 2023-12-17 22:41:43 +08:00
Yunfan Li
60cf17d70a fix scripts issue 2023-12-12 20:52:59 +08:00
Yunfan Li
7915f79d04 Merge branch 'master' into Playerbot 2023-12-12 20:52:42 +08:00
Yunfan Li
d879fc9258 Merge branch 'master' into Playerbot 2023-10-27 20:12:09 +08:00
Yunfan Li
57e0c7a09f Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot 2023-10-22 19:52:23 +08:00
Yunfan Li
a5e27362d8 Merge commit '26c583c24ab7dbbf1fecf3dcd737c1ad543c8b33' into Playerbot_1017 2023-10-17 22:18:39 +08:00
Yunfan Li
2dd1490c18 Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot 2023-09-23 22:44:15 +08:00
Yunfan Li
e7ac00b586 Merge branch 'master' into Playerbot 2023-09-05 19:24:48 +08:00
Yunfan Li
28fcb40b88 Merge branch 'master' into Playerbot 2023-09-05 00:13:44 +08:00
Yunfan Li
cc4ac0ab57 Merge branch 'master' into Playerbot 2023-09-03 14:38:52 +08:00
Yunfan Li
92c6ef23ff Merge branch 'master' into Playerbot 2023-09-01 21:17:04 +08:00
Yunfan Li
c6bcda8b9d Merge branch 'master' into Playerbot 2023-08-29 20:50:49 +08:00
Yunfan Li
e2019033c1 Merge branch 'master' into Playerbot 2023-08-27 00:42:24 +08:00
Yunfan Li
58a7625be7 Merge branch 'master' into Playerbot 2023-08-25 02:29:53 +08:00
Yunfan Li
4b1f585fab Merge branch 'master' into Playerbot 2023-08-24 22:07:53 +08:00
Yunfan Li
33eb24f543 MOD_PLAYERBOTS macro 2023-08-24 21:08:59 +08:00
Yunfan Li
36e18dd5e1 change gitmodules 2023-08-10 15:22:06 +08:00
Yunfan Li
6a954d7560 Merge branch 'master' into Playerbot 2023-08-10 13:45:03 +08:00
Yunfan Li
b8567b3f66 conf for playerbots log 2023-08-10 10:30:12 +08:00
Yunfan Li
df11f5a0e7 Merge branch 'master' into Playerbot 2023-08-07 23:58:57 +08:00
Yunfan Li
db889ed3c9 Merge branch 'master' into Playerbot 2023-08-05 19:11:41 +08:00
Yunfan Li
a4e5ff3779 Merge branch 'master' into Playerbot 2023-08-01 23:21:36 +08:00
Yunfan Li
058526b612 Merge branch 'master' into Playerbot 2023-07-30 14:37:00 +08:00
Yunfan Li
78e21a0539 Merge branch 'master' into Playerbot 2023-07-26 13:25:50 +08:00
Yunfan Li
06b2f25a00 Fix(scripts): bot receive CMSG packet 2023-07-26 13:10:55 +08:00
Yunfan Li
2ca14cd5eb Merge branch 'master' into Playerbot 2023-07-24 14:43:27 +08:00
Yunfan Li
95add2b815 Merge branch 'master' into Playerbot 2023-07-18 17:59:18 +08:00
Yunfan Li
2afc3a46d0 refactor naxxramas 2023-07-18 17:58:03 +08:00
Yunfan Li
4d3abb0538 logout bots in kickall 2023-07-15 16:42:10 +08:00
Yunfan Li
95843d5835 Merge branch 'master' into Playerbot 2023-07-14 13:16:02 +08:00
Yunfan Li
44046ee5df Merge branch 'master' into Playerbot 2023-07-08 00:47:19 +08:00
Yunfan Li
0713446e1e Merge branch 'master' into Playerbot 2023-07-04 10:05:31 +08:00
Yunfan Li
55821a893c Merge branch 'master' into Playerbot 2023-06-22 09:53:06 +08:00
Yunfan Li
433467b8c0 split anubrekhan, grobbulus scripts 2023-06-18 21:52:39 +08:00
Yunfan Li
abaf4655e2 Merge branch 'master' into Playerbot 2023-06-18 20:48:30 +08:00
Yunfan Li
b417973361 Merge branch 'master' into Playerbot 2023-06-13 01:04:01 +08:00
Yunfan Li
e766845cb4 Spell(item check): turn ItemLevel to RequiredLevel 2023-06-11 18:19:28 +08:00
Yunfan Li
69740eb29b Merge branch 'master' into Playerbot 2023-06-09 23:40:54 +08:00
Yunfan Li
23306a3d10 split heigan 2023-06-09 23:16:44 +08:00
Yunfan Li
f05b5e678c split grobbulus 2023-06-08 10:58:37 +08:00
Yunfan Li
dc4c50923c Merge branch 'master' into Playerbot 2023-06-07 23:39:37 +08:00
Yunfan Li
46f277f2f6 spilit boss_heigan to .cpp and .h 2023-06-06 00:10:41 +08:00
Yunfan Li
a7519279f7 Merge branch 'master' into Playerbot 2023-06-06 00:07:04 +08:00
Yunfan Li
05103aeacf Merge branch 'master' into Playerbot 2023-06-02 15:38:15 +08:00
Yunfan Li
a1a3263727 Merge branch 'master' into Playerbot 2023-05-29 19:05:17 +08:00
Yunfan Li
0e7289304d command setskill range allow 0 2023-05-29 19:00:11 +08:00
Yunfan Li
9d3d2c84fe HandlePlayerLoginFromDB 2023-05-26 20:52:01 +08:00
Yunfan Li
f677900061 Prevent GUID from exhausting 2023-05-26 01:02:22 +08:00
Yunfan Li
ec45b40cb9 feat: fix warning and configuration 2023-05-24 19:43:56 +08:00
Yunfan Li
72660b1ed8 Merge branch 'master' into Playerbot 2023-05-24 17:57:30 +08:00
ZhengPeiRu21
aa1214a6ba Merge branch 'azerothcore:master' into Playerbot 2023-05-01 10:31:02 -06:00
ZhengPeiRu21
2e294eae2b Merge pull request #6 from kjack9/Playerbot
fix(Docker): add libboost-thread-dev dependency to Dockerfile
2023-05-01 10:30:47 -06:00
KJack
42e8c3f172 fix(Docker): add libboost-thread-dev dependency to Dockerfile 2023-05-01 11:51:21 -04:00
ZhengPeiRu21
25d2c3ebe7 Merge branch 'azerothcore:master' into Playerbot 2023-04-26 13:57:57 -06:00
ZhengPeiRu21
d6a099e98c Merge branch 'azerothcore:master' into Playerbot 2023-04-24 09:38:43 -06:00
ZhengPeiRu21
1773a505c0 Merge branch 'azerothcore:master' into Playerbot 2023-04-23 13:53:58 -06:00
ZhengPeiRu21
e355e79482 Merge branch 'azerothcore:master' into Playerbot 2023-04-21 22:17:38 -06:00
ZhengPeiRu21
bb0f212b87 Merge branch 'azerothcore:master' into Playerbot 2023-04-20 16:01:49 -06:00
ZhengPeiRu21
780c8ede85 Merge branch 'azerothcore:master' into Playerbot 2023-04-19 09:48:45 -06:00
ZhengPeiRu21
e622ba991f Merge branch 'azerothcore:master' into Playerbot 2023-04-18 09:28:55 -06:00
ZhengPeiRu21
affbfa1e30 Merge branch 'azerothcore:master' into Playerbot 2023-04-16 20:27:56 -06:00
ZhengPeiRu21
d02099db9a Merge branch 'azerothcore:master' into Playerbot 2023-04-13 10:42:03 -06:00
ZhengPeiRu21
ae175496dd Merge branch 'azerothcore:master' into Playerbot 2023-04-10 08:27:49 -06:00
ZhengPeiRu21
0248ed8778 Merge branch 'azerothcore:master' into Playerbot 2023-04-06 10:12:34 -06:00
ZhengPeiRu21
43778acb9a Merge branch 'azerothcore:master' into Playerbot 2023-04-05 11:49:27 -06:00
ZhengPeiRu21
ed4e0ffbda Merge branch 'azerothcore:master' into Playerbot 2023-04-04 13:23:00 -06:00
ZhengPeiRu21
c9186547dd Merge branch 'azerothcore:master' into Playerbot 2023-04-04 08:16:34 -06:00
ZhengPeiRu21
a27f752dcc Merge branch 'azerothcore:master' into Playerbot 2023-04-03 22:10:19 -06:00
郑佩茹
00f9f8e0d0 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2023-04-03 07:53:39 -06:00
郑佩茹
1b3fd82f5c Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Guilds/Guild.cpp
2023-04-03 07:52:56 -06:00
ZhengPeiRu21
4004dcb23b Merge branch 'azerothcore:master' into Playerbot 2023-04-02 09:42:34 -06:00
ZhengPeiRu21
6cb1778c6d Merge branch 'azerothcore:master' into Playerbot 2023-04-01 08:07:59 -06:00
ZhengPeiRu21
0aca3f7b72 Merge branch 'azerothcore:master' into Playerbot 2023-03-30 07:34:21 -06:00
ZhengPeiRu21
2bf872e446 Merge branch 'azerothcore:master' into Playerbot 2023-03-29 06:29:03 -06:00
ZhengPeiRu21
939291c9c2 Merge branch 'azerothcore:master' into Playerbot 2023-03-28 09:26:50 -06:00
ZhengPeiRu21
4c18f3b3e5 Merge branch 'azerothcore:master' into Playerbot 2023-03-25 13:06:10 -06:00
ZhengPeiRu21
38268a187e Merge branch 'azerothcore:master' into Playerbot 2023-03-23 09:07:11 -06:00
ZhengPeiRu21
317afd051b Merge branch 'azerothcore:master' into Playerbot 2023-03-22 10:16:52 -06:00
ZhengPeiRu21
71e8baf929 Merge branch 'azerothcore:master' into Playerbot 2023-03-22 09:35:01 -06:00
ZhengPeiRu21
e9143a2c0b Merge branch 'azerothcore:master' into Playerbot 2023-03-21 08:46:26 -06:00
郑佩茹
0a192af532 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2023-03-16 11:08:57 -06:00
郑佩茹
be7c57507f Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Entities/Player/Player.h
2023-03-16 10:00:13 -06:00
ZhengPeiRu21
e898462333 Merge branch 'azerothcore:master' into Playerbot 2023-03-10 08:18:50 -07:00
ZhengPeiRu21
ca84c22cf2 Merge branch 'azerothcore:master' into Playerbot 2023-03-06 23:19:41 -07:00
ZhengPeiRu21
fce7ba32a3 Merge branch 'azerothcore:master' into Playerbot 2023-03-02 08:52:37 -07:00
郑佩茹
328d991305 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2023-03-01 11:52:48 -07:00
郑佩茹
826bac08ec Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.h
2023-03-01 11:52:02 -07:00
ZhengPeiRu21
d40a859de6 Merge branch 'azerothcore:master' into Playerbot 2023-02-21 11:29:39 -07:00
ZhengPeiRu21
62d3317c93 Merge branch 'azerothcore:master' into Playerbot 2023-02-17 16:12:43 -07:00
郑佩茹
6a1589c989 Update to be compatible with latest AC 2023-02-17 12:41:37 -07:00
郑佩茹
8ffdf088d4 Merge branch 'master' into Playerbot 2023-02-17 11:37:31 -07:00
郑佩茹
d5e1ec851a Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2023-02-14 12:03:09 -07:00
郑佩茹
4bc9901f16 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.h
2023-02-13 13:07:03 -07:00
ZhengPeiRu21
ba4e49f5b2 Merge branch 'azerothcore:master' into Playerbot 2023-02-10 15:48:50 -07:00
郑佩茹
ccee04c908 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2023-02-09 12:42:09 -07:00
郑佩茹
03b3f9d051 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/World/World.h
2023-02-09 12:40:25 -07:00
ZhengPeiRu21
465d19b7f6 Merge branch 'azerothcore:master' into Playerbot 2023-01-19 11:57:25 -07:00
ZhengPeiRu21
f51115a054 Merge branch 'azerothcore:master' into Playerbot 2023-01-12 09:20:22 -07:00
ZhengPeiRu21
16eecd908e Merge branch 'azerothcore:master' into Playerbot 2023-01-04 11:21:02 -07:00
ZhengPeiRu21
b86914fd37 Merge branch 'azerothcore:master' into Playerbot 2022-12-29 12:20:26 -07:00
ZhengPeiRu21
2bb78d1451 Merge branch 'azerothcore:master' into Playerbot 2022-12-27 09:50:12 -07:00
ZhengPeiRu21
cd6e0d7e0b Merge branch 'azerothcore:master' into Playerbot 2022-12-12 10:18:34 -07:00
ZhengPeiRu21
5a8fe17184 Merge branch 'azerothcore:master' into Playerbot 2022-12-09 11:56:19 -07:00
郑佩茹
2ec6f2d92f Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-12-07 14:46:45 -07:00
郑佩茹
c1c97ad425 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
2022-12-07 14:46:21 -07:00
ZhengPeiRu21
fad161a76b Merge branch 'azerothcore:master' into Playerbot 2022-12-01 09:43:29 -07:00
ZhengPeiRu21
87f185bb85 Merge branch 'azerothcore:master' into Playerbot 2022-11-23 09:13:39 -07:00
郑佩茹
ec7288bc17 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-11-18 12:15:17 -07:00
郑佩茹
cab0d6f027 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Guilds/Guild.cpp
2022-11-18 10:21:36 -07:00
ZhengPeiRu21
8ec316da13 Merge branch 'azerothcore:master' into Playerbot 2022-11-07 13:20:52 -07:00
ZhengPeiRu21
4d068b0e74 Merge branch 'azerothcore:master' into Playerbot 2022-11-04 09:12:25 -06:00
ZhengPeiRu21
18ae6a473f Merge branch 'azerothcore:master' into Playerbot 2022-10-31 16:12:42 -06:00
ZhengPeiRu21
99dbd3d4c5 Merge branch 'azerothcore:master' into Playerbot 2022-10-26 09:07:05 -06:00
ZhengPeiRu21
780b947f51 Merge branch 'azerothcore:master' into Playerbot 2022-10-24 16:21:51 -06:00
ZhengPeiRu21
b68c3a733a Merge branch 'azerothcore:master' into Playerbot 2022-10-24 08:50:01 -06:00
ZhengPeiRu21
e0b905aef7 Merge branch 'azerothcore:master' into Playerbot 2022-10-22 17:44:53 -06:00
ZhengPeiRu21
4b8fb01016 Merge branch 'azerothcore:master' into Playerbot 2022-10-19 19:25:35 -06:00
ZhengPeiRu21
ce8592b29b Merge branch 'azerothcore:master' into Playerbot 2022-10-17 10:41:21 -06:00
ZhengPeiRu21
46438255bf Merge branch 'azerothcore:master' into Playerbot 2022-10-15 09:59:28 -06:00
郑佩茹
5996f1f1af Remove outdated Git submodule 2022-10-07 09:17:43 -06:00
ZhengPeiRu21
906748cd16 Merge branch 'azerothcore:master' into Playerbot 2022-10-07 09:14:47 -06:00
ZhengPeiRu21
80c608df4f Merge branch 'azerothcore:master' into Playerbot 2022-10-02 10:46:28 -06:00
ZhengPeiRu21
a300a4be12 Merge branch 'azerothcore:master' into Playerbot 2022-09-28 17:09:45 -06:00
郑佩茹
203f2ec7eb Update PLAYERBOTS_SEL_TEXT query 2022-09-27 08:40:27 -06:00
ZhengPeiRu21
8c05b69e4e Merge branch 'azerothcore:master' into Playerbot 2022-09-26 10:01:10 -06:00
ZhengPeiRu21
7b5a03ac8f Merge branch 'azerothcore:master' into Playerbot 2022-09-23 10:03:15 -06:00
ZhengPeiRu21
4c6c80d880 Merge branch 'azerothcore:master' into Playerbot 2022-09-22 15:18:27 -06:00
ZhengPeiRu21
8da3ae8a91 Merge branch 'azerothcore:master' into Playerbot 2022-09-21 09:42:10 -06:00
ZhengPeiRu21
e67849a858 Merge branch 'azerothcore:master' into Playerbot 2022-09-19 09:23:59 -06:00
ZhengPeiRu21
d38899321c Merge branch 'azerothcore:master' into Playerbot 2022-09-18 17:01:24 -06:00
ZhengPeiRu21
6dfc04c2bf Merge branch 'azerothcore:master' into Playerbot 2022-09-15 18:12:58 -06:00
ZhengPeiRu21
46fa7b484d Merge branch 'azerothcore:master' into Playerbot 2022-09-15 09:10:16 -06:00
ZhengPeiRu21
76f4f741d8 Merge branch 'azerothcore:master' into Playerbot 2022-09-13 18:48:47 -06:00
ZhengPeiRu21
8791645166 Merge branch 'azerothcore:master' into Playerbot 2022-09-13 10:44:15 -06:00
ZhengPeiRu21
77571adf1f Merge branch 'azerothcore:master' into Playerbot 2022-09-08 15:10:29 -06:00
ZhengPeiRu21
aa1705d6c5 Merge branch 'azerothcore:master' into Playerbot 2022-09-07 09:35:58 -06:00
郑佩茹
c9fa699837 Attempt to fix Evade issue 2022-09-06 13:35:06 -06:00
ZhengPeiRu21
819532426b Merge branch 'azerothcore:master' into Playerbot 2022-09-06 12:11:39 -06:00
ZhengPeiRu21
31f36b25f2 Merge branch 'azerothcore:master' into Playerbot 2022-09-03 10:17:45 -06:00
ZhengPeiRu21
ac5bcfae12 Merge branch 'azerothcore:master' into Playerbot 2022-09-02 10:49:43 -06:00
ZhengPeiRu21
399b8803b8 Merge branch 'azerothcore:master' into Playerbot 2022-09-01 12:56:06 -06:00
ZhengPeiRu21
cd7a22a4de Merge branch 'azerothcore:master' into Playerbot 2022-08-30 20:52:05 -06:00
ZhengPeiRu21
2759a5ee1d Merge branch 'azerothcore:master' into Playerbot 2022-08-29 09:30:33 -06:00
郑佩茹
0752208c43 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
2022-08-25 10:07:17 -06:00
郑佩茹
3d8f540110 ResetChatTimer no longer needed with upstream chat flood handling changes 2022-08-19 12:16:34 -06:00
ZhengPeiRu21
774225e669 Merge branch 'azerothcore:master' into Playerbot 2022-08-18 13:48:09 -06:00
郑佩茹
bbd283598d Fix Evading issue 2022-08-18 13:46:22 -06:00
郑佩茹
32c6babdb7 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Entities/Unit/Unit.h
2022-08-16 16:13:26 -06:00
郑佩茹
29e14042e7 Update to work with latest AzerothCore master 2022-07-27 10:15:08 -06:00
郑佩茹
a5f1fc38a8 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot
 Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
2022-07-27 09:57:48 -06:00
郑佩茹
6ad65508af Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
2022-07-27 09:11:50 -06:00
ZhengPeiRu21
2a45fdff1f Merge pull request #5 from KobaltBlu/Playerbot
fix: illegal instruction error in Creature.cpp:3470
2022-07-21 09:07:48 -06:00
ZhengPeiRu21
d960ccd4e4 Merge branch 'azerothcore:master' into Playerbot 2022-07-21 09:06:44 -06:00
KobaltBlu
55510b18e6 fix: illegal instruction error in Creature.cpp:3470 2022-07-20 00:50:00 -04:00
ZhengPeiRu21
0fd3d185b9 Merge pull request #4 from KobaltBlu/Playerbot
fix: remove WorldFloatConfigs[CONFIG_WATER_BREATH_TIMER]
2022-07-19 08:53:24 -06:00
KobaltBlu
efd245daf5 fix: remove WorldFloatConfigs[CONFIG_WATER_BREATH_TIMER]
fixes compile error: "fatal error: redefinition of enumerator"
2022-07-16 11:09:52 -04:00
郑佩茹
27300e9fdf Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-07-13 10:32:18 -06:00
郑佩茹
a44c241430 Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/apps/worldserver/worldserver.conf.dist
#	src/server/game/Battlegrounds/Battleground.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/World/World.cpp
2022-07-13 10:31:30 -06:00
ZhengPeiRu21
f1043be632 Merge branch 'azerothcore:master' into Playerbot 2022-07-06 10:08:55 -06:00
ZhengPeiRu21
0d3a10cc26 Merge branch 'azerothcore:master' into Playerbot 2022-07-05 10:24:47 -06:00
ZhengPeiRu21
e8781b0fc1 Merge branch 'azerothcore:master' into Playerbot 2022-07-01 10:11:40 -06:00
ZhengPeiRu21
c687d40741 Merge branch 'azerothcore:master' into Playerbot 2022-06-30 09:34:51 -06:00
ZhengPeiRu21
65f6fbb496 Merge branch 'azerothcore:master' into Playerbot 2022-06-27 09:06:46 -06:00
ZhengPeiRu21
98f0f093e5 Merge branch 'azerothcore:master' into Playerbot 2022-06-24 15:25:18 -06:00
郑佩茹
67e9f2fd35 Fix merge conflicts 2022-06-21 13:24:33 -06:00
郑佩茹
98c22aa96d Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-06-21 13:23:18 -06:00
郑佩茹
87fc81d0cc Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-06-21 09:19:50 -06:00
郑佩茹
743479e817 Merge branch 'Playerbot' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-06-16 10:06:30 -06:00
郑佩茹
7cc44a4ab1 Merge branch 'breathTimerConfig' into Playerbot 2022-06-16 10:06:05 -06:00
ZhengPeiRu21
3ab6d3cb37 Merge branch 'azerothcore:master' into Playerbot 2022-06-16 10:04:30 -06:00
ZhengPeiRu21
4f8564ea5b Merge branch 'azerothcore:master' into Playerbot 2022-06-13 15:00:30 -06:00
ZhengPeiRu21
2d7cba14db Merge branch 'azerothcore:master' into Playerbot 2022-06-10 08:51:40 -06:00
ZhengPeiRu21
d8a2665867 Merge branch 'azerothcore:master' into Playerbot 2022-06-08 11:10:38 -06:00
郑佩茹
46e9e82118 feat(Core/Config): Configurable Water Breath Timer 2022-06-03 12:34:31 -06:00
ZhengPeiRu21
427f0afaaf Merge branch 'azerothcore:master' into Playerbot 2022-06-03 10:02:54 -06:00
郑佩茹
b314b3a711 Merge branch 'master' into Playerbot 2022-05-31 09:11:39 -06:00
ZhengPeiRu21
2442fc6ad7 Merge branch 'azerothcore:master' into Playerbot 2022-05-29 21:07:57 -06:00
郑佩茹
650e71728a Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
2022-05-25 08:51:01 -06:00
ZhengPeiRu21
882359297d Merge branch 'azerothcore:master' into Playerbot 2022-05-23 09:04:16 -06:00
ZhengPeiRu21
0d42597ba3 Merge branch 'azerothcore:master' into Playerbot 2022-05-22 12:08:05 -06:00
ZhengPeiRu21
34b332b51b Merge branch 'azerothcore:master' into Playerbot 2022-05-19 12:55:28 -06:00
ZhengPeiRu21
cc94955bb2 Merge branch 'azerothcore:master' into Playerbot 2022-05-17 11:00:13 -06:00
郑佩茹
9a6c789f1a Add missing override annotation to GetPlayerbotsDBRevision 2022-05-16 13:16:03 -06:00
ZhengPeiRu21
26595bd2d9 Merge branch 'azerothcore:master' into Playerbot 2022-05-16 13:11:42 -06:00
ZhengPeiRu21
6b57ea8223 Merge branch 'azerothcore:master' into Playerbot 2022-05-12 09:41:56 -06:00
ZhengPeiRu21
e05bc38461 Merge pull request #3 from qudzy/upstream/refactor-instance-suggestions
Refactor instance suggestions
2022-05-10 08:48:32 -06:00
ZhengPeiRu21
0053ac67d9 Merge branch 'azerothcore:master' into Playerbot 2022-05-10 08:46:47 -06:00
ZhengPeiRu21
c2efd301b5 Merge branch 'azerothcore:master' into Playerbot 2022-05-06 16:13:01 -06:00
qudzy
44e4cd8cda Add prepared dungeon suggestion statement 2022-05-06 16:55:21 +02:00
qudzy
0e6a5bddbb Declare strToLower method in utilities 2022-05-06 16:55:21 +02:00
qudzy
1e3d488784 Ignore Visual Studio folders 2022-05-06 16:55:21 +02:00
ZhengPeiRu21
c6df5eae3a Merge branch 'azerothcore:master' into Playerbot 2022-05-04 10:47:16 -06:00
郑佩茹
0326d8576d Merge branch 'master' into Playerbot
# Conflicts:
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.cpp
#	src/server/game/World/World.h
#	src/server/scripts/Commands/cs_server.cpp
2022-05-02 16:39:21 -06:00
ZhengPeiRu21
92841a35e1 Merge branch 'azerothcore:master' into Playerbot 2022-04-26 08:42:57 -06:00
ZhengPeiRu21
84b794ab38 Merge branch 'azerothcore:master' into Playerbot 2022-04-25 08:58:13 -06:00
ZhengPeiRu21
8b0ef0b5a0 Merge branch 'azerothcore:master' into Playerbot 2022-04-22 09:13:49 -06:00
ZhengPeiRu21
0efe2a01fe Merge branch 'azerothcore:master' into Playerbot 2022-04-20 09:18:17 -06:00
ZhengPeiRu21
f5f3d78ed6 Merge branch 'azerothcore:master' into Playerbot 2022-04-19 09:07:56 -06:00
ZhengPeiRu21
534df7c448 Merge branch 'azerothcore:master' into Playerbot 2022-04-17 17:59:20 -06:00
ZhengPeiRu21
ec96415fda Merge branch 'azerothcore:master' into Playerbot 2022-04-16 21:41:45 -06:00
ZhengPeiRu21
19b2c35180 Merge branch 'azerothcore:master' into Playerbot 2022-04-14 09:06:05 -06:00
ZhengPeiRu21
a1985ddbeb Merge branch 'azerothcore:master' into Playerbot 2022-04-11 08:40:56 -06:00
ZhengPeiRu21
2cb590a48b Merge branch 'azerothcore:master' into Playerbot 2022-04-07 08:55:50 -06:00
ZhengPeiRu21
68d3ec7d77 Merge branch 'azerothcore:master' into Playerbot 2022-04-04 07:53:51 -06:00
ZhengPeiRu21
a25c289a5a Merge branch 'azerothcore:master' into Playerbot 2022-04-01 08:30:15 -06:00
ZhengPeiRu21
32dc06900c Merge branch 'azerothcore:master' into Playerbot 2022-03-30 09:53:52 -06:00
ZhengPeiRu21
1c11bde14f Merge branch 'azerothcore:master' into Playerbot 2022-03-28 17:33:20 -06:00
ZhengPeiRu21
f5f6478688 Merge branch 'azerothcore:master' into Playerbot 2022-03-27 11:23:15 -06:00
ZhengPeiRu21
7d7e66cbe4 Merge branch 'azerothcore:master' into Playerbot 2022-03-25 10:48:58 -06:00
ZhengPeiRu21
fb52816a11 Merge branch 'azerothcore:master' into Playerbot 2022-03-24 12:58:22 -06:00
ZhengPeiRu21
246e2cad2e Merge branch 'azerothcore:master' into Playerbot 2022-03-24 08:28:09 -06:00
郑佩茹
36ed431c7f Merge branch 'master' of https://github.com/ZhengPeiRu21/azerothcore-wotlk into Playerbot 2022-03-23 08:47:32 -06:00
郑佩茹
5cec9facf8 Add missing ifdef for PLAYERBOTS 2022-03-23 08:46:03 -06:00
郑佩茹
d4062269c8 Merge branch 'master' into Playerbot 2022-03-22 10:53:26 -06:00
郑佩茹
db71f4739c Fix corrupt item cache crashes, bot whispers, trade crashes 2022-03-22 10:51:50 -06:00
郑佩茹
ff0e5d5e3b Merge branch 'questXPHook' into Playerbot 2022-03-21 14:47:43 -06:00
郑佩茹
60f11b3671 Merge branch 'master' into Playerbot
# Conflicts:
#	apps/ci/ci-install-modules.sh
#	src/common/Collision/Management/MMapMgr.cpp
#	src/common/Debugging/Errors.h
#	src/server/game/AI/SmartScripts/SmartScript.cpp
#	src/server/game/Battlegrounds/Arena.cpp
#	src/server/game/Battlegrounds/ArenaScore.h
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Battlegrounds/BattlegroundMgr.cpp
#	src/server/game/Battlegrounds/BattlegroundMgr.h
#	src/server/game/Battlegrounds/BattlegroundQueue.cpp
#	src/server/game/Battlegrounds/BattlegroundQueue.h
#	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
#	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
#	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
#	src/server/game/Conditions/ConditionMgr.cpp
#	src/server/game/DataStores/M2Stores.cpp
#	src/server/game/DungeonFinding/LFGMgr.cpp
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Creature/CreatureData.h
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Entities/Player/PlayerStorage.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Groups/Group.cpp
#	src/server/game/Groups/Group.h
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/Guild.h
#	src/server/game/Handlers/BattleGroundHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Scripting/ScriptDefines/BGScript.cpp
#	src/server/game/Scripting/ScriptDefines/DatabaseScript.cpp
#	src/server/game/Scripting/ScriptDefines/PlayerScript.cpp
#	src/server/game/Scripting/ScriptDefines/ServerScript.cpp
#	src/server/game/Scripting/ScriptMgr.cpp
#	src/server/game/Scripting/ScriptMgrMacros.h
#	src/server/game/Server/Packets/MiscPackets.cpp
#	src/server/game/Server/Packets/MiscPackets.h
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.cpp
#	src/server/game/World/World.h
#	src/server/scripts/Commands/cs_npc.cpp
#	src/server/scripts/Commands/cs_server.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
#	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
2022-03-21 13:57:37 -06:00
郑佩茹
e42a572c35 Merge branch 'master' into questXPHook 2022-03-16 15:22:22 -06:00
郑佩茹
921bfbde86 Merge branch 'master' into questXPHook 2022-03-13 16:37:06 -06:00
郑佩茹
b88c5d8b89 Added changelog 2022-03-12 20:13:55 -07:00
UltraNix
12d41d1314 Big update. 2022-03-12 22:28:00 +01:00
郑佩茹
c2a6eff91d Merge branch 'master' into questXPHook 2022-03-10 12:08:00 -07:00
郑佩茹
7b3b37b1b3 Merge branch 'master' into questXPHook 2022-03-08 10:23:32 -07:00
郑佩茹
d60bb4fc90 feat(Scripting/Hooks): Implement OnQuestComputeXP() hook 2022-03-07 19:17:29 -07:00
UltraNix
6006eeeb01 asd 2021-12-07 15:57:39 +01:00
UltraNix
2cab3258bb 1st commit 2021-12-06 11:16:04 +01:00
1606 changed files with 137721 additions and 190550 deletions

View File

@@ -31,7 +31,7 @@ body:
description: |
Do you have any logs or screenshots that can be useful?
Crash logs in text are preffered over screenshots.
DO NOT POST THE FULL CRASH LOG IN THE ISSUE BODY. DO NOT UPLOAD TEXT FILES. USE [GITHUB GIST](https://gist.github.com/), PASTEBIN, OR ANY SIMILAR SERVICE INSTEAD.
If you have logs in text form please upload them to [Gist](https://gist.github.com/) or PasteBin and upload the link.
validations:
required: false
- type: input

View File

@@ -9,13 +9,9 @@ body:
description: |
Paste the issue from ChromieCraft here.
value: |
Issue linked from CC:
Triage Notes:
Original Post Below:
---
validations:
required: true

View File

@@ -10,14 +10,7 @@ on:
- synchronize
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
permissions:

View File

@@ -10,14 +10,7 @@ on:
- synchronize
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
permissions:

View File

@@ -24,14 +24,7 @@ permissions:
contents: read
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
jobs:

View File

@@ -16,14 +16,7 @@ on:
workflow_dispatch:
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
permissions:

View File

@@ -9,14 +9,7 @@ on:
- synchronize
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
env:

View File

@@ -1,7 +1,6 @@
name: PR Labeler
on:
pull_request_target:
types: [opened, synchronize, reopened, ready_for_review] # Ready for Review = Draft to Live PR
- pull_request_target
jobs:
triage:
@@ -16,4 +15,4 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/labeler.yml
sync-labels: false # true = Removes ALL current labels before adding the labels | false = Only adds the Labels
sync-labels: true

View File

@@ -9,14 +9,7 @@ on:
- synchronize
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
jobs:

View File

@@ -6,14 +6,7 @@ on:
branches: [ "Playerbot" ]
concurrency:
# One concurrency group per workflow + ref.
#
# - PRs use `refs/pull/<PR_NUMBER>/merge`, so new commits cancel older
# in-progress runs for the same PR.
# - When a PR is merged, a push to the target branch starts a new group,
# canceling any still-running PR CI.
# - Branch pushes are isolated by ref.
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.head_ref }} || concat(${{ github.ref_name }}, ${{ github.workflow }})
cancel-in-progress: true
jobs:

View File

@@ -1,5 +1,10 @@
# List of AUTHORS who contributed over time to the AzerothCore project
## Warning
The code of AzerothCore is shipped as it is without any form of warranty,
and - except for third party libraries licensed under the AGPL 3,
which you can read from the file "LICENSE".
## Point of current development
The project is currently hosted at https://www.azerothcore.org/ and developed under https://github.com/azerothcore

View File

@@ -1,5 +1,5 @@
{
"name": "azerothcore-wotlk",
"version": "15.0.0-dev",
"license": "GPL2"
"version": "14.0.0-dev",
"license": "AGPL3"
}

View File

@@ -1,66 +1,22 @@
# AzerothCore Config Merger
# ==== PHP merger (index.php + merge.php) ====
This directory contains configuration file merger tools to help update your AzerothCore server and module configurations with new options from distribution files.
This is a PHP script for merging a new .dist file with your existing .conf file (worldserver.conf.dist and authserver.conf.dist)
**Available Options:** PHP and Python versions (**Python recommended for new users**)
It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file commented out, just in case it removes something it shouldn't.
If you add your custom patch configs below "# Custom" they will be copied exactly as they are.
## Purpose
Your new config will be found under $basedir/session_id/newconfig.conf.merge
The config merger tools help you update your existing configuration files (`.conf`) to include new options that have been added to the distribution files (`.conf.dist`). Distribution files always contain the most recent configuration changes and new options, while your personal config files may be missing these updates. These tools will:
If you do not run a PHP server on your machiene you can read this guide on ["How to execute PHP code using command line?"](https://www.geeksforgeeks.org/how-to-execute-php-code-using-command-line/) on geeksforgeeks.org.
- Compare your existing config files with the latest distribution files
- Show you new configuration options that are missing from your files
- Allow you to selectively add new options to your configs
- Create automatic backups before making any changes
- Support authserver.conf, worldserver.conf, and all module configs
## Available Versions
### PHP Version
**Requirements:**
- PHP 5.6 or higher
- **Requires a web server** (Apache, Nginx, IIS, etc.) to function
- No additional libraries required (uses built-in PHP functions only)
**Features:**
- Web-based interface
- Configuration file parsing and merging
- Browser-accessible configuration management
**Usage:**
- Deploy to web server with PHP support (can be local - XAMPP, WAMP, or built-in PHP server)
- Access via web browser
- Follow web interface instructions
### Python Version (Recommended)
**Requirements:**
- Python 3.6 or higher
- No additional setup required beyond installing Python
- No additional libraries required (uses built-in modules only)
**Features:**
- Interactive menu-driven interface
- Support for server configs (authserver.conf, worldserver.conf)
- Support for module configs with bulk or selective updates
- Automatic backup creation with timestamps
- Cross-platform compatibility (Windows, Linux, macOS, and others)
- Can be run via command line or by double-clicking the .py file
**Usage:**
```bash
# Via command line
cd /path/to/configs
python config_merger.py
# Or double-click config_merger.py to open in terminal
```
php -S localhost:port -t E:\Azerothcore-wotlk\apps\config-merger\
```
## Installation
Change port to an available port to use. i.e 8000
When building AzerothCore with the `TOOL_CONFIG_MERGER` CMake option enabled, **only the Python version** will be automatically copied to your configs directory during the build process. The PHP version must be manually deployed to a web server.
Then go to your browser and type:
## Support
Both versions provide the same core functionality for merging configuration files. Choose the version that best fits your environment and preferences. Python is recommended for most users due to its simplicity and no web server requirement.
```
localhost:8000/index.php
```

View File

@@ -1,22 +0,0 @@
# ==== PHP merger (index.php + merge.php) ====
This is a PHP script for merging a new .dist file with your existing .conf file (worldserver.conf.dist and authserver.conf.dist)
It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file commented out, just in case it removes something it shouldn't.
If you add your custom patch configs below "# Custom" they will be copied exactly as they are.
Your new config will be found under $basedir/session_id/newconfig.conf.merge
If you do not run a PHP server on your machine you can read this guide on ["How to execute PHP code using command line?"](https://www.geeksforgeeks.org/how-to-execute-php-code-using-command-line/) on geeksforgeeks.org.
```
php -S localhost:port -t E:\Azerothcore-wotlk\apps\config-merger\php\
```
Change port to an available port to use. i.e 8000
Then go to your browser and type:
```
localhost:8000/index.php
```

View File

@@ -1,148 +0,0 @@
# AzerothCore Config Updater/Merger - Python Version
A command-line tool to update your AzerothCore configuration files with new options from distribution files.
> [!NOTE]
> Based on and modified from [@BoiseComputer](https://github.com/BoiseComputer) (Brian Aldridge)'s [update_module_confs](https://github.com/Brian-Aldridge/update_module_confs) project to meet AzerothCore's needs
## Overview
This tool compares your existing configuration files (`.conf`) with the latest distribution files (`.conf.dist`) and helps you add new configuration options that may have been introduced in updates. It ensures your configs stay up-to-date while preserving your custom settings.
## Features
- **Interactive Menu System** - Easy-to-use numbered menu options
- **Server Config Support** - Update authserver.conf and worldserver.conf
- **Module Config Support** - Update all or selected module configurations
- **Automatic Backups** - If you choose a valid option and there are changes, a timestamped backup is created before any changes are made (e.g. `filename(d11_m12_y2025_14h_30m_45s).bak`)
- **Selective Updates** - Choose which new config options to add (y/n prompts)
- **Safe Operation** - Only creates backups and makes changes when new options are found
## How to Use
### Interactive Mode (Default)
1. **Run the script** in your configs directory:
```bash
python config_merger.py
```
Or simply **double-click** the `config_merger.py` file to run it directly.
2. **Specify configs path** (or press Enter for current directory):
```
Enter the path to your configs folder (default: .) which means current folder:
```
3. **Choose from the menu**:
```
AzerothCore Config Updater/Merger (v. 1)
--------------------------
1 - Update Auth Config
2 - Update World Config
3 - Update Auth and World Configs
4 - Update All Modules Configs
5 - Update Modules (Selection) Configs
0 - Quit
```
### Command Line Interface (CLI)
For automation and scripting, you can use CLI mode:
```bash
python config_merger.py [config_dir] [target] [options]
```
**Arguments:**
- `config_dir` (optional): Path to configs directory (default: current directory)
- `target` (optional): What to update:
- `auth` - Update authserver.conf only
- `world` - Update worldserver.conf only
- `both` - Update both server configs
- `modules` - Update all module configs
- `modules-select` - Interactive module selection
**Options:**
- `-y, --yes`: Skip prompts and auto-add all new config options (default: prompt for each option)
- `--version`: Show version information
**Examples:**
```bash
# Interactive mode (default)
python config_merger.py
# Update auth config with prompts
python config_merger.py . auth
# Update both configs automatically (no prompts)
python config_merger.py /path/to/configs both -y
# Update all modules with confirmation
python config_merger.py . modules
```
## Menu Options Explained
- **Option 1**: Updates only `authserver.conf` from `authserver.conf.dist`
- **Option 2**: Updates only `worldserver.conf` from `worldserver.conf.dist`
- **Option 3**: Updates both server config files
- **Option 4**: Automatically processes all module config files in the `modules/` folder
- **Option 5**: Shows you a list of available modules and lets you select specific ones to update
- **Option 0**: Exit the program
## Interactive Process
For each missing configuration option found, the tool will:
1. **Show you the option** with its comments and default value
2. **Ask for confirmation**: `Add [option_name] to config? (y/n):`
3. **Add or skip** based on your choice
4. **Create backup** (before any changes are made) only if you choose a valid option and there are changes (format: `filename(d11_m12_y2025_14h_30m_45s).bak`)
## Example Session
```
Processing worldserver.conf ...
Backup created: worldserver.conf(d11_m12_y2025_14h_30m_45s).bak
# New feature for XP rates
XP.Rate = 1
Add XP.Rate to config? (y/n): y
Added XP.Rate.
# Database connection pool size
Database.PoolSize = 5
Add Database.PoolSize to config? (y/n): n
Skipped Database.PoolSize.
```
## Requirements
- Python 3.6 or higher
- No additional libraries needed (uses built-in modules only)
## File Structure Expected
```
configs/
├── config_merger.py (this script)
├── authserver.conf.dist
├── authserver.conf
├── worldserver.conf.dist
├── worldserver.conf
└── modules/
├── mod_example.conf.dist
├── mod_example.conf
└── ...
```
## License
This file is part of the AzerothCore Project. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
**Note:** Original code portions were licensed under the MIT License by Brian Aldridge (https://github.com/BoiseComputer)
Original project: https://github.com/Brian-Aldridge/update_module_confs

View File

@@ -1,276 +0,0 @@
# Version 1
# Based and modified from: https://github.com/Brian-Aldridge/update_module_confs
#
# This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Original code portions licensed under MIT License by Brian Aldridge (https://github.com/BoiseComputer)
# Original project: https://github.com/Brian-Aldridge/update_module_confs
VERSION = "1"
import os
import shutil
import argparse
import sys
from datetime import datetime
def find_modules(folder):
dist_files = []
try:
files = os.listdir(folder)
except (OSError, IOError) as e:
print(f"[ERROR] Could not list directory '{folder}': {e}")
return []
for file in files:
if file.endswith('.conf.dist'):
dist_files.append(file)
return sorted(dist_files)
def prompt_module_selection(dist_files):
print("Found the following modules:")
for idx, fname in enumerate(dist_files, 1):
print(f" {idx}. {fname}")
nums = input("Enter numbers of modules to update (comma-separated): ").strip()
raw_inputs = [x.strip() for x in nums.split(",") if x.strip()]
indices = []
invalid = []
for x in raw_inputs:
if not x.isdigit():
invalid.append(f"'{x}' (not a number)")
continue
idx = int(x)
if 0 < idx <= len(dist_files):
indices.append(idx-1)
else:
invalid.append(f"'{x}' (out of range, must be 1-{len(dist_files)})")
if invalid:
print("Invalid input:")
for msg in invalid:
print(f" {msg}")
if not indices:
print("No valid module numbers were entered.")
return []
selected = [dist_files[i] for i in indices]
return selected
def backup_file(filepath):
timestamp = datetime.now().strftime("d%d_m%m_y%Y_%Hh_%Mm_%Ss")
bakpath = f"{filepath}({timestamp}).bak"
try:
shutil.copy2(filepath, bakpath)
print(f" Backup created: {bakpath}")
except (OSError, IOError) as e:
print(f"[ERROR] Failed to create backup '{bakpath}': {e}")
return False
return True
def parse_conf(filepath):
# Returns a dict of key: (line, [preceding_comments])
try:
with open(filepath, encoding="utf-8") as f:
lines = f.readlines()
except (OSError, IOError) as e:
print(f"[ERROR] Failed to read config file '{filepath}': {e}")
return None
conf = {}
comments = []
for line in lines:
stripped = line.strip()
if not stripped or stripped.startswith("#"):
comments.append(line)
continue
if stripped.startswith("[") and stripped.endswith("]"):
# Ignore [headers of configs]
comments.clear()
continue
if stripped.count("=") == 1:
key, value = [s.strip() for s in stripped.split("=", 1)]
if '#' in value:
value = value.split('#', 1)[0].rstrip()
if key:
conf[key] = (f"{key} = {value}\n", comments.copy())
comments.clear()
continue
return conf
def find_missing_keys(dist_conf, user_conf):
missing = {}
for key, (line, comments) in dist_conf.items():
if key not in user_conf:
missing[key] = (line, comments)
return missing
def update_conf(dist_path, conf_path, skip_prompts=False):
if not os.path.exists(conf_path):
print(f" User config {conf_path} does not exist, skipping.")
return False
dist_conf = parse_conf(dist_path)
user_conf = parse_conf(conf_path)
missing = find_missing_keys(dist_conf, user_conf)
if not missing:
print(" No new config options to add.")
return False
updated = False
lines_to_add = []
for key, (line, comments) in missing.items():
if skip_prompts:
lines_to_add.append((comments, line, key))
else:
print("\n" + "".join(comments if comments else []) + line, end="")
add = input(f" Add {key} to config? (y/n): ").strip().lower()
if add in ("", "y", "yes"):
lines_to_add.append((comments, line, key))
else:
print(f" Skipped {key}.")
if lines_to_add:
backup_file(conf_path)
# Write using system's default line ending to avoid mixing CRLF and LF in the config file
newline = os.linesep.encode('utf-8')
with open(conf_path, "ab") as f:
for comments, line, key in lines_to_add:
if comments:
for c in comments:
f.write(c.rstrip('\r\n').encode('utf-8') + newline)
f.write(line.rstrip('\r\n').encode('utf-8') + newline)
print(f" Added {key}.")
updated = True
return updated
def update_server_config(config_name, config_dir, skip_prompts=False):
dist_path = os.path.join(config_dir, f"{config_name}.conf.dist")
conf_path = os.path.join(config_dir, f"{config_name}.conf")
if not os.path.exists(dist_path):
print(f" Distribution config {dist_path} does not exist, skipping.")
return False
print(f"\nProcessing {config_name}.conf ...")
return update_conf(dist_path, conf_path, skip_prompts)
def update_modules(config_dir, selected_only=False, skip_prompts=False):
modules_dir = os.path.join(config_dir, "modules")
if not os.path.exists(modules_dir):
print(f" Modules directory {modules_dir} does not exist, skipping.")
return
dist_files = find_modules(modules_dir)
if not dist_files:
print(" No .conf.dist files found in modules folder.")
return
if selected_only:
selected = prompt_module_selection(dist_files)
if not selected:
print(" No modules selected.")
return
else:
selected = dist_files
for dist_fname in selected:
module = dist_fname[:-5] # Removes ".dist"
conf_fname = module # e.g., mod_x.conf
dist_path = os.path.join(modules_dir, dist_fname)
conf_path = os.path.join(modules_dir, conf_fname)
print(f"\nProcessing {conf_fname} ...")
update_conf(dist_path, conf_path, skip_prompts)
def show_main_menu():
print(f"\nAzerothCore Config Updater/Merger (v. {VERSION})")
print("--------------------------")
print("1 - Update Auth Config")
print("2 - Update World Config")
print("3 - Update Auth and World Configs")
print("4 - Update All Modules Configs")
print("5 - Update Modules (Selection) Configs")
print("0 - Quit")
return input("Select an option: ").strip()
def parse_args():
parser = argparse.ArgumentParser(description='AzerothCore Config Updater/Merger')
parser.add_argument('config_dir', nargs='?', default='.',
help='Path to configs directory (default: current directory)')
parser.add_argument('target', nargs='?',
choices=['auth', 'world', 'both', 'modules', 'modules-select'],
help='What to update: auth, world, both, modules, modules-select')
parser.add_argument('-y', '--yes', action='store_true',
help='Automatically answer yes to all prompts')
parser.add_argument('--version', action='version', version=f'%(prog)s {VERSION}')
return parser.parse_args()
def main():
args = parse_args()
# If no target specified, run interactive mode
if args.target is None:
print(f"AzerothCore Config Updater/Merger (v. {VERSION})")
print("==========================")
config_dir = input("Enter the path to your configs folder (Default / Empty will use the folder where this script is located): ").strip()
if not config_dir:
config_dir = "."
if not os.path.isdir(config_dir):
print("Provided path is not a valid directory.")
return
while True:
choice = show_main_menu()
if choice == "1":
update_server_config("authserver", config_dir)
elif choice == "2":
update_server_config("worldserver", config_dir)
elif choice == "3":
update_server_config("authserver", config_dir)
update_server_config("worldserver", config_dir)
elif choice == "4":
update_modules(config_dir, selected_only=False)
elif choice == "5":
update_modules(config_dir, selected_only=True)
elif choice == "0":
print("Goodbye!")
break
else:
print("Invalid selection. Please try again.")
else:
# CLI mode
config_dir = args.config_dir
if not os.path.isdir(config_dir):
print(f"Error: Directory '{config_dir}' does not exist.")
sys.exit(1)
print(f"AzerothCore Config Updater/Merger (v. {VERSION}) - CLI Mode")
print(f"Config directory: {os.path.abspath(config_dir)}")
print(f"Target: {args.target}")
if args.yes:
print("Skip prompts: Yes")
if args.target == 'auth':
update_server_config("authserver", config_dir, args.yes)
elif args.target == 'world':
update_server_config("worldserver", config_dir, args.yes)
elif args.target == 'both':
update_server_config("authserver", config_dir, args.yes)
update_server_config("worldserver", config_dir, args.yes)
elif args.target == 'modules':
update_modules(config_dir, selected_only=False, skip_prompts=args.yes)
elif args.target == 'modules-select':
if args.yes:
print("Warning: --yes flag ignored for modules-select (requires interactive selection)")
update_modules(config_dir, selected_only=True, skip_prompts=False)
if __name__ == "__main__":
main()

View File

@@ -258,4 +258,4 @@ COPY --chown=$DOCKER_USER:$DOCKER_USER --from=build \
/azerothcore/env/dist/bin/vmap4_assembler /azerothcore/env/dist/bin/vmap4_assembler
COPY --chown=$DOCKER_USER:$DOCKER_USER --from=build \
/azerothcore/env/dist/bin/vmap4_extractor /azerothcore/env/dist/bin/vmap4_extractor
/azerothcore/env/dist/bin/vmap4_extractor /azerothcore/env/dist/bin/vmap4_extractor

View File

@@ -1,5 +1,5 @@
#
# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>
# Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE
# Copyright (C) 2021+ WarheadCore <https://github.com/WarheadCore>
#
# This file is free software; as a special exception the author gives
@@ -106,7 +106,6 @@ option(WITH_DYNAMIC_LINKING "Enable dynamic library linking."
option(WITH_STRICT_DATABASE_TYPE_CHECKS "Enable strict checking of database field value accessors" 0)
option(WITHOUT_METRICS "Disable metrics reporting (i.e. InfluxDB and Grafana)" 0)
option(WITH_DETAILED_METRICS "Enable detailed metrics reporting (i.e. time each session takes to update)" 0)
option(TOOL_CONFIG_MERGER "Install the Python config merger tool alongside config files" 0)
CheckApplicationsBuildList()
CheckToolsBuildList()

View File

@@ -38,7 +38,6 @@ CREATE TABLE `account` (
`last_login` timestamp NULL DEFAULT NULL,
`online` int unsigned NOT NULL DEFAULT '0',
`expansion` tinyint unsigned NOT NULL DEFAULT '2',
`Flags` int unsigned NOT NULL DEFAULT '0',
`mutetime` bigint NOT NULL DEFAULT '0',
`mutereason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
`muteby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
@@ -68,4 +67,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:16
-- Dump completed on 2025-07-19 12:10:19

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:16
-- Dump completed on 2025-07-19 12:10:19

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:17
-- Dump completed on 2025-07-19 12:10:19

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:17
-- Dump completed on 2025-07-19 12:10:19

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:17
-- Dump completed on 2025-07-19 12:10:19

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:17
-- Dump completed on 2025-07-19 12:10:20

View File

@@ -64,4 +64,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:18
-- Dump completed on 2025-07-19 12:10:20

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:18
-- Dump completed on 2025-07-19 12:10:20

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:18
-- Dump completed on 2025-07-19 12:10:20

View File

@@ -51,4 +51,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:18
-- Dump completed on 2025-07-19 12:10:21

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:18
-- Dump completed on 2025-07-19 12:10:21

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:19
-- Dump completed on 2025-07-19 12:10:21

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:19
-- Dump completed on 2025-07-19 12:10:21

View File

@@ -58,4 +58,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:19
-- Dump completed on 2025-07-19 12:10:22

View File

@@ -44,4 +44,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:19
-- Dump completed on 2025-07-19 12:10:22

View File

@@ -44,8 +44,7 @@ INSERT INTO `updates` VALUES
('2025_01_26_00.sql','CA6884F4BDBBC60C08CD52480FD4B3FAC945C3CF','RELEASED','2025-07-19 10:16:14',166),
('2025_02_16_00.sql','D59DF568B412F0A17B0ACC5C350420B81C87AAB2','RELEASED','2025-07-19 10:16:15',148),
('2025_02_16_01.sql','6788795A29BFD097EE5D00E548EFF3831F9CFBCF','RELEASED','2025-07-19 10:16:15',103),
('2025_07_03_00.sql','C28996618006B516134EC7FA4E1D58F2DF410548','RELEASED','2025-07-19 10:16:15',135),
('2025_07_24_00.sql','FCC937F180EFFAA5B991D9B7CF9E2223B6C0C4D3','RELEASED','2025-12-29 17:51:44',34);
('2025_07_03_00.sql','C28996618006B516134EC7FA4E1D58F2DF410548','RELEASED','2025-07-19 10:16:15',135);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
@@ -57,4 +56,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:20
-- Dump completed on 2025-07-19 12:10:22

View File

@@ -49,4 +49,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:20
-- Dump completed on 2025-07-19 12:10:22

View File

@@ -43,8 +43,7 @@ INSERT INTO `uptime` VALUES
(1,1734471110,0,0,'AzerothCore rev. 2923a4aa43d0 2024-12-17 12:28:46 -0300 (master branch) (Win64, RelWithDebInfo, Static)'),
(1,1752912822,0,0,'AzerothCore rev. 9415d1bef80d 2025-07-05 11:29:15 +0200 (whisper-something-something branch) (Win64, RelWithDebInfo, Static)'),
(1,1752913079,0,0,'AzerothCore rev. 9415d1bef80d 2025-07-05 11:29:15 +0200 (whisper-something-something branch) (Win64, RelWithDebInfo, Static)'),
(1,1752919589,0,0,'AzerothCore rev. 9415d1bef80d 2025-07-05 11:29:15 +0200 (whisper-something-something branch) (Win64, RelWithDebInfo, Static)'),
(1,1767027047,0,0,'AzerothCore rev. 10d105243f47 2025-12-29 17:44:37 +0100 (Last-DB-SQUASH-OF-2025-WOO-HOO-WOOP-WOOP branch) (Win64, RelWithDebInfo, Static)');
(1,1752919589,0,0,'AzerothCore rev. 9415d1bef80d 2025-07-05 11:29:15 +0200 (whisper-something-something branch) (Win64, RelWithDebInfo, Static)');
/*!40000 ALTER TABLE `uptime` ENABLE KEYS */;
UNLOCK TABLES;
@@ -56,4 +55,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:20
-- Dump completed on 2025-07-19 12:10:23

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:50
-- Dump completed on 2025-07-19 12:09:53

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:50
-- Dump completed on 2025-07-19 12:09:54

View File

@@ -51,4 +51,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:50
-- Dump completed on 2025-07-19 12:09:54

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:51
-- Dump completed on 2025-07-19 12:09:54

View File

@@ -68,4 +68,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:51
-- Dump completed on 2025-07-19 12:09:54

View File

@@ -57,4 +57,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:51
-- Dump completed on 2025-07-19 12:09:55

View File

@@ -49,4 +49,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:52
-- Dump completed on 2025-07-19 12:09:55

View File

@@ -53,4 +53,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:52
-- Dump completed on 2025-07-19 12:09:55

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:52
-- Dump completed on 2025-07-19 12:09:55

View File

@@ -44,4 +44,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:52
-- Dump completed on 2025-07-19 12:09:56

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:52
-- Dump completed on 2025-07-19 12:09:56

View File

@@ -51,4 +51,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:53
-- Dump completed on 2025-07-19 12:09:56

View File

@@ -50,4 +50,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:53
-- Dump completed on 2025-07-19 12:09:56

View File

@@ -49,4 +49,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:53
-- Dump completed on 2025-07-19 12:09:57

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:53
-- Dump completed on 2025-07-19 12:09:57

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:54
-- Dump completed on 2025-07-19 12:09:57

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:54
-- Dump completed on 2025-07-19 12:09:57

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:54
-- Dump completed on 2025-07-19 12:09:58

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:54
-- Dump completed on 2025-07-19 12:09:58

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:55
-- Dump completed on 2025-07-19 12:09:58

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:55
-- Dump completed on 2025-07-19 12:09:58

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:55
-- Dump completed on 2025-07-19 12:09:59

View File

@@ -58,4 +58,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:55
-- Dump completed on 2025-07-19 12:09:59

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:56
-- Dump completed on 2025-07-19 12:09:59

View File

@@ -43,4 +43,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:56
-- Dump completed on 2025-07-19 12:09:59

View File

@@ -44,4 +44,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:56
-- Dump completed on 2025-07-19 12:09:59

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:56
-- Dump completed on 2025-07-19 12:10:00

View File

@@ -51,4 +51,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:57
-- Dump completed on 2025-07-19 12:10:00

View File

@@ -69,4 +69,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:57
-- Dump completed on 2025-07-19 12:10:00

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:57
-- Dump completed on 2025-07-19 12:10:00

View File

@@ -50,4 +50,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:57
-- Dump completed on 2025-07-19 12:10:01

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:58
-- Dump completed on 2025-07-19 12:10:01

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:58
-- Dump completed on 2025-07-19 12:10:01

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:58
-- Dump completed on 2025-07-19 12:10:01

View File

@@ -61,4 +61,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:58
-- Dump completed on 2025-07-19 12:10:02

View File

@@ -50,4 +50,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:59
-- Dump completed on 2025-07-19 12:10:02

View File

@@ -58,4 +58,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:59
-- Dump completed on 2025-07-19 12:10:02

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:59
-- Dump completed on 2025-07-19 12:10:02

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:54:59
-- Dump completed on 2025-07-19 12:10:03

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:00
-- Dump completed on 2025-07-19 12:10:03

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:00
-- Dump completed on 2025-07-19 12:10:03

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:00
-- Dump completed on 2025-07-19 12:10:03

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:00
-- Dump completed on 2025-07-19 12:10:03

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:01
-- Dump completed on 2025-07-19 12:10:04

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:01
-- Dump completed on 2025-07-19 12:10:04

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:01
-- Dump completed on 2025-07-19 12:10:04

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:01
-- Dump completed on 2025-07-19 12:10:04

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:02
-- Dump completed on 2025-07-19 12:10:05

View File

@@ -74,4 +74,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:02
-- Dump completed on 2025-07-19 12:10:05

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:02
-- Dump completed on 2025-07-19 12:10:05

View File

@@ -125,4 +125,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:02
-- Dump completed on 2025-07-19 12:10:05

View File

@@ -62,4 +62,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:03
-- Dump completed on 2025-07-19 12:10:06

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:03
-- Dump completed on 2025-07-19 12:10:06

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:03
-- Dump completed on 2025-07-19 12:10:06

View File

@@ -45,4 +45,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:03
-- Dump completed on 2025-07-19 12:10:06

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:04
-- Dump completed on 2025-07-19 12:10:06

View File

@@ -46,4 +46,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:04
-- Dump completed on 2025-07-19 12:10:07

View File

@@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:04
-- Dump completed on 2025-07-19 12:10:07

View File

@@ -62,4 +62,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:04
-- Dump completed on 2025-07-19 12:10:07

View File

@@ -47,4 +47,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:04
-- Dump completed on 2025-07-19 12:10:07

View File

@@ -60,4 +60,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:05
-- Dump completed on 2025-07-19 12:10:08

View File

@@ -54,4 +54,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2025-12-29 17:55:05
-- Dump completed on 2025-07-19 12:10:08

Some files were not shown because too many files have changed in this diff Show More