Commit 1b23460
committed
Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk
# Conflicts:
# src/server/game/World/IWorld.h159 files changed
Lines changed: 7127 additions & 1407 deletions
File tree
- .github/workflows
- apps/installer/includes
- data/sql/updates
- db_auth
- db_world
- src
- server
- apps/worldserver
- database/Database/Implementation
- game
- AI/SmartScripts
- Accounts
- Achievements
- Battlefield
- Battlegrounds
- Chat
- Channels
- ChatCommands
- Combat
- DungeonFinding
- Entities
- Creature
- Player
- Unit
- Vehicle
- Globals
- Groups
- Guilds
- Handlers
- Instances
- Miscellaneous
- Scripting
- ScriptDefines
- Server
- Spells
- Auras
- World
- scripts
- Commands
- EasternKingdoms/BlackrockMountain
- BlackrockDepths
- BlackwingLair
- Kalimdor/RazorfenDowns
- Northrend
- ChamberOfAspects/ObsidianSanctum
- FrozenHalls/HallsOfReflection
- IcecrownCitadel
- Naxxramas
- Nexus/EyeOfEternity
- UtgardeKeep/UtgardePinnacle
- Outland
- Pet
- Spells
- World
- test
- mocks
- server/game
- Accounts
- Commands
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
0 commit comments