Merge branch 'master' into 4.3.4

Browse Source

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

...

This commit is contained in:

Spp committed 2013-01-14 11:04:03 +01:00

2 parents 7540cfedfc 802657250c

commit d75222feca

486 files changed

+3261 -2604

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/updates/world/2012_09_16_00_world_version.sql → sql/old/3.3.5a/2012_09_16_00_world_version.sql

File renamed without changes.

sql/updates/world/2012_09_16_01_world_conditions.sql → sql/old/3.3.5a/2012_09_16_01_world_conditions.sql

File renamed without changes.

sql/updates/world/2012_09_16_01_world_creature_loot_template.sql → sql/old/3.3.5a/2012_09_16_01_world_creature_loot_template.sql

File renamed without changes.

sql/updates/world/2012_09_16_01_world_creature_template_addon.sql → sql/old/3.3.5a/2012_09_16_01_world_creature_template_addon.sql

File renamed without changes.

sql/updates/world/2012_09_16_02_world_fires_over_skettis.sql → sql/old/3.3.5a/2012_09_16_02_world_fires_over_skettis.sql

File renamed without changes.

sql/updates/world/2012_09_16_03_world_spell_script_names.sql → sql/old/3.3.5a/2012_09_16_03_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_09_17_00_world_spell_bonus_data.sql → sql/old/3.3.5a/2012_09_17_00_world_spell_bonus_data.sql

File renamed without changes.

sql/updates/world/2012_09_17_01_world_spell_bonus_data.sql → sql/old/3.3.5a/2012_09_17_01_world_spell_bonus_data.sql

File renamed without changes.

sql/updates/world/2012_09_17_01_world_spell_script_names.sql → sql/old/3.3.5a/2012_09_17_01_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_09_17_02_world_misc.sql → sql/old/3.3.5a/2012_09_17_02_world_misc.sql

File renamed without changes.

sql/updates/world/2012_09_18_00_world_creature_template.sql → sql/old/3.3.5a/2012_09_18_00_world_creature_template.sql

File renamed without changes.

sql/updates/world/2012_09_18_01_world_creature_template.sql → sql/old/3.3.5a/2012_09_18_01_world_creature_template.sql

File renamed without changes.

sql/updates/world/2012_09_19_00_world_dwarfageddon.sql → sql/old/3.3.5a/2012_09_19_00_world_dwarfageddon.sql

File renamed without changes.

sql/updates/world/2012_09_19_00_world_reference_loot_template.sql → sql/old/3.3.5a/2012_09_19_00_world_reference_loot_template.sql

File renamed without changes.

sql/updates/world/2012_09_20_00_world_creature_loot_template.sql → sql/old/3.3.5a/2012_09_20_00_world_creature_loot_template.sql

File renamed without changes.

sql/updates/world/2012_09_22_01_world_i_was_a_lot_of_things.sql → sql/old/3.3.5a/2012_09_22_01_world_i_was_a_lot_of_things.sql

File renamed without changes.

sql/updates/world/2012_09_22_03_world_game_event.sql → sql/old/3.3.5a/2012_09_22_03_world_game_event.sql

File renamed without changes.

sql/updates/world/2012_09_24_00_world_spell_script_names.sql → sql/old/3.3.5a/2012_09_24_00_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_09_24_01_world_spell_script_names.sql → sql/old/3.3.5a/2012_09_24_01_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_09_24_02_world_misc.sql → sql/old/3.3.5a/2012_09_24_02_world_misc.sql

File renamed without changes.

sql/updates/world/2012_09_24_03_world_misc.sql → sql/old/3.3.5a/2012_09_24_03_world_misc.sql

File renamed without changes.

sql/updates/world/2012_09_26_00_world_misc.sql → sql/old/3.3.5a/2012_09_26_00_world_misc.sql

File renamed without changes.

sql/updates/world/2012_09_26_01_world_spell_bonus_data.sql → sql/old/3.3.5a/2012_09_26_01_world_spell_bonus_data.sql

File renamed without changes.

sql/updates/world/2012_09_27_01_world_custodian_of_time.sql → sql/old/3.3.5a/2012_09_27_01_world_custodian_of_time.sql

