sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/Spells/SpellInfoCorrections.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
This commit is contained in:
bash
2025-12-07 12:04:32 +01:00
parent 08323af7a5 34f261b92c
commit 58c1c49610
146 changed files with 4869 additions and 2103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Collision/Maps/MapDefines.h
+1 -1
View File
@@ -26,7 +26,7 @@
#define SIZE_OF_GRIDS 533.3333f
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
#define MMAP_VERSION 18
#define MMAP_VERSION 19
struct MmapTileRecastConfig
{
src/common/Collision/VMapDefinitions.h
+2 -2
View File
@@ -22,8 +22,8 @@
namespace VMAP
{
const char VMAP_MAGIC[] = "VMAP_4.7";
const char RAW_VMAP_MAGIC[] = "VMAP047"; // used in extracted vmap files with raw data
const char VMAP_MAGIC[] = "VMAP_4.8";
const char RAW_VMAP_MAGIC[] = "VMAP048"; // used in extracted vmap files with raw data
const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree";
// defined in TileAssembler.cpp currently...