Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source

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

...

This commit is contained in:

Vincent-Michael committed 2013-06-11 22:07:11 +02:00

2 parents 93c86b0c52 9ec22fffa0

commit 0bebf40fe7

2824 files changed

+1553 -406

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/old/3.3.5a/08861_auth_realmlist.sql → sql/old/3.3.5a/TDB31_to_TDB32_updates/auth/08861_auth_realmlist.sql

File renamed without changes.

sql/old/3.3.5a/08971_characters_characters.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/characters/08971_characters_characters.sql

File renamed without changes.

sql/old/3.3.5a/08986_characters_worldstates.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/characters/08986_characters_worldstates.sql

File renamed without changes.

sql/old/3.3.5a/08890_world_spell_dbc.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08890_world_spell_dbc.sql

File renamed without changes.

sql/old/3.3.5a/08891_world_spell_dbc.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08891_world_spell_dbc.sql

File renamed without changes.

sql/old/3.3.5a/08897_world_npc_vendor.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08897_world_npc_vendor.sql

File renamed without changes.

sql/old/3.3.5a/08897_world_trinity_string.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08897_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/08905_world_spell_proc_event.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08905_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/08906_world_spell_proc_event.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08906_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/08915_world_trinity_string.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08915_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/08920_world_spell_dbc.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08920_world_spell_dbc.sql

File renamed without changes.

sql/old/3.3.5a/08920_world_spell_linked_spell.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08920_world_spell_linked_spell.sql

File renamed without changes.

sql/old/3.3.5a/08921_world_spell_dbc.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08921_world_spell_dbc.sql

File renamed without changes.

sql/old/3.3.5a/08925_world_spell_group.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08925_world_spell_group.sql

File renamed without changes.

sql/old/3.3.5a/08957_world_command.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08957_world_command.sql

File renamed without changes.

sql/old/3.3.5a/08957_world_disables.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08957_world_disables.sql

File renamed without changes.

sql/old/3.3.5a/08957_world_trinity_string.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08957_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/08971_world_command.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08971_world_command.sql

File renamed without changes.

sql/old/3.3.5a/08971_world_trinity_string.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08971_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/08975_world_spell_dbc.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08975_world_spell_dbc.sql

File renamed without changes.

sql/old/3.3.5a/08987_world_playercreateinfo.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08987_world_playercreateinfo.sql

File renamed without changes.

sql/old/3.3.5a/08988_world_playercreateinfo.sql → sql/old/3.3.5a/TDB32_to_TDB33_updates/world/08988_world_playercreateinfo.sql

File renamed without changes.

sql/old/3.3.5a/09444_auth_account.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/auth/09444_auth_account.sql

File renamed without changes.

sql/old/3.3.5a/09081_characters_characters.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09081_characters_characters.sql

File renamed without changes.

sql/old/3.3.5a/09090_characters_item_instance.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09090_characters_item_instance.sql

File renamed without changes.

sql/old/3.3.5a/09092_characters_corpse.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09092_characters_corpse.sql

File renamed without changes.

sql/old/3.3.5a/09160_characters_item_instance.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09160_characters_item_instance.sql

File renamed without changes.

sql/old/3.3.5a/09521_characters_character_achievement.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09521_characters_character_achievement.sql

File renamed without changes.

sql/old/3.3.5a/09632_characters_arena_team_member.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09632_characters_arena_team_member.sql

File renamed without changes.

sql/old/3.3.5a/09632_characters_arena_team_stats.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09632_characters_arena_team_stats.sql

File renamed without changes.

sql/old/3.3.5a/09632_characters_character_arena_stats.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09632_characters_character_arena_stats.sql

File renamed without changes.

sql/old/3.3.5a/09668_characters_gm_subsurveys.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09668_characters_gm_subsurveys.sql

File renamed without changes.

sql/old/3.3.5a/09668_characters_gm_surveys.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09668_characters_gm_surveys.sql

File renamed without changes.

sql/old/3.3.5a/09668_characters_gm_tickets.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09668_characters_gm_tickets.sql

File renamed without changes.

sql/old/3.3.5a/09668_characters_lag_reports.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09668_characters_lag_reports.sql

File renamed without changes.

sql/old/3.3.5a/09708_characters_database.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09708_characters_database.sql

File renamed without changes.

sql/old/3.3.5a/09716_characters_auctionhousebot.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09716_characters_auctionhousebot.sql

File renamed without changes.

sql/old/3.3.5a/09758_characters_game_event_save.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09758_characters_game_event_save.sql

File renamed without changes.

sql/old/3.3.5a/09792_characters_groups.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09792_characters_groups.sql

File renamed without changes.

sql/old/3.3.5a/09792_characters_instance.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09792_characters_instance.sql

File renamed without changes.

sql/old/3.3.5a/09792_characters_instance_reset.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/characters/09792_characters_instance_reset.sql

File renamed without changes.

sql/old/3.3.5a/09000_world_spell_bonus_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09000_world_spell_bonus_data.sql

File renamed without changes.

sql/old/3.3.5a/09006_world_spell_group.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09006_world_spell_group.sql

File renamed without changes.

