r00ty-tc
527654b512
[Core/Maps] Activate creatures and objects during opening cinematics
...
As well as other flyby cameras (like sunwell etc)
Requires re-running map extractor to extract camera m2 files from data
files. These are very small.
2016-05-18 21:31:07 +01:00
Aokromes
95018939a8
Core/Maps: Implement optional pre-loading of maps.
2016-05-16 22:24:58 +02:00
ariel-
65aec5f8f7
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Note: additional hand-picked ports from 6.x to fix build
Conflicts:
sql/updates/world/2016_02_22_00_world.sql
sql/updates/world/2016_02_22_01_world.sql
sql/updates/world/2016_02_22_02_world.sql
sql/updates/world/2016_03_07_00_world.sql
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/game/Accounts/AccountMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Scripting/ScriptLoader.cpp
src/server/game/Scripting/ScriptLoader.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/OutdoorPvP/CMakeLists.txt
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/CMakeLists.txt
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
src/tools/mmaps_generator/CMakeLists.txt
2016-03-11 18:32:07 -03:00
ccrs
6a339ed5c9
Core/TempSummons: avoid use MoveInLineOfSight before InitSummon
2016-03-01 21:20:47 +01:00
ariel-
bb6089bb8c
Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing)
...
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e2b8eb87e6aed7b031ebe138717403d)
2016-02-21 08:16:32 -03:00
ariel-
8bc477a2de
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Conflicts:
sql/base/characters_database.sql
sql/updates/world/2016_01_26_00_world.sql
sql/updates/world/2016_01_31_00_world.sql
sql/updates/world/2016_02_07_00_world.sql
src/server/authserver/Server/AuthSession.cpp
src/server/database/Database/Implementation/LoginDatabase.cpp
src/server/database/Database/Implementation/LoginDatabase.h
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
src/server/game/AI/ScriptedAI/ScriptedCreature.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/shared/Networking/AsyncAcceptor.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/adt.h
src/tools/mmaps_generator/MapBuilder.cpp
2016-02-21 07:02:53 -03:00
Shauren
ff45a422c5
Warning fix.
2016-02-12 20:45:09 +01:00
Shauren
fa3f106693
Core/Maps: Use map.dbc zone fallback if no area is found in grid files, not only if grid files don't exist
...
Closes #16583
Closes #16584
Extracting new maps is NOT needed.
2016-02-12 20:39:25 +01:00
treeston
62aff401f6
Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392 )
2016-02-10 22:23:39 +01:00
Shauren
89d8d50b2e
Core/Maps: Moved min height calculation to worldserver for more precise results
...
Closes #16530
2016-02-10 21:25:28 +01:00
treeston
6102a7937d
Maps/Instances: Implement handling of CMSG_SET_SAVED_INSTANCE_EXTEND
2016-02-10 19:35:11 +01:00
Shauren
25cdc5d980
Core/Maps: Parse MFBO adt chunk to properly handle height where player counts as falling under the map
...
* This fixes the height at which player is instantly killed when falling from The Frozen Throne
* Set PLAYER_FLAGS_IS_OUT_OF_BOUNDS on players under the map to enable release spirit button while still falling
Note: Extracting new maps is required
(cherry picked from commit 4f78efd4633f79285f176b61367a067b2cd90e2b)
# Conflicts:
# dep/PackageList.txt
# src/server/game/DataStores/DBCStructure.h
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Handlers/MovementHandler.cpp
# src/tools/map_extractor/CMakeLists.txt
# src/tools/map_extractor/System.cpp
# src/tools/map_extractor/adt.h
# src/tools/map_extractor/loadlib.cpp
2016-02-09 18:44:19 +01:00
Shauren
aa432db36d
Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing)
...
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e2b8eb87e6aed7b031ebe138717403d)
# Conflicts:
# src/server/game/Achievements/AchievementMgr.cpp
# src/server/game/Chat/Chat.cpp
# src/server/game/Conditions/ConditionMgr.cpp
# src/server/game/DataStores/DBCStores.cpp
# src/server/game/DataStores/DBCStores.h
# src/server/game/DataStores/DBCfmt.h
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Globals/ObjectMgr.cpp
# src/server/game/Handlers/BattleGroundHandler.cpp
# src/server/game/Handlers/MiscHandler.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Spells/Spell.cpp
# src/server/game/Spells/SpellEffects.cpp
# src/server/scripts/Commands/cs_go.cpp
# src/server/scripts/Commands/cs_group.cpp
# src/server/scripts/Commands/cs_lookup.cpp
# src/server/scripts/Commands/cs_misc.cpp
# src/tools/map_extractor/System.cpp
# src/tools/mmaps_generator/TerrainBuilder.cpp
2016-02-09 18:19:28 +01:00
Shauren
b605f1cc81
Core/Maps: Restored DataDir functionality accidendally removed earlier
...
(cherry picked from commit 7e801595f42be692fcbd8cbfd3cf6652c75e5db6)
2016-01-20 08:04:58 -03:00
ariel-
52b60d51e7
Core/Maps: fixed map loading after merge if datadir was different from local
2016-01-19 23:34:36 -03:00
ariel-
9d351b5878
Core/Maps: backport ed75b0649add23e082976fa4e5d504bc0c312602
...
** No reextraction of maps needed **
2016-01-19 22:25:27 -03:00
ariel-
e34e3f379f
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Conflicts:
.travis.yml
CMakeLists.txt
README.md
dep/libmpq/CMakeLists.txt
doc/UnixInstall.txt
revision_data.h.in.cmake
sql/base/auth_database.sql
sql/base/characters_database.sql
sql/base/dev/world_database.sql
sql/old/3.3.5a/auth/59_2015_11_07/2015_08_21_00_auth.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_01_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_16_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_18_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_18_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_00_world_2015_07_18_04.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_20_02_world_2015_07_19_35.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_21_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_06_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_07_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_06_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_27_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_27_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_02_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_02_01_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_03_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_04_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_09_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_23_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_25_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_25_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_26_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_26_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_27_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_01_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_02_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_02_03_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_03_05_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_06_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_08_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_08_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_10_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_10_01_world_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_05_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_16_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_18_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_18_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_05_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_21_00_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_00_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_01_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_02_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_03_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_04_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_06_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_07_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_03_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_04_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_26_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_26_05_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_27_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_27_01_world.sql
sql/updates/world/2015_07_14_02_world.sql
sql/updates/world/2015_07_14_03_world.sql
sql/updates/world/2015_07_14_04_world.sql
sql/updates/world/2015_07_14_05_world.sql
sql/updates/world/2015_07_15_00_world.sql
sql/updates/world/2015_07_15_01_world.sql
sql/updates/world/2015_07_15_02_world.sql
sql/updates/world/2015_07_16_00_world.sql
sql/updates/world/2015_07_17_00_world.sql
sql/updates/world/2015_07_17_01_world.sql
sql/updates/world/2015_07_17_02_world.sql
sql/updates/world/2015_07_17_03_world.sql
sql/updates/world/2015_07_17_04_world.sql
sql/updates/world/2015_07_18_00_world.sql
sql/updates/world/2015_07_18_01_world.sql
sql/updates/world/2015_07_19_01_world.sql
sql/updates/world/2015_07_19_02_world.sql
sql/updates/world/2015_07_19_03_world.sql
sql/updates/world/2015_07_19_04_world.sql
sql/updates/world/2015_07_19_05_world.sql
sql/updates/world/2015_07_21_00_world.sql
sql/updates/world/2015_07_24_00_world.sql
sql/updates/world/2015_07_24_01_world.sql
sql/updates/world/2015_07_24_02_world.sql
sql/updates/world/2015_07_24_03_world.sql
sql/updates/world/2015_07_24_04_world.sql
sql/updates/world/2015_07_24_06_world.sql
sql/updates/world/2015_07_24_07_world.sql
sql/updates/world/2015_07_25_00_world.sql
sql/updates/world/2015_07_25_01_world.sql
sql/updates/world/2015_07_25_02_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
sql/updates/world/2015_07_26_00_world.sql
sql/updates/world/2015_07_26_04_world.sql
sql/updates/world/2015_07_26_05_world.sql
sql/updates/world/2015_07_26_06_world.sql
sql/updates/world/2015_07_27_00_world.sql
sql/updates/world/2015_07_27_01_world.sql
sql/updates/world/2015_07_28_02_world.sql
sql/updates/world/2015_07_28_03_world.sql
sql/updates/world/2015_08_13_00_world.sql
sql/updates/world/2015_08_13_01_world.sql
sql/updates/world/2015_08_13_02_world.sql
sql/updates/world/2015_08_13_03_world.sql
sql/updates/world/2015_08_13_04_world.sql
sql/updates/world/2015_08_21_00_world.sql
sql/updates/world/2015_08_21_01_world.sql
sql/updates/world/2015_08_21_02_world.sql
sql/updates/world/2015_08_23_00_world.sql
sql/updates/world/2015_08_25_00_world.sql
sql/updates/world/2015_08_25_01_world.sql
sql/updates/world/2015_08_26_00_world.sql
sql/updates/world/2015_08_26_01_world.sql
sql/updates/world/2015_08_27_00_world.sql
sql/updates/world/2015_08_29_02_world.sql
sql/updates/world/2015_08_29_03_world.sql
sql/updates/world/2015_08_29_04_world.sql
sql/updates/world/2015_09_01_00_world_335.sql
sql/updates/world/2015_09_05_00_world.sql
sql/updates/world/2015_09_05_01_world.sql
sql/updates/world/2015_09_06_00_world.sql
sql/updates/world/2015_09_08_01_world.sql
sql/updates/world/2015_09_08_02_world.sql
sql/updates/world/2015_09_11_00_world_from_335.sql
sql/updates/world/2015_09_11_01_world_from_335.sql
sql/updates/world/2015_09_11_02_world_from_335.sql
sql/updates/world/2015_09_11_03_world_from_335.sql
sql/updates/world/2015_09_11_04_world_from_335.sql
sql/updates/world/2015_09_11_05_world_from_335.sql
sql/updates/world/2015_09_11_06_world_from_335.sql
sql/updates/world/2015_09_11_07_world_from_335.sql
sql/updates/world/2015_09_11_08_world_from_335.sql
sql/updates/world/2015_09_11_09_world_from_335.sql
sql/updates/world/2015_09_11_10_world_from_335.sql
sql/updates/world/2015_09_11_11_world_from_335.sql
sql/updates/world/2015_09_11_12_world_from_335.sql
sql/updates/world/2015_09_11_13_world_from_335.sql
sql/updates/world/2015_09_11_16_world_from_335.sql
sql/updates/world/2015_09_11_17_world_from_335.sql
sql/updates/world/2015_09_11_18_world_from_335.sql
sql/updates/world/2015_09_11_21_world_from_335.sql
sql/updates/world/2015_09_11_40_world_from_335.sql
sql/updates/world/2015_09_11_41_world_from_335.sql
sql/updates/world/2015_09_11_43_world_from_335.sql
sql/updates/world/2015_09_11_51_world_from_335.sql
sql/updates/world/2015_09_11_52_world_from_335.sql
sql/updates/world/2015_12_14_00_world.sql
sql/updates/world/2016_01_01_00_world.sql
sql/updates/world/2016_01_01_01_world.sql
src/common/Common.h
src/common/Cryptography/Authentication/AuthCrypt.cpp
src/common/Cryptography/Authentication/AuthCrypt.h
src/common/Cryptography/HMACSHA1.cpp
src/common/Cryptography/HMACSHA1.h
src/server/database/Database/Implementation/CharacterDatabase.cpp
src/server/database/Database/Implementation/CharacterDatabase.h
src/server/database/Database/Implementation/LoginDatabase.cpp
src/server/game/AI/SmartScripts/SmartScript.cpp
src/server/game/AI/SmartScripts/SmartScript.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlefield/Battlefield.cpp
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundQueue.cpp
src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Chat/Chat.h
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/ObjectGuid.cpp
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Transport/Transport.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Globals/ObjectAccessor.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Grids/GridDefines.h
src/server/game/Grids/ObjectGridLoader.cpp
src/server/game/Groups/Group.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Handlers/TaxiHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Maps/Map.cpp
src/server/game/Maps/Map.h
src/server/game/Maps/MapInstanced.cpp
src/server/game/Maps/MapManager.h
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/Miscellaneous/Language.h
src/server/game/Movement/Waypoints/Path.h
src/server/game/OutdoorPvP/OutdoorPvP.cpp
src/server/game/OutdoorPvP/OutdoorPvP.h
src/server/game/Pools/PoolMgr.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Scripting/MapScripts.cpp
src/server/game/Scripting/ScriptMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellHistory.cpp
src/server/game/Spells/SpellHistory.h
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/Spells/SpellMgr.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/game/Tools/PlayerDump.cpp
src/server/game/Tools/PlayerDump.h
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_gobject.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_npc.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/World/duel_reset.cpp
src/server/scripts/World/npc_taxi.cpp
src/server/shared/Containers.h
src/server/shared/Dynamic/TypeContainer.h
src/server/shared/Dynamic/TypeContainerFunctions.h
src/server/shared/Dynamic/TypeList.h
src/server/shared/Packets/WorldPacket.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/loadlib.cpp
src/tools/map_extractor/loadlib/loadlib.h
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/loadlib/loadlib.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/vmapexport.cpp
src/tools/vmap4_extractor/wdtfile.cpp
src/tools/vmap4_extractor/wdtfile.h
src/tools/vmap4_extractor/wmo.cpp
2016-01-15 00:15:35 -03:00
ariel-
d04d14e34d
Update copyright note for 2016
2016-01-11 23:27:45 -03:00
ariel-
faac17657d
Fix typo
2016-01-11 02:22:08 -03:00
treeston
27f0edde0f
Game/Maps: Instance handling follow-up:
...
- Fix a bug where a player could maintain a conflicting non-perm solo bind if they were in the instance when invited to group. Closes #16150 .
- If a group is created while the leader is in an instance that nobody is bound to, the group will take over the instance and bind to it. This stops the homebind timer when reforming group after disconnects and the like.
(cherry picked from commit 0f0a51b87a
2016-01-11 01:51:25 -03:00
treeston
94a5629949
Game/Maps: Clean up instance handling.
...
- Rename Map::CanEnter to Map::CannotEnter. Return value changed from boolean (true means player can enter) to enum Map::EnterState (CAN_ENTER=0 means player can enter, any other value is a reason for deny).
- Move hack-y player error messages from within Map::CanEnter to the function calling CanEnter as appropriate (primarily WorldSession::HandleAreaTriggerOpcode).
- Modify WorldSession::HandleAreaTriggerOpcode to properly revive the player upon touching the portal leading to the instance they died in even if they are currently unable to zone in. Fixes and closes #15758 .
- Modify Player::LoadFromDB to properly spawn players in the instance they logged off in if possible. Fixes and closes #15561 .
- Modify permanent save behavior to be blizzlike: Players can always enter an instance they are saved to (assuming there are no map constraints against it), but get a homebind timer if the instance is already in use.
(cherry picked from commit 43fa7d48a5
2016-01-11 01:51:21 -03:00
Shauren
4a07a95c18
Core/Corpses: Fixed a possible crash adding bones to grid
...
Closes #15808
(cherry picked from commit ec1583df67605b7253a34dc5f153cdad5b16969e)
(cherry picked from commit 910fb00130
2016-01-11 01:51:14 -03:00
MitchesD
100d847483
Core/PacketIO: fixed instance binding of gamemasters
...
(cherry picked from commit 231fb1d322bc1c91f9227d43d3ef672605232154)
(cherry picked from commit a968595977
2016-01-11 01:51:11 -03:00
Shauren
b215184cc0
Core/Corpses: Fixed a crash happening when a corpse is added to a grid that was not yet fully loaded
...
Closes #15684
(cherry picked from commit 8c9ea7782a
2016-01-11 01:51:07 -03:00
Shauren
b7d37daa74
Core/Corpses: Fixed map crash happening during map unload when there are corpses inside
...
(cherry picked from commit 1d17475791
2016-01-11 01:51:00 -03:00
Shauren
fc9c587604
Core/Corpses: Fixed leaking bones
...
Ref #15765
(cherry picked from commit bd16520ecc91d827abae7f0447cc292fe9e843e9)
Conflicts:
src/server/game/Entities/Corpse/Corpse.cpp
2016-01-11 01:50:56 -03:00
pete318
6664a3acc3
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
...
(cherry picked from commit b1032ed620
2016-01-11 01:50:53 -03:00
ariel-
b20c9ae283
Corpses update: cd27fd38b93884797c094a82dc7beb0498e2f124
2016-01-11 01:50:49 -03:00
ariel-
b3ea9fbbe5
Map local guids 6.x -> 4.3.4
...
Ported the following commits:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
2016-01-11 01:50:45 -03:00
treeston
0f0a51b87a
Game/Maps: Instance handling follow-up:
...
- Fix a bug where a player could maintain a conflicting non-perm solo bind if they were in the instance when invited to group. Closes #16150 .
- If a group is created while the leader is in an instance that nobody is bound to, the group will take over the instance and bind to it. This stops the homebind timer when reforming group after disconnects and the like.
2016-01-04 15:48:53 +01:00
Rushor
923a368ac7
Update copyright note for 2016
2016-01-01 12:02:33 +01:00
treeston
43fa7d48a5
Game/Maps: Clean up instance handling.
...
- Rename Map::CanEnter to Map::CannotEnter. Return value changed from boolean (true means player can enter) to enum Map::EnterState (CAN_ENTER=0 means player can enter, any other value is a reason for deny).
- Move hack-y player error messages from within Map::CanEnter to the function calling CanEnter as appropriate (primarily WorldSession::HandleAreaTriggerOpcode).
- Modify WorldSession::HandleAreaTriggerOpcode to properly revive the player upon touching the portal leading to the instance they died in even if they are currently unable to zone in. Fixes and closes #15758 .
- Modify Player::LoadFromDB to properly spawn players in the instance they logged off in if possible. Fixes and closes #15561 .
- Modify permanent save behavior to be blizzlike: Players can always enter an instance they are saved to (assuming there are no map constraints against it), but get a homebind timer if the instance is already in use.
2015-12-31 01:02:07 +01:00
Naios
3a3a6bbfd2
Core/Globals: Use std::string rather than char* to pass script names around.
...
(cherry picked from commit b7b49fe35f87e83813466cb302ff17381792e607)
Conflicts:
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
2015-11-07 13:09:10 +01:00
Shauren
910fb00130
Core/Corpses: Fixed a possible crash adding bones to grid
...
Closes #15808
(cherry picked from commit ec1583df67605b7253a34dc5f153cdad5b16969e)
2015-11-06 21:30:41 +01:00
MitchesD
a968595977
Core/PacketIO: fixed instance binding of gamemasters
...
(cherry picked from commit 231fb1d322bc1c91f9227d43d3ef672605232154)
2015-10-31 17:39:17 +01:00
Shauren
8c9ea7782a
Core/Corpses: Fixed a crash happening when a corpse is added to a grid that was not yet fully loaded
...
Closes #15684
2015-10-30 17:53:00 +01:00
Shauren
1d17475791
Core/Corpses: Fixed map crash happening during map unload when there are corpses inside
2015-10-29 18:46:37 +01:00
Shauren
20b4e6f03a
Core/Corpses: Fixed leaking corpses
...
Closes #15765
(cherry picked from commit bd16520ecc91d827abae7f0447cc292fe9e843e9)
2015-10-28 21:56:40 +01:00
pete318
b1032ed620
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
2015-10-12 23:10:41 +02:00
Shauren
325336137d
Core/Transports: Fixed accessing deleted instance transports
...
Thanks @jackpoz for valgrind log and @pete318 for reproduction steps
Closes #15633
(cherry picked from commit 8745e08be020471db886e11a3a7512a751141562)
2015-09-30 19:58:09 +02:00
Shauren
402a3c45ff
Core/Maps: Moved corpse management to map level
...
(cherry picked from commit cd27fd38b93884797c094a82dc7beb0498e2f124)
# Conflicts:
# src/server/database/Database/Implementation/CharacterDatabase.cpp
# src/server/database/Database/Implementation/CharacterDatabase.h
# src/server/game/Entities/Corpse/Corpse.cpp
# src/server/game/Entities/Creature/GossipDef.cpp
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Player/Player.h
# src/server/game/Globals/ObjectAccessor.cpp
# src/server/game/Globals/ObjectAccessor.h
# src/server/game/Globals/ObjectMgr.cpp
# src/server/game/Globals/ObjectMgr.h
# src/server/game/Grids/ObjectGridLoader.cpp
# src/server/game/Handlers/AuctionHouseHandler.cpp
# src/server/game/Handlers/CharacterHandler.cpp
# src/server/game/Handlers/ChatHandler.cpp
# src/server/game/Handlers/QueryHandler.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Server/Packets/CharacterPackets.cpp
# src/server/game/World/World.cpp
# src/server/scripts/Commands/cs_reload.cpp
2015-09-29 18:45:01 +02:00
pete318
3c188ac10e
Combat with distant creatures
...
Iterate creatures in combat with players during map update, and also visit
their cells if greater than player visibility distance away.
2015-09-23 22:03:27 +02:00
pete318
dcb7082277
Map local guids 6.x -> 3.3.35:
...
Implemented:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
* This adds separate (per map) guid sequences depending on object type
* Ported map object container from cmangos/mangos-wotlk@a2d396e
* Added type container visitor for TypeUnorderedMapContainer
* Implemented helper function to erase unique pairs from multimap containers
* Moved object storage of all objects except players and transports to map level
* Added containers linking database spawn id with creature/gameobject in world
* Renamed DBTableGuid to spawnId
* Added a separate spawn id sequence generator for creatures and gameobjects - this will be used in db tables
* Moved building SMSG_UPDATE_OBJECT - updatefields changes broadcast to map update
* Added new function to return but not increment guid
* Adjusted .debug loadcells to show low guid in map before/after load
* Added debug messages for creature spawn/destroy, for map guid debugging
* Store all Gameobjects and Creatures added to OutdoorPvP, so the callback script can be removed when OutdoorPvP instance is destroyed.
2015-09-22 21:33:57 +02:00
StormBytePP
7b245a0b6b
Core: Added ABORT() macro to prevent the usage of ASSERT(false) as a quick hack to crash the core misusing assert
2015-09-21 15:11:06 +02:00
Carbenium
86eb651757
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
sql/updates/world/2015_07_14_00_world.sql
sql/updates/world/2015_07_14_01_world_335.sql
sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql
sql/updates/world/2015_07_19_05_world.sql
sql/updates/world/2015_07_21_00_world.sql
sql/updates/world/2015_07_24_00_world.sql
sql/updates/world/2015_07_24_01_world.sql
sql/updates/world/2015_07_24_02_world.sql
sql/updates/world/2015_07_24_03_world.sql
sql/updates/world/2015_07_24_04_world.sql
sql/updates/world/2015_07_24_05_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/collision/Management/MMapManager.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/Utilities/Util.cpp
2015-07-26 16:52:35 +02:00
Carbenium
293658fb13
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
.gitattributes
dep/PackageList.txt
sql/base/characters_database.sql
sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
sql/updates/world/2015_07_01_03_world_335.sql
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Miscellaneous/Language.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2015-07-22 02:26:46 +02:00
Naios
e011ae63d5
Core/Logging: Enable perfect forwarding for logging format and args.
...
* Handle timestamp parsing though cppformat.
* Change a wrong forward -> move
(cherry picked from commit 026ceb85b9e0e870d95cea42895e867198c156dd)
2015-07-22 02:18:36 +02:00
Carbenium
6dfaec3d97
Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4
...
Conflicts:
.gitattributes
CONTRIBUTING.md
sql/updates/world/2015_05_11_04_world.sql
sql/updates/world/2015_05_27_00_world.sql
sql/updates/world/2015_05_27_01_world.sql
sql/updates/world/2015_06_06_01_world_335.sql
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_item.cpp
src/server/scripts/Spells/spell_rogue.cpp
2015-07-22 02:09:32 +02:00
Carbenium
224c7dc6ae
Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_04_04_00_world.sql
sql/updates/world/2015_04_04_01_world.sql
sql/updates/world/2015_04_05_06_world_335.sql
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_account.cpp
src/tools/map_extractor/System.cpp
src/tools/vmap4_extractor/adtfile.cpp
2015-07-22 00:54:34 +02:00
Carbenium
17bed260e3
Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_14_00_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
2015-07-21 23:27:27 +02:00
r00ty-tc