Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
28,688 Commits 2 Branches 1 Tag
1bd85c1a9b8fd4c89fd3eba3f7e3bd5fdb67b9b2
Commit Graph
266 Commits
Author SHA1 Message Date
treeston 1bd85c1a9b Conditions/ConditionMgr: Add a comment so MitchesD can go away. 2016-07-20 13:29:05 +02:00
Aokromes 3f0c7f6b2f Core/Spells: Renamed EnsureSpellInfo to AssertSpellInfo to minimize differences between branches 2016-07-19 12:02:52 +02:00
Shauren a7f68c489a Properly rename the stand state method... 2016-05-12 08:27:48 +02:00
Shauren a12493fd84 Core/Misc: Renamed getStandState to minimize differences between branches 2016-05-12 08:27:29 +02:00
Aokromes 303082546b Sync with 3.3.5a core 2016-05-03 12:50:49 +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
ariel- 691b0df6ae Core/Conditions: fix a memory leak for CONDITION_SOURCE_TYPE_TERRAIN_SWAP 
Reported by Aokromes.

(cherry picked from commit 3a7f311547bd4301abd102eb785c050d5436dce9)

Conflicts:
	src/server/game/Entities/Object/Object.cpp
 2016-03-06 04:08:04 -03:00
ariel- d573bd2fe7 Core/Conditions: Improved mergeability between branches 2016-03-02 10:57:14 -03:00
treeston ea53f79aaf DB/Conditions: Add new CONDITION_STAND_STATE (41). value1 selects the type of state check to apply, value2 specifies the particular state we are looking for. 
Valuing: 0,x: has exactly state x; 1,0: any standing state; 1,1: any sitting state;
 2016-02-25 19:01:21 +01: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 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
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
Shauren 8624325f23 Core/Conditions: Optimizations part 3 changed ConditionStore to a simple array 
(cherry picked from commit db0c48c17fdf61b8816cc229dcfec907354326cd)
 2016-01-11 01:52:20 -03:00
Shauren a83b61b807 Core/Conditions: Optimizations part 3 removed copying condition containers all over the place 
(cherry picked from commit b09e63e9debfab49e635a591339294dd96b09d95)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
 2016-01-11 01:52:17 -03:00
Shauren 70217b0d84 Core/Conditions: Add const to methods not modifying ConditionMgr 
(cherry picked from commit 2cce998e905bed0873fbf0b3da981857c139e5d5)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
 2016-01-11 01:52:13 -03:00
Shauren 80f909682d Core/Conditions: Optimizations part 2 removed unneeded code 
(cherry picked from commit e5c1e7d71c3460a39317bacbc432adc3307c63ca)

Conflicts:
	src/server/game/Conditions/ConditionMgr.h
 2016-01-11 01:52:10 -03:00
Shauren 5db2a8f3ee Core/Conditions: Optimizations part 1 - use containers more suited for their role 
(cherry picked from commit 9fa938f3e0df2ca6b9ff4f800a5b41ba18cdd214)

Conflicts:
	src/server/game/Spells/SpellInfo.h
 2016-01-11 01:52:06 -03:00
Shauren 315fdd1886 Core/Conditions: Type renaming 
(cherry picked from commit 5e0cee85ddd67188365ead3f18206df088e1f0c7)

Conflicts:
	src/common/Common.h
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Loot/LootMgr.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
 2016-01-11 01:52:03 -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
Rushor 923a368ac7 Update copyright note for 2016 2016-01-01 12:02:33 +01:00
MitchesD ab831507c6 Core/Conditions: extended CONDITION_NEAR_CREATURE, condition value 3 is now used to check for dead creature entries (0 - alive, 1 - dead) 
* I used 0 for alive to avoid touching all conditions with this type

(cherry picked from commit cdb5bd3eb78ea40fbd927c5662e1dad778bf12d5)
 2015-12-03 21:41:03 +01:00
Vincent-Michael d0c28c66eb Core: Fix warning 2015-11-14 01:23:28 +01:00
Vincent-Michael d188960216 Core/Condition: Fix issue reported by static analysis 
Coverity defect ID: 1339314
 2015-11-14 00:56:44 +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
Aokromes c58f540348 Core/Conditions: Phase condition changes 
* SourceGroup defines which phase should the condition affect

* SourceEntry limits the area of the phase (alternatively 0 means all areas)
 2015-11-01 19:11:52 +01:00