sql/old/3.3.5a/09008_world_trinity_string.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09008_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/09010_world_spell_scripts.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09010_world_spell_scripts.sql

File renamed without changes.

sql/old/3.3.5a/09012_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09012_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09026_world_script_texts.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09026_world_script_texts.sql

File renamed without changes.

sql/old/3.3.5a/09026_world_scriptname.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09026_world_scriptname.sql

File renamed without changes.

sql/old/3.3.5a/09036_world_reputation_reward_rate.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09036_world_reputation_reward_rate.sql

File renamed without changes.

sql/old/3.3.5a/09039_world_reputation_spillover_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09039_world_reputation_spillover_template.sql

File renamed without changes.

sql/old/3.3.5a/09043_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09043_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09058_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09058_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09059_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09059_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09063_world_spell_bonus_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09063_world_spell_bonus_data.sql

File renamed without changes.

sql/old/3.3.5a/09070_world_scriptname.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09070_world_scriptname.sql

File renamed without changes.

sql/old/3.3.5a/09077_world_trinity_string.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09077_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/09081_world_access_requirement.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09081_world_access_requirement.sql

File renamed without changes.

sql/old/3.3.5a/09081_world_areatrigger_teleport.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09081_world_areatrigger_teleport.sql

File renamed without changes.

sql/old/3.3.5a/09108_world_battleground_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09108_world_battleground_template.sql

File renamed without changes.

sql/old/3.3.5a/09109_world_creature_transport.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09109_world_creature_transport.sql

File renamed without changes.

sql/old/3.3.5a/09120_world_spell_proc_event.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09120_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/09122_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09122_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09123_world_spell_proc_event.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09123_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/09124_world_spell_proc_event.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09124_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/09130_world_spell_bonus_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09130_world_spell_bonus_data.sql

File renamed without changes.

sql/old/3.3.5a/09131_world_spell_ranks.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09131_world_spell_ranks.sql

File renamed without changes.

sql/old/3.3.5a/09135_world_battleground_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09135_world_battleground_template.sql

File renamed without changes.

sql/old/3.3.5a/09136_world_trinity_string.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09136_world_trinity_string.sql

File renamed without changes.

sql/old/3.3.5a/09144_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09144_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09148_world_spell_bonus_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09148_world_spell_bonus_data.sql

File renamed without changes.

sql/old/3.3.5a/09149_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09149_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09162_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09162_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09166_world_spell_proc_event.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09166_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/09176_world_spell_proc_event.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09176_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/09189_world_transports.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09189_world_transports.sql

File renamed without changes.

sql/old/3.3.5a/09191_world_instance_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09191_world_instance_template.sql

File renamed without changes.

sql/old/3.3.5a/09193_world_battleground_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09193_world_battleground_template.sql

File renamed without changes.

sql/old/3.3.5a/09195_world_game_weather.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09195_world_game_weather.sql

File renamed without changes.

sql/old/3.3.5a/09196_world_conditions.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09196_world_conditions.sql

File renamed without changes.

sql/old/3.3.5a/09198_world_outdoorpvp_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09198_world_outdoorpvp_template.sql

File renamed without changes.

sql/old/3.3.5a/09199_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09199_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09205_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09205_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09213_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09213_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09237_world_achievement_criteria_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09237_world_achievement_criteria_data.sql

File renamed without changes.

sql/old/3.3.5a/09237_world_battleground_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09237_world_battleground_template.sql

File renamed without changes.

sql/old/3.3.5a/09237_world_outdoorpvp_template.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09237_world_outdoorpvp_template.sql

File renamed without changes.

sql/old/3.3.5a/09240_world_achievement_criteria_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09240_world_achievement_criteria_data.sql

File renamed without changes.

sql/old/3.3.5a/09246_world_scriptname.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09246_world_scriptname.sql

File renamed without changes.

sql/old/3.3.5a/09290_world_spell_linked_spell.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09290_world_spell_linked_spell.sql

File renamed without changes.

sql/old/3.3.5a/09332_world_spell_proc_event.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09332_world_spell_proc_event.sql

File renamed without changes.

sql/old/3.3.5a/09377_world_achievement_criteria_data.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09377_world_achievement_criteria_data.sql

File renamed without changes.

sql/old/3.3.5a/09421_world_command.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09421_world_command.sql

File renamed without changes.

sql/old/3.3.5a/09427_world_command.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09427_world_command.sql

File renamed without changes.

sql/old/3.3.5a/09436_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09436_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09447_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09447_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09453_world_script_texts.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09453_world_script_texts.sql

File renamed without changes.

sql/old/3.3.5a/09453_world_scriptname.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09453_world_scriptname.sql

File renamed without changes.

sql/old/3.3.5a/09453_world_spell_script_names.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09453_world_spell_script_names.sql

File renamed without changes.

sql/old/3.3.5a/09472_world_script_texts.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09472_world_script_texts.sql

File renamed without changes.

sql/old/3.3.5a/09472_world_scriptname.sql → sql/old/3.3.5a/TDB33_to_TDB34_updates/world/09472_world_scriptname.sql

File renamed without changes.

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