| Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_04_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_05_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_06_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_07_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_22_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_04_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_02_world_335.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_00_world_335.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_02_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_04_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_05_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_06_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_07_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_04_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_05_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_06_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_01_world_335.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_04_world_335.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_05_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_06_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_04_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_05_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_06_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_07_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_04_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_05_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_06_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_07_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_15_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_16_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_17_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_00_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_01_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_02_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_03_world.sql
sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_04_world.sql
sql/updates/world/017_2014_09_21_04_world.sql
sql/updates/world/017_2014_09_21_05_world.sql
sql/updates/world/017_2014_09_21_06_world.sql
sql/updates/world/017_2014_09_21_07_world.sql
sql/updates/world/040_2014_09_22_00_world.sql
sql/updates/world/040_2014_09_23_00_world.sql
sql/updates/world/040_2014_09_23_01_world.sql
sql/updates/world/040_2014_09_23_02_world.sql
sql/updates/world/040_2014_09_23_03_world.sql
sql/updates/world/040_2014_09_23_04_world.sql
sql/updates/world/040_2014_09_24_00_world.sql
sql/updates/world/040_2014_09_24_01_world.sql
sql/updates/world/040_2014_09_25_00_world.sql
sql/updates/world/040_2014_09_25_01_world.sql
sql/updates/world/040_2014_09_25_02_world.sql
sql/updates/world/040_2014_09_26_00_world.sql
sql/updates/world/040_2014_09_26_01_world.sql
sql/updates/world/040_2014_09_26_02_world.sql
sql/updates/world/040_2014_09_26_03_world.sql
sql/updates/world/040_2014_09_27_00_world.sql
sql/updates/world/040_2014_09_27_01_world.sql
sql/updates/world/048_2014_09_27_02_world.sql
sql/updates/world/048_2014_09_27_03_world.sql
sql/updates/world/050_2014_09_28_00_world.sql
sql/updates/world/050_2014_09_28_01_world.sql
sql/updates/world/050_2014_09_29_00_world.sql
sql/updates/world/050_2014_09_29_01_world.sql
sql/updates/world/050_2014_09_29_02_world_335.sql
sql/updates/world/050_2014_09_29_03_world.sql
sql/updates/world/050_2014_09_30_00_world_335.sql
sql/updates/world/051_2014_09_30_01_world.sql
sql/updates/world/051_2014_09_30_02_world.sql
sql/updates/world/052_2014_10_01_00_world.sql
sql/updates/world/053_2014_10_01_01_world.sql
sql/updates/world/054_2014_10_02_00_world.sql
sql/updates/world/058_2014_10_04_00_world.sql
sql/updates/world/062_2014_10_05_01_world.sql
sql/updates/world/062_2014_10_05_02_world.sql
sql/updates/world/062_2014_10_05_03_world.sql
sql/updates/world/062_2014_10_05_04_world.sql
sql/updates/world/062_2014_10_05_05_world.sql
sql/updates/world/062_2014_10_05_06_world.sql
sql/updates/world/062_2014_10_05_07_world.sql
sql/updates/world/062_2014_10_06_00_world.sql
sql/updates/world/062_2014_10_06_01_world.sql
sql/updates/world/062_2014_10_06_02_world.sql
sql/updates/world/062_2014_10_06_03_world.sql
sql/updates/world/062_2014_10_06_04_world.sql
sql/updates/world/062_2014_10_06_05_world.sql
sql/updates/world/065_2014_10_06_06_world.sql
sql/updates/world/065_2014_10_07_00_world.sql
sql/updates/world/065_2014_10_07_01_world.sql
sql/updates/world/065_2014_10_08_00_world.sql
sql/updates/world/065_2014_10_08_01_world.sql
sql/updates/world/065_2014_10_08_02_world.sql
sql/updates/world/065_2014_10_09_00_world.sql
sql/updates/world/065_2014_10_09_01_world.sql
sql/updates/world/065_2014_10_09_02_world.sql
sql/updates/world/071_2014_10_10_00_world.sql
sql/updates/world/071_2014_10_10_01_world_335.sql
sql/updates/world/071_2014_10_10_03_world.sql
sql/updates/world/071_2014_10_10_04_world_335.sql
sql/updates/world/071_2014_10_10_05_world.sql
sql/updates/world/072_2014_10_04_01_world.sql
sql/updates/world/072_2014_10_05_00_world.sql
sql/updates/world/074_2014_10_10_06_world.sql
sql/updates/world/074_2014_10_11_00_world.sql
sql/updates/world/075_2014_10_11_01_world.sql
sql/updates/world/075_2014_10_11_02_world.sql
sql/updates/world/075_2014_10_11_03_world.sql
sql/updates/world/075_2014_10_11_04_world.sql
sql/updates/world/075_2014_10_11_05_world.sql
sql/updates/world/075_2014_10_11_06_world.sql
sql/updates/world/075_2014_10_11_07_world.sql
sql/updates/world/075_2014_10_12_00_world.sql
sql/updates/world/075_2014_10_12_01_world.sql
sql/updates/world/075_2014_10_12_04_world.sql
sql/updates/world/075_2014_10_12_06_world.sql
sql/updates/world/075_2014_10_12_07_world.sql
sql/updates/world/077_2014_10_13_00_world.sql
sql/updates/world/077_2014_10_13_01_world.sql
sql/updates/world/077_2014_10_15_00_world.sql
sql/updates/world/077_2014_10_16_00_world.sql
sql/updates/world/077_2014_10_17_00_world.sql
sql/updates/world/077_2014_10_18_00_world.sql
sql/updates/world/077_2014_10_18_01_world.sql
sql/updates/world/077_2014_10_18_02_world.sql
sql/updates/world/077_2014_10_18_03_world.sql
sql/updates/world/077_2014_10_18_04_world.sql
sql/updates/world/2014_09_21_04_world.sql
sql/updates/world/2014_09_21_05_world.sql
sql/updates/world/2014_09_21_06_world.sql
sql/updates/world/2014_09_21_07_world.sql
sql/updates/world/2014_09_22_00_world.sql
sql/updates/world/2014_09_23_00_world.sql
sql/updates/world/2014_09_23_01_world.sql
sql/updates/world/2014_09_23_02_world.sql
sql/updates/world/2014_09_23_03_world.sql
sql/updates/world/2014_09_23_04_world.sql
sql/updates/world/2014_09_24_00_world.sql
sql/updates/world/2014_09_24_01_world.sql
sql/updates/world/2014_09_25_00_world.sql
sql/updates/world/2014_09_25_01_world.sql
sql/updates/world/2014_09_25_02_world.sql
sql/updates/world/2014_09_26_00_world.sql
sql/updates/world/2014_09_26_01_world.sql
sql/updates/world/2014_09_26_02_world.sql
sql/updates/world/2014_09_26_03_world.sql
sql/updates/world/2014_09_27_00_world.sql
sql/updates/world/2014_09_27_01_world.sql
sql/updates/world/2014_09_27_02_world.sql
sql/updates/world/2014_09_27_03_world.sql
sql/updates/world/2014_09_28_00_world.sql
sql/updates/world/2014_09_28_01_world.sql
sql/updates/world/2014_09_29_00_world.sql
sql/updates/world/2014_09_29_01_world.sql
sql/updates/world/2014_09_29_02_world_335.sql
sql/updates/world/2014_09_29_03_world.sql
sql/updates/world/2014_09_30_00_world_335.sql
sql/updates/world/2014_09_30_01_world.sql
sql/updates/world/2014_09_30_02_world.sql
sql/updates/world/2014_10_01_00_world.sql
sql/updates/world/2014_10_01_01_world.sql
sql/updates/world/2014_10_02_00_world.sql
sql/updates/world/2014_10_04_00_world.sql
sql/updates/world/2014_10_04_01_world.sql
sql/updates/world/2014_10_05_00_world.sql
sql/updates/world/2014_10_05_01_world.sql
sql/updates/world/2014_10_05_02_world.sql
sql/updates/world/2014_10_05_03_world.sql
sql/updates/world/2014_10_05_04_world.sql
sql/updates/world/2014_10_05_05_world.sql
sql/updates/world/2014_10_05_06_world.sql
sql/updates/world/2014_10_05_07_world.sql
sql/updates/world/2014_10_06_00_world.sql
sql/updates/world/2014_10_06_01_world.sql
sql/updates/world/2014_10_06_02_world.sql
sql/updates/world/2014_10_06_03_world.sql
sql/updates/world/2014_10_06_04_world.sql
sql/updates/world/2014_10_06_05_world.sql
sql/updates/world/2014_10_06_06_world.sql
sql/updates/world/2014_10_07_00_world.sql
sql/updates/world/2014_10_07_01_world.sql
sql/updates/world/2014_10_08_00_world.sql
sql/updates/world/2014_10_08_01_world.sql
sql/updates/world/2014_10_08_02_world.sql
sql/updates/world/2014_10_09_00_world.sql
sql/updates/world/2014_10_09_01_world.sql
sql/updates/world/2014_10_09_02_world.sql
sql/updates/world/2014_10_10_00_world.sql
sql/updates/world/2014_10_10_01_world_335.sql
sql/updates/world/2014_10_10_03_world.sql
sql/updates/world/2014_10_10_04_world_335.sql
sql/updates/world/2014_10_10_05_world.sql
sql/updates/world/2014_10_10_06_world.sql
sql/updates/world/2014_10_11_00_world.sql
sql/updates/world/2014_10_11_01_world.sql
sql/updates/world/2014_10_11_02_world.sql
sql/updates/world/2014_10_11_03_world.sql
sql/updates/world/2014_10_11_04_world.sql
sql/updates/world/2014_10_11_05_world.sql
sql/updates/world/2014_10_11_06_world.sql
sql/updates/world/2014_10_11_07_world.sql
sql/updates/world/2014_10_12_00_world.sql
sql/updates/world/2014_10_12_01_world.sql
sql/updates/world/2014_10_12_04_world.sql
sql/updates/world/2014_10_12_06_world.sql
sql/updates/world/2014_10_12_07_world.sql
sql/updates/world/2014_10_13_00_world.sql
sql/updates/world/2014_10_13_01_world.sql
sql/updates/world/2014_10_15_00_world.sql
sql/updates/world/2014_10_16_00_world.sql
sql/updates/world/2014_10_17_00_world.sql
sql/updates/world/2014_10_18_00_world.sql
sql/updates/world/2014_10_18_01_world.sql
sql/updates/world/2014_10_18_02_world.sql
sql/updates/world/2014_10_18_03_world.sql
sql/updates/world/2014_10_18_04_world.sql
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.h
src/server/scripts/Commands/cs_character.cpp
src/server/scripts/Commands/cs_lookup.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/tools/vmap4_extractor/mpq_libmpq04.h
|
|
|
|
Conflicts:
src/server/scripts/CMakeLists.txt
|
|
Closes #10483
|
|
Conflicts:
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_paladin.cpp
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/NPCHandler.cpp
|
|
|
|
|
|
|
|
Conflicts:
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Weather/Weather.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/tools/CMakeLists.txt
|
|
|
|
|
|
|
|
Ref #8947
Closes #9077
|
|
|
|
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Battlegrounds/BattlegroundQueue.cpp
src/server/game/DataStores/DBCfmt.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
src/server/game/Movement/Spline/MovementUtil.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/shared/Packets/ByteBuffer.h
|
|
|
|
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Chat/Chat.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
|
|
|
|
|
|
Conflicts:
sql/old/3.3.5a/2012_08_06_00_world_command.sql
sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
sql/old/4.3.4/2012_08_06_00_world_command_434.sql
sql/updates/characters/2012_08_07_00_characters_characters.sql
sql/updates/characters/2012_08_07_00_characters_characters_434.sql
sql/updates/world/2012_08_06_00_world_command.sql
|
|
|
|
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
|
|
https://github.com/TrinityCore/TrinityCore_4.3.4_DB_Alpha
From now on, this repository should only contain core related sqls
Aforementioned repository will be synced with this one from time to time and will include DB related content
|
|
|
|
|
|
|
|
|
|
Conflicts:
dep/PackageList.txt
sql/base/auth_database.sql
src/server/authserver/Server/AuthSocket.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Chat/Commands/Level1.cpp
src/server/game/Chat/Commands/Level3.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
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/DynamicObject/DynamicObject.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Updates/UpdateData.h
src/server/game/Entities/Pet/Pet.cpp
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/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Loot/LootMgr.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
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/Spell.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/scripts/Commands/cs_gps.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Logging/Log.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/CMakeLists.txt
|
|
|
|
Conflicts:
sql/base/auth_database.sql
src/server/authserver/Server/AuthSocket.cpp
src/server/game/AI/CoreAI/CombatAI.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Logging/Log.h
src/server/worldserver/worldserver.conf.dist
src/tools/vmap3_extractor/model.h
src/tools/vmap4_extractor/CMakeLists.txt
src/tools/vmap4_extractor/dbcfile.cpp
src/tools/vmap4_extractor/dbcfile.h
src/tools/vmap4_extractor/loadlib/loadlib.h
|
|
|