Shauren 14d382f185 Core/Conditions: Optimizations part 3 changed ConditionStore to a simple array 
(cherry picked from commit db0c48c17fdf61b8816cc229dcfec907354326cd)
 2015-10-31 20:26:40 +01:00
Shauren cba122ad94 Core/Conditions: Optimizations part 3 removed copying condition containers all over the place 
(cherry picked from commit b09e63e9debfab49e635a591339294dd96b09d95)
 2015-10-31 20:26:40 +01:00
Shauren 57c4b3d42c Core/Conditions: Add const to methods not modifying ConditionMgr 
(cherry picked from commit 2cce998e905bed0873fbf0b3da981857c139e5d5)
 2015-10-31 20:26:40 +01:00
Shauren 6ab90cc57d Core/Conditions: Optimizations part 2 removed unneeded code 
(cherry picked from commit e5c1e7d71c3460a39317bacbc432adc3307c63ca)
 2015-10-31 20:26:40 +01:00
Shauren 3158605603 Core/Conditions: Optimizations part 1 - use containers more suited for their role 
(cherry picked from commit 9fa938f3e0df2ca6b9ff4f800a5b41ba18cdd214)
 2015-10-31 20:26:40 +01:00
Shauren dc74454356 Core/Conditions: Type renaming 
(cherry picked from commit 5e0cee85ddd67188365ead3f18206df088e1f0c7)
 2015-10-31 20:26:40 +01:00
joschiwald df88c7f278 Core/Misc: removed some useless map checks 
(cherry picked from commit cf1e80e3d09067ca4d0078a8113a09227a9f91ae)
 2015-10-31 19:11:41 +01: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
