kadeshar
1b0eef2e6c
Merge branch 'azerothcore:master' into Playerbot_merge29102025
2025-10-29 06:37:33 +01:00
killerwife
13c6719104
fix(Core/Arena): flying upon arrival in arena if joining on flying mount ( #23440 )
2025-10-27 11:30:11 +01:00
bash
39187083b0
Merge remote-tracking branch 'upstream/master' into Playerbot
...
# Conflicts:
# modules/CMakeLists.txt
2025-10-25 00:48:25 +02:00
Kitzunu
4069b94fbf
fix(Scripts/Commands): arena lookup/info improvemenets ( #23355 )
...
Co-authored-by: sudlud <sudlud@users.noreply.github.com >
2025-10-24 10:27:55 -03:00
bash
1aac4fbef6
Merge remote-tracking branch 'upstream/master' into feature/core_merge_10_2025
...
# Conflicts:
# src/server/game/Entities/Unit/Unit.cpp
# src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
# src/server/game/Server/WorldSession.cpp
# src/server/game/Server/WorldSession.h
# src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
# src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
# src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
# src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
# src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
2025-10-19 22:34:18 +02:00
天鹭
058f7acac6
refactor(Core): AddEventAtOffset ( #23140 )
2025-10-17 06:09:57 +02:00
天鹭
9c49349e1e
refactor(Core/EventMap): Refactor EventMap and related scripts ( #23121 )
...
Co-authored-by: Kelno <3866946+kelno@users.noreply.github.com >
Co-authored-by: Peter Keresztes Schmidt <carbenium@outlook.com >
2025-10-12 22:19:24 -03:00
Peter
da5fb6c9f8
feat(Core): BG reputation modifier for WSG, AB and AV ( #22685 )
...
Co-authored-by: Zoidwaffle <zoidwaffle@gmail.com >
2025-10-12 13:30:02 +02:00
Yunfan Li
55bc26f505
Merge branch 'master' into Playerbot
2025-08-02 11:35:47 +08:00
NoxMax
27da054661
feat(Core): make BGs and Arena prep time configurable ( #22136 )
...
Co-authored-by: Tereneckla <Tereneckla@pm.me >
2025-07-26 02:09:20 +01:00
Yunfan Li
c167fef89c
Merge branch 'master' into Playerbot
2025-07-15 20:34:44 +08:00
Benjamin Jackson
7724dd00d1
fix(Core/Battlegrounds): Add Call to Arms bonus data to Alterac Valley and fix bonuses for other battlegrounds. ( #21923 )
2025-07-11 08:32:10 -03:00
Benjamin Jackson
bae4dd8ccf
feat(Core): Add config for legacy arena team start rating. ( #22080 )
...
Co-authored-by: Tereneckla <Tereneckla@pm.me >
2025-07-11 08:30:20 -03:00
Yunfan Li
13edac562c
Merge branch 'master' into Playerbot
2025-06-01 14:55:09 +08:00
Benjamin Jackson
db18d5b035
refactor(Core): Use database tables for Shaman totems and Druid shapeshift forms. ( #22104 )
...
Co-authored-by: DoctorKraft <25483209+doctorkraft@users.noreply.github.com >
Co-authored-by: Shauren <shauren.trinity@gmail.com >
Co-authored-by: ForesterDev <11771800+ForesterDev@users.noreply.github.com >
2025-05-27 14:40:57 +01:00
Yunfan Li
58fd50651d
Merge branch 'master' into Playerbot
2025-05-09 22:07:43 +08:00
Benjamin Jackson
52799d76f6
refactor(Core): Add definition file for area table entries. ( #22054 )
2025-05-09 15:48:02 +02:00
Benjamin Jackson
e6b203f184
refactor(Core/World): Move various worldstate related functions to worldstate class. ( #22086 )
2025-05-09 12:29:09 +02:00
Yunfan Li
ce9343d916
Merge branch 'master' into Playerbot
2025-05-02 16:50:45 +08:00
Benjamin Jackson
da55f05cfc
refactor(Core/WorldState): Initial addition of world state definition file. ( #21875 )
...
Many world states had their enums from script's header and hardcoded values to their respective header file (WorldStateDefines.h)
Co-authored-by: Jelle Meeus <sogladev@gmail.com >
2025-04-26 19:31:30 +01:00
Yunfan Li
34811a047a
Merge branch 'master' into Playerbot
2025-03-04 21:57:19 +08:00
valsan-azerty-boi
a3f7e1e76d
feat(Core/BG): Allow battlegrounds to be configurable ( #20320 ) ( #21124 )
2025-03-01 12:01:10 -03:00
Yunfan Li
7d431dc796
Merge branch 'master' into Playerbot
2025-02-19 22:29:36 +08:00
Jelle Meeus
4c4b04f07b
refactor(Core/Packet): use WorldPackets::WorldState::InitWorldStates definition ( #20475 )
...
Co-authored-by: ccrs <ccrs@users.noreply.github.com >
2025-02-19 07:55:09 -03:00
Exitare
98ceb1c067
fix(Core/PlayerScript) Align player script function names ( #21020 )
...
Co-authored-by: sudlud <sudlud@users.noreply.github.com >
2025-02-16 14:59:41 +01:00
Takenbacon
edcfaeb845
refactor(Core/World): Create WorldSessionMgr to split session logic out of World ( #21400 )
2025-02-13 07:04:38 +01:00
Anton Popovichenko
f6a0433297
feat(Core/Arena): Add support for arena seasons completion with progression in runtime. ( #19858 )
...
Co-authored-by: Winfidonarleyan <dowlandtop@yandex.com >
2025-02-12 07:09:31 -03:00
Yunfan Li
de3c2b553e
Merge branch 'master' into Playerbot
2025-02-04 23:40:06 +08:00
Kitzunu
47c5ff904f
refactor(Core/Disables): Convert from Namespace to Class Structure ( #21109 )
2025-02-01 22:48:52 +01:00
Kitzunu
9e9a2fe5e3
refactor(Core/ObjectMgr): Change GetAcoreString from char const* to s… ( #21213 )
...
...ring
2025-02-01 22:46:42 +01:00
Yunfan Li
c76e70a364
Merge branch 'master' into Playerbot
2024-12-22 13:24:03 +08:00
Kitzunu
ceefd89a06
feat(CI/Codestyle): check for curly brackets before/after if/else statements ( #20977 )
...
* feat(CI/Codestyle): check for braces after if/else statements
* right need to edit a cpp file to trigger cpp check
* Revert "right need to edit a cpp file to trigger cpp check"
This reverts commit 2e34d8c52f35216549107a3476e79e79ea2ae077.
* fix codestyle in cpp
* Update oculus.cpp
* Update codestyle.py
* Update codestyle.py
* Update codestyle.py
* Update codestyle.py
2024-12-19 21:14:58 +01:00
Yunfan Li
889b509313
Merge branch 'master' into Playerbot
2024-12-05 00:08:25 +08:00
Kitzunu
ed008a8780
refactor(Core/Spells): Add helpers for HasAuraType ( #20802 )
2024-12-01 08:50:59 -03:00
Yunfan Li
fce06946e1
Merge branch 'master' into Playerbot
2024-11-16 13:15:00 +08:00
Francesco Borzì
a9f0f371e5
refactor(src/server/game): optimise imports ( #20541 )
2024-11-13 11:37:20 +01:00
Yunfan Li
abd9b4ebb8
Merge branch 'master' into Playerbot
2024-10-30 21:43:42 +08:00
sudlud
fb886865ad
fix(Core/BattlegroundAV): Add Hallow's End decorations to Alterac Valley ( #20317 )
2024-10-29 08:43:37 -03:00
Francesco Borzì
cb7e28df05
refactor(src/server/game/*): remove unused imports (big part 1) ( #20310 )
2024-10-27 10:25:40 +01:00
Yunfan Li
6eb5070cbc
Merge branch 'master' into Playerbot
2024-10-04 21:57:35 +08:00
Francesco Borzì
1932fd0c8a
refactor(src/server/game/Battle*): remove unused imports ( #20097 )
2024-09-29 18:14:46 +02:00
Yunfan Li
9ebdbd8459
Merge branch 'master' into Playerbot
2024-09-29 23:22:47 +08:00
Francesco Borzì
34a3b4ee47
feat(Core/BG): allow MinPlayersPerTeam override for low-levels ( #20083 )
2024-09-29 14:07:45 +02:00
Jelle Meeus
b45166b2d0
fix(Core/Battlefield): shapeshift aura removal from players on leaving arena or battleground ( #20069 )
...
no longer remove shapeshift auras from player on leave
2024-09-29 13:18:36 +02:00
Stefano Borzì
f6de601ddd
new BattlegroundDesertionTypes for hook OnBattlegroundDesertion ( #20039 )
...
* new BattlegroundDesertionTypes for hook OnBattlegroundDesertion
* chore: minor improvements
---------
Co-authored-by: laasker <79991768+laasker@users.noreply.github.com >
2024-09-27 22:19:56 +02:00
Yunfan Li
66c55bc450
Merge branch 'master' into Playerbot
2024-09-22 21:56:15 +08:00
Kitzunu
386aea03ee
chore(Core/Misc): Some cleanup ( #19970 )
...
* remove weird blanks
* update if
* ) ) to ))
* missed some ) )
* now switch
* .
2024-09-21 19:34:31 +02:00
Yunfan Li
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
2358b256f2
Revert "Merge branch 'master' into Playerbot"
...
This reverts commit 9973151927 , reversing
changes made to 6f5b504e4c .
2024-09-13 17:13:32 +08:00