File renamed without changes.

sql/updates/world/2012_09_28_00_world_creature_model_info.sql → sql/old/3.3.5a/2012_09_28_00_world_creature_model_info.sql

File renamed without changes.

sql/updates/world/2012_09_29_00_world_creature_model_info.sql → sql/old/3.3.5a/2012_09_29_00_world_creature_model_info.sql

File renamed without changes.

sql/updates/world/2012_09_29_01_world_creature_text.sql → sql/old/3.3.5a/2012_09_29_01_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_09_30_00_world_creature_text.sql → sql/old/3.3.5a/2012_09_30_00_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_09_30_01_world_player_factionchange_titles.sql → sql/old/3.3.5a/2012_09_30_01_world_player_factionchange_titles.sql

File renamed without changes.

sql/updates/world/2012_09_30_02_world_creature_text.sql → sql/old/3.3.5a/2012_09_30_02_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_09_30_03_world_creature_text.sql → sql/old/3.3.5a/2012_09_30_03_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_10_02_00_world_oculus.sql → sql/old/3.3.5a/2012_10_02_00_world_oculus.sql

File renamed without changes.

sql/updates/world/2012_10_04_00_world_spelldifficulty_dbc.sql → sql/old/3.3.5a/2012_10_04_00_world_spelldifficulty_dbc.sql

File renamed without changes.

sql/updates/world/2012_10_04_01_world_script_texts.sql → sql/old/3.3.5a/2012_10_04_01_world_script_texts.sql

File renamed without changes.

sql/updates/world/2012_10_05_00_world_misc.sql → sql/old/3.3.5a/2012_10_05_00_world_misc.sql

File renamed without changes.

sql/updates/world/2012_10_05_01_world_spell_script_names.sql → sql/old/3.3.5a/2012_10_05_01_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_10_06_00_world_spell_difficulty.sql → sql/old/3.3.5a/2012_10_06_00_world_spell_difficulty.sql

File renamed without changes.

sql/updates/world/2012_10_06_00_world_spell_script_names.sql → sql/old/3.3.5a/2012_10_06_00_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_10_06_01_world_spell_dbc.sql → sql/old/3.3.5a/2012_10_06_01_world_spell_dbc.sql

File renamed without changes.

sql/updates/world/2012_10_06_02_world_misc_templates.sql → sql/old/3.3.5a/2012_10_06_02_world_misc_templates.sql

File renamed without changes.

sql/updates/world/2012_10_06_03_world_creature_text.sql → sql/old/3.3.5a/2012_10_06_03_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_10_06_04_world_misc_spawns.sql → sql/old/3.3.5a/2012_10_06_04_world_misc_spawns.sql

File renamed without changes.

sql/updates/world/2012_10_06_05_world_spell_script_names.sql → sql/old/3.3.5a/2012_10_06_05_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_10_07_00_world_creature_loot_template.sql → sql/old/3.3.5a/2012_10_07_00_world_creature_loot_template.sql

File renamed without changes.

sql/updates/world/2012_10_07_01_world_spell_proc_event.sql → sql/old/3.3.5a/2012_10_07_01_world_spell_proc_event.sql

File renamed without changes.

sql/updates/characters/2012_10_09_00_character_glyphs.sql → sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql

File renamed without changes.

sql/updates/world/2012_10_09_00_world_spell_groups.sql → sql/old/3.3.5a/2012_10_09_00_world_spell_groups.sql

File renamed without changes.

sql/updates/world/2012_10_09_01_world_spell_groups.sql → sql/old/3.3.5a/2012_10_09_01_world_spell_groups.sql

File renamed without changes.

sql/updates/world/2012_10_09_02_world_spell_groups.sql → sql/old/3.3.5a/2012_10_09_02_world_spell_groups.sql

File renamed without changes.

sql/updates/world/2012_10_10_00_world_battleground_template.sql → sql/old/3.3.5a/2012_10_10_00_world_battleground_template.sql

File renamed without changes.

sql/updates/world/2012_10_11_00_world_gameobject.sql → sql/old/3.3.5a/2012_10_11_00_world_gameobject.sql