Aokromes b0a9b6491e Core/Misc: missing changes 2015-08-15 22:04:55 +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
Vincent-Michael d2d4bc2668 Core: Header cleanup in game/*/*.cpp 
(cherry picked from commit 2e586bc520e7eda2387e850c3c0049e6daa880de)

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/DataStores/DB2Stores.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/ObjectGuid.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Handlers/BankHandler.cpp
	src/server/game/Handlers/CombatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TokenHandler.cpp
	src/server/game/Handlers/VoiceChatHandler.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Packet.cpp
	src/server/game/Server/Packets/SpellPackets.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/game/Warden/Warden.cpp
	src/server/game/Warden/WardenWin.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2015-07-25 21:53:30 +01: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
Carbenium 82ea8da720 Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4 
Conflicts:
	.travis.yml
	README.md
	sql/updates/world/2015_04_18_00_world.sql
	sql/updates/world/2015_04_18_05_world_335.sql
	sql/updates/world/2015_04_26_03_world_335.sql
	sql/updates/world/2015_05_09_00_world_335.sql
	src/server/game/Conditions/ConditionMgr.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/Unit/Unit.cpp
	src/server/game/Spells/SpellInfo.cpp
 2015-07-22 01:33:48 +02:00
Carbenium ee53cf1a88 Fix merge 2015-07-22 00:06:43 +02:00
Carbenium b82a072b25 Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4 
Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt
 2015-07-21 23:46:56 +02:00
Carbenium 2530db5a51 Fix merge 2015-07-21 20:40:21 +02:00
Carbenium 79eb80dcba Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4 
Conflicts:
	README.md
	sql/base/auth_database.sql
	sql/updates/world/2014_12_27_01_world_335.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2015-07-21 20:05:44 +02:00
Aokromes 7680c90abd Update (C) date 2015-07-19 13:37:44 +02:00
ariel- fe83ecb2cf Spell logging corrections 2015-04-27 01:47:03 -03:00
Kittnz 5f8db04761 Core/Condition: Add In Water Condition 
Updates #7019
 2015-04-18 17:11:03 +02:00
Kittnz e50489c010 Core/Condition: Added Realm Achievement condition 
- Partly Fixes https://github.com/TrinityCore/TrinityCore/issues/5754
@DRJ has SQL examples
 2015-03-16 20:03:49 +01:00
Vincent-Michael f3e86d3e68 Update copyright note for 2015 
Happy new year

Conflicts:
	src/server/bnetserver/Authentication/AuthCodes.h
	src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
	src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
	src/server/bnetserver/Packets/AchievementPackets.h
	src/server/bnetserver/Packets/AuthenticationPackets.cpp
	src/server/bnetserver/Packets/AuthenticationPackets.h
	src/server/bnetserver/Packets/BitStream.cpp
	src/server/bnetserver/Packets/BitStream.h
	src/server/bnetserver/Packets/CachePackets.cpp
	src/server/bnetserver/Packets/CachePackets.h
	src/server/bnetserver/Packets/ChatPackets.h
	src/server/bnetserver/Packets/ConnectionPackets.cpp
	src/server/bnetserver/Packets/ConnectionPackets.h
	src/server/bnetserver/Packets/FriendsPackets.cpp
	src/server/bnetserver/Packets/FriendsPackets.h
	src/server/bnetserver/Packets/PacketManager.cpp
	src/server/bnetserver/Packets/PacketManager.h
	src/server/bnetserver/Packets/Packets.h
	src/server/bnetserver/Packets/PacketsBase.cpp
	src/server/bnetserver/Packets/PacketsBase.h
	src/server/bnetserver/Packets/PresencePackets.cpp
	src/server/bnetserver/Packets/PresencePackets.h
	src/server/bnetserver/Packets/ProfilePackets.h
	src/server/bnetserver/Packets/SupportPackets.h
	src/server/bnetserver/Packets/WoWRealmPackets.cpp
	src/server/bnetserver/Packets/WoWRealmPackets.h
	src/server/bnetserver/Realms/RealmList.cpp
	src/server/bnetserver/Realms/WorldListener.cpp
	src/server/bnetserver/Realms/WorldListener.h
	src/server/bnetserver/Server/ComponentManager.cpp
	src/server/bnetserver/Server/ComponentManager.h
	src/server/bnetserver/Server/ModuleManager.cpp
	src/server/bnetserver/Server/ModuleManager.h
	src/server/bnetserver/Server/Session.cpp
	src/server/bnetserver/Server/Session.h
	src/server/bnetserver/Server/SessionManager.cpp
	src/server/bnetserver/Server/SessionManager.h
	src/server/game/Accounts/BattlenetAccountMgr.cpp
	src/server/game/Accounts/BattlenetAccountMgr.h
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundTP.h
	src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
	src/server/game/Entities/AreaTrigger/AreaTrigger.h
	src/server/game/Entities/Item/ItemTemplate.cpp
	src/server/game/Guilds/GuildFinderMgr.cpp
	src/server/game/Guilds/GuildFinderMgr.h
	src/server/game/Handlers/GuildFinderHandler.cpp
	src/server/game/Handlers/VoidStorageHandler.cpp
	src/server/game/Movement/MovementStructures.cpp
	src/server/game/Movement/MovementStructures.h
	src/server/game/Movement/PathGenerator.cpp
	src/server/game/Server/BattlenetServerManager.cpp
	src/server/game/Server/BattlenetServerManager.h
	src/server/game/Server/Packet.cpp
	src/server/game/Server/Packet.h
	src/server/game/Server/Packets/AchievementPackets.cpp
	src/server/game/Server/Packets/AchievementPackets.h
	src/server/game/Server/Packets/AuctionHousePackets.cpp
	src/server/game/Server/Packets/AuctionHousePackets.h
	src/server/game/Server/Packets/AuthenticationPackets.cpp
	src/server/game/Server/Packets/AuthenticationPackets.h
	src/server/game/Server/Packets/BattlegroundPackets.cpp
	src/server/game/Server/Packets/BattlegroundPackets.h
	src/server/game/Server/Packets/ChannelPackets.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/CharacterPackets.cpp
	src/server/game/Server/Packets/CharacterPackets.h
	src/server/game/Server/Packets/ChatPackets.cpp
	src/server/game/Server/Packets/ChatPackets.h
	src/server/game/Server/Packets/ClientConfigPackets.cpp
	src/server/game/Server/Packets/ClientConfigPackets.h
	src/server/game/Server/Packets/CombatLogPackets.cpp
	src/server/game/Server/Packets/CombatLogPackets.h
	src/server/game/Server/Packets/CombatPackets.cpp
	src/server/game/Server/Packets/CombatPackets.h
	src/server/game/Server/Packets/EquipmentSetPackets.cpp
	src/server/game/Server/Packets/EquipmentSetPackets.h
	src/server/game/Server/Packets/GameObjectPackets.cpp
	src/server/game/Server/Packets/GameObjectPackets.h
	src/server/game/Server/Packets/GuildPackets.cpp
	src/server/game/Server/Packets/GuildPackets.h
	src/server/game/Server/Packets/ItemPackets.cpp
	src/server/game/Server/Packets/ItemPackets.h
	src/server/game/Server/Packets/LootPackets.h
	src/server/game/Server/Packets/MiscPackets.cpp
	src/server/game/Server/Packets/MiscPackets.h
	src/server/game/Server/Packets/MovementPackets.cpp
	src/server/game/Server/Packets/MovementPackets.h
	src/server/game/Server/Packets/NPCPackets.cpp
	src/server/game/Server/Packets/NPCPackets.h
	src/server/game/Server/Packets/QueryPackets.cpp
	src/server/game/Server/Packets/QueryPackets.h
	src/server/game/Server/Packets/QuestPackets.cpp
	src/server/game/Server/Packets/QuestPackets.h
	src/server/game/Server/Packets/ReputationPackets.cpp
	src/server/game/Server/Packets/ReputationPackets.h
	src/server/game/Server/Packets/SpellPackets.cpp
	src/server/game/Server/Packets/SpellPackets.h
	src/server/game/Server/Packets/SystemPackets.cpp
	src/server/game/Server/Packets/SystemPackets.h
	src/server/game/Server/Packets/TalentPackets.cpp
	src/server/game/Server/Packets/TalentPackets.h
	src/server/game/Server/Packets/TradePackets.h
	src/server/game/Server/Packets/WorldStatePackets.cpp
	src/server/game/Server/Packets/WorldStatePackets.h
	src/server/game/Server/WorldSocket.cpp
	src/server/ipc/CMakeLists.txt
	src/server/ipc/Commands.cpp
	src/server/ipc/Commands.h
	src/server/ipc/ZMQTask.cpp
	src/server/ipc/ZMQTask.h
	src/server/ipc/ZmqContext.cpp
	src/server/ipc/ZmqContext.h
	src/server/ipc/ZmqListener.cpp
	src/server/ipc/ZmqListener.h
	src/server/ipc/ZmqMux.cpp
	src/server/ipc/ZmqMux.h
	src/server/ipc/ZmqWorker.cpp
	src/server/ipc/ZmqWorker.h
	src/server/scripts/Commands/cs_battlenet_account.cpp
	src/server/scripts/Commands/cs_mmaps.cpp
	src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
	src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
	src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
	src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.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_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
	src/server/scripts/Kalimdor/Firelands/firelands.h
	src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
	src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
	src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
	src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
	src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
	src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.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/Maelstrom/Stonecore/boss_corborus.cpp
	src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
	src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
	src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
	src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
	src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
	src/server/scripts/Maelstrom/Stonecore/stonecore.h
	src/server/shared/Cryptography/Authentication/AuthCrypt.h
	src/server/shared/Cryptography/Authentication/PacketCrypt.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
	src/server/shared/Cryptography/HmacHash.cpp
	src/server/shared/Cryptography/SHA256.cpp
	src/server/shared/Cryptography/SHA256.h
	src/server/shared/Database/Implementation/HotfixDatabase.cpp
	src/server/shared/Database/Implementation/HotfixDatabase.h
	src/server/shared/Realm/Realm.cpp
	src/server/shared/Realm/Realm.h
	src/tools/connection_patcher/CMakeLists.txt
	src/tools/connection_patcher/Constants/BinaryTypes.hpp
	src/tools/connection_patcher/Helper.cpp
	src/tools/connection_patcher/Helper.hpp
	src/tools/connection_patcher/Patcher.cpp
	src/tools/connection_patcher/Patcher.hpp
	src/tools/connection_patcher/Patches/Common.hpp
	src/tools/connection_patcher/Patches/Mac.hpp
	src/tools/connection_patcher/Patches/Windows.hpp
	src/tools/connection_patcher/Patterns/Common.hpp
	src/tools/connection_patcher/Patterns/Mac.hpp
	src/tools/connection_patcher/Patterns/Windows.hpp
	src/tools/connection_patcher/Program.cpp
	src/tools/map_extractor/loadlib/DBFilesClientList.h
 2015-01-01 00:32:50 +01:00
joschiwald 767b3e890e Fixed typo in previous commit 2014-11-20 14:15:36 +01:00
joschiwald d9c6b8fd89 Core/Logging: improved conditions error log messages 2014-11-20 13:55:26 +01:00