File renamed without changes.

sql/updates/world/2012_10_13_00_world_creature_template.sql → sql/old/3.3.5a/2012_10_13_00_world_creature_template.sql

File renamed without changes.

sql/updates/world/2012_10_14_00_world_creature.sql → sql/old/3.3.5a/2012_10_14_00_world_creature.sql

File renamed without changes.

sql/updates/world/2012_10_16_00_world_spell_area.sql → sql/old/3.3.5a/2012_10_16_00_world_spell_area.sql

File renamed without changes.

sql/updates/characters/2012_10_17_00_character_gm_tickets.sql → sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql

File renamed without changes.

sql/updates/world/2012_10_20_00_world_transports.sql → sql/old/3.3.5a/2012_10_20_00_world_transports.sql

File renamed without changes.

sql/updates/world/2012_10_20_01_world_spell_script_names.sql → sql/old/3.3.5a/2012_10_20_01_world_spell_script_names.sql

File renamed without changes.

sql/updates/world/2012_10_20_02_world_creature_text.sql → sql/old/3.3.5a/2012_10_20_02_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_10_21_00_world_conditions.sql → sql/old/3.3.5a/2012_10_21_00_world_conditions.sql

File renamed without changes.

sql/updates/world/2012_10_21_01_world_misc.sql → sql/old/3.3.5a/2012_10_21_01_world_misc.sql

File renamed without changes.

sql/updates/world/2012_10_23_00_world_trinity_string.sql → sql/old/3.3.5a/2012_10_23_00_world_trinity_string.sql

File renamed without changes.

sql/updates/world/2012_10_23_01_world_command.sql → sql/old/3.3.5a/2012_10_23_01_world_command.sql

File renamed without changes.

sql/updates/world/2012_10_25_00_world_childrens_week.sql → sql/old/3.3.5a/2012_10_25_00_world_childrens_week.sql

File renamed without changes.

sql/updates/world/2012_10_26_00_world_sai.sql → sql/old/3.3.5a/2012_10_26_00_world_sai.sql

File renamed without changes.

sql/updates/world/2012_10_27_00_world_creature.sql → sql/old/3.3.5a/2012_10_27_00_world_creature.sql

File renamed without changes.

sql/updates/world/2012_10_27_01_world_creature_loot_template.sql → sql/old/3.3.5a/2012_10_27_01_world_creature_loot_template.sql

File renamed without changes.

sql/updates/world/2012_10_29_00_world_conditions.sql → sql/old/3.3.5a/2012_10_29_00_world_conditions.sql

File renamed without changes.

sql/updates/characters/2012_11_02_00_character_misc.sql → sql/old/3.3.5a/2012_11_02_00_character_misc.sql

File renamed without changes.

sql/updates/world/2012_11_03_00_world_creature_loot_template.sql → sql/old/3.3.5a/2012_11_03_00_world_creature_loot_template.sql

File renamed without changes.

sql/updates/world/2012_11_07_00_world_misc.sql → sql/old/3.3.5a/2012_11_07_00_world_misc.sql

File renamed without changes.

sql/updates/world/2012_11_11_00_world_sai.sql → sql/old/3.3.5a/2012_11_11_00_world_sai.sql

File renamed without changes.

sql/updates/world/2012_11_11_01_world_quest_template.sql → sql/old/3.3.5a/2012_11_11_01_world_quest_template.sql

File renamed without changes.

sql/updates/world/2012_11_11_02_world_gossip_menu.sql → sql/old/3.3.5a/2012_11_11_02_world_gossip_menu.sql

File renamed without changes.

sql/updates/world/2012_11_11_03_world_gossip_menu.sql → sql/old/3.3.5a/2012_11_11_03_world_gossip_menu.sql

File renamed without changes.

sql/updates/world/2012_11_12_00_world_quest_template.sql → sql/old/3.3.5a/2012_11_12_00_world_quest_template.sql

File renamed without changes.

sql/updates/world/2012_11_12_01_world_misc.sql → sql/old/3.3.5a/2012_11_12_01_world_misc.sql

File renamed without changes.

sql/updates/world/2012_11_12_02_world_quest_template.sql → sql/old/3.3.5a/2012_11_12_02_world_quest_template.sql

File renamed without changes.

sql/updates/world/2012_11_12_03_world_misc.sql → sql/old/3.3.5a/2012_11_12_03_world_misc.sql

File renamed without changes.

sql/updates/world/2012_11_13_00_world_waypoints.sql → sql/old/3.3.5a/2012_11_13_00_world_waypoints.sql

File renamed without changes.

sql/updates/world/2012_11_13_01_world_misc.sql → sql/old/3.3.5a/2012_11_13_01_world_misc.sql

File renamed without changes.

sql/updates/world/2012_11_13_02_world_creature.sql → sql/old/3.3.5a/2012_11_13_02_world_creature.sql

File renamed without changes.

sql/updates/world/2012_11_13_03_world_gameevent.sql → sql/old/3.3.5a/2012_11_13_03_world_gameevent.sql

File renamed without changes.

sql/updates/world/2012_11_13_04_world_gameeventquest.sql → sql/old/3.3.5a/2012_11_13_04_world_gameeventquest.sql

File renamed without changes.

sql/updates/world/2012_11_13_05_world_player_factionchange_items.sql → sql/old/3.3.5a/2012_11_13_05_world_player_factionchange_items.sql

File renamed without changes.

sql/updates/world/2012_11_13_06_world_trinity_string.sql → sql/old/3.3.5a/2012_11_13_06_world_trinity_string.sql

File renamed without changes.

sql/updates/world/2012_11_14_00_world_sai.sql → sql/old/3.3.5a/2012_11_14_00_world_sai.sql

File renamed without changes.

sql/updates/world/2012_11_14_00_world_various_fixes.sql → sql/old/3.3.5a/2012_11_14_00_world_various_fixes.sql

File renamed without changes.

sql/updates/world/2012_11_14_02_world_battleground_template.sql → sql/old/3.3.5a/2012_11_14_02_world_battleground_template.sql

File renamed without changes.

sql/updates/world/2012_11_16_00_world_utgarde.sql → sql/old/3.3.5a/2012_11_16_00_world_utgarde.sql

File renamed without changes.

sql/updates/world/2012_11_16_01_world_utgarde.sql → sql/old/3.3.5a/2012_11_16_01_world_utgarde.sql

File renamed without changes.

sql/updates/world/2012_11_16_02_world_creature_ai_summons.sql → sql/old/3.3.5a/2012_11_16_02_world_creature_ai_summons.sql

File renamed without changes.

sql/updates/world/2012_11_17_00_world_various_fixes.sql → sql/old/3.3.5a/2012_11_17_00_world_various_fixes.sql

File renamed without changes.

sql/updates/characters/2012_11_18_00_character_calendar.sql → sql/old/3.3.5a/2012_11_18_00_character_calendar.sql

File renamed without changes.

sql/updates/world/2012_11_18_00_world_ormorok.sql → sql/old/3.3.5a/2012_11_18_00_world_ormorok.sql

File renamed without changes.

sql/updates/world/2012_11_18_01_world_creature_text.sql → sql/old/3.3.5a/2012_11_18_01_world_creature_text.sql

File renamed without changes.

sql/updates/world/2012_11_18_01_world_gameobject.sql → sql/old/3.3.5a/2012_11_18_01_world_gameobject.sql

File renamed without changes.

sql/updates/world/2012_11_18_02_world_toc.sql → sql/old/3.3.5a/2012_11_18_02_world_toc.sql

File renamed without changes.

sql/updates/world/2012_11_19_00_world_various_fixes.sql → sql/old/3.3.5a/2012_11_19_00_world_various_fixes.sql

File renamed without changes.

sql/updates/world/2012_11_19_01_world_pilgrims_bounty.sql → sql/old/3.3.5a/2012_11_19_01_world_pilgrims_bounty.sql

File renamed without changes.

sql/updates/world/2012_11_19_02_world_misc.sql → sql/old/3.3.5a/2012_11_19_02_world_misc.sql

File renamed without changes.

Loaded 100 of 486 files, more files were not shown because too many files have changed in this diff. Show more