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

Browse Source

...

This commit is contained in:

leak

2014-07-06 20:07:52 +02:00

parent 80a8ed23b7 a6494375f9

commit 013e3f4c0c

273 changed files with 173 additions and 33 deletions

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

sql/updates/auth/2014_04_26_00_auth_rbac_permissions.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_04_26_00_auth_rbac_permissions.sql

sql/updates/auth/2014_04_28_00_auth_rbac_permissions.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_04_28_00_auth_rbac_permissions.sql

sql/updates/auth/2014_06_23_00_auth_action_ip_logger.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_06_23_00_auth_action_ip_logger.sql

sql/updates/characters/2014_03_29_00_characters_groups.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_03_29_00_characters_groups.sql

sql/updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql

sql/updates/characters/2014_07_01_00_characters_character_skills.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_07_01_00_characters_character_skills.sql

sql/updates/world/2014_03_29_00_world_version.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_00_world_version.sql

sql/updates/world/2014_03_29_01_world_smart_scripts.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_01_world_smart_scripts.sql

sql/updates/world/2014_03_29_02_world_creature.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_02_world_creature.sql

sql/updates/world/2014_03_30_00_world_game_event_335.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_00_world_game_event_335.sql

sql/updates/world/2014_03_30_01_world_creature.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_01_world_creature.sql

sql/updates/world/2014_03_30_02_world_game_event_335.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_02_world_game_event_335.sql

sql/updates/world/2014_03_30_03_world_smart_scripts.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_03_world_smart_scripts.sql

sql/updates/world/2014_03_30_04_world_creature_equip_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_04_world_creature_equip_template.sql

sql/updates/world/2014_03_30_05_world_creature_equip_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_05_world_creature_equip_template.sql

sql/updates/world/2014_03_30_06_world_broadcast_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_06_world_broadcast_text.sql

sql/updates/world/2014_03_31_00_world_creature_template_addon.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_00_world_creature_template_addon.sql

sql/updates/world/2014_03_31_01_world_creature_addon.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_01_world_creature_addon.sql

sql/updates/world/2014_03_31_02_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_02_world_gameobject_template.sql

sql/updates/world/2014_03_31_03_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_03_world_gameobject_template.sql

sql/updates/world/2014_04_01_00_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_00_world_misc.sql

sql/updates/world/2014_04_01_01_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_01_world_gameobject_template.sql

sql/updates/world/2014_04_01_02_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_02_world_gameobject_template.sql

sql/updates/world/2014_04_01_03_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_03_world_gameobject_template.sql

sql/updates/world/2014_04_02_00_world_sai.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_00_world_sai.sql

sql/updates/world/2014_04_02_01_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_01_world_gameobject_template.sql

sql/updates/world/2014_04_02_02_world_gameobject_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_02_world_gameobject_template.sql

sql/updates/world/2014_04_03_00_world_sai.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_03_00_world_sai.sql

sql/updates/world/2014_04_04_00_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_04_00_world_creature_template.sql

sql/updates/world/2014_04_05_00_world_spell_script_names.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_05_00_world_spell_script_names.sql

sql/updates/world/2014_04_12_00_world_spell_bonus_data.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_12_00_world_spell_bonus_data.sql

sql/updates/world/2014_04_13_00_world_broadcast_text_conversion.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_13_00_world_broadcast_text_conversion.sql

sql/updates/world/2014_04_14_00_world_spell_script_names.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_00_world_spell_script_names.sql

sql/updates/world/2014_04_14_01_world_broadcast_text_conversion.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_01_world_broadcast_text_conversion.sql

sql/updates/world/2014_04_14_02_world_broadcast_text_conversion.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_02_world_broadcast_text_conversion.sql

sql/updates/world/2014_04_16_00_world_sai.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_00_world_sai.sql

sql/updates/world/2014_04_16_01_world_broadcast_text_conversion.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_01_world_broadcast_text_conversion.sql

sql/updates/world/2014_04_16_02_world_broadcast_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_02_world_broadcast_text.sql

sql/updates/world/2014_04_17_00_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_00_world_misc.sql

sql/updates/world/2014_04_17_01_world_spelldifficulty_dbc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_01_world_spelldifficulty_dbc.sql

sql/updates/world/2014_04_17_02_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_02_world_creature_template.sql

sql/updates/world/2014_04_17_03_world_spell_area.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_03_world_spell_area.sql

sql/updates/world/2014_04_17_04_world_ulduar.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_04_world_ulduar.sql

sql/updates/world/2014_04_18_00_world_spell_script_names.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_18_00_world_spell_script_names.sql

sql/updates/world/2014_04_19_00_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_19_00_world_misc.sql

sql/updates/world/2014_04_19_01_world_quest.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_19_01_world_quest.sql

sql/updates/world/2014_04_20_00_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_00_world_misc.sql

sql/updates/world/2014_04_20_01_world_creature_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_01_world_creature_text.sql

sql/updates/world/2014_04_20_02_world_creature_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_02_world_creature_text.sql

sql/updates/world/2014_04_20_03_world_gossip_menu_option.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_03_world_gossip_menu_option.sql

sql/updates/world/2014_04_21_00_world_smart_scripts.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_00_world_smart_scripts.sql

sql/updates/world/2014_04_21_01_world_quest_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_01_world_quest_template.sql

sql/updates/world/2014_04_21_02_world_disables.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_02_world_disables.sql

sql/updates/world/2014_04_21_03_world_smart_scripts.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_03_world_smart_scripts.sql

sql/updates/world/2014_04_21_04_world_broadcast_text_conversion.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_04_world_broadcast_text_conversion.sql

sql/updates/world/2014_04_21_05_world_gossip_menu.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_05_world_gossip_menu.sql

sql/updates/world/2014_04_21_06_world_locales_broadcast_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_06_world_locales_broadcast_text.sql

sql/updates/world/2014_04_21_07_world_locales_item.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_07_world_locales_item.sql

sql/updates/world/2014_04_21_08_world_locales_item_set_names.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_08_world_locales_item_set_names.sql

sql/updates/world/2014_04_22_00_world_locales_gameobject.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_00_world_locales_gameobject.sql

sql/updates/world/2014_04_22_01_world_locales_creature.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_01_world_locales_creature.sql

sql/updates/world/2014_04_22_02_world_creature_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_02_world_creature_text.sql

sql/updates/world/2014_04_22_03_world_trinity_string.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_03_world_trinity_string.sql

sql/updates/world/2014_04_22_04_world_creature_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_04_world_creature_text.sql

sql/updates/world/2014_04_23_00_world_trinity_string.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_00_world_trinity_string.sql

sql/updates/world/2014_04_23_01_world_locales_quest.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_01_world_locales_quest.sql

sql/updates/world/2014_04_23_02_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_02_world_misc.sql

sql/updates/world/2014_04_23_03_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_03_world_misc.sql

sql/updates/world/2014_04_23_04_world_locales_item.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_04_world_locales_item.sql

sql/updates/world/2014_04_24_00_world_locales_broadcast_text.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_00_world_locales_broadcast_text.sql

sql/updates/world/2014_04_24_01_world_locales_gameobject.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_01_world_locales_gameobject.sql

sql/updates/world/2014_04_24_02_world_gossip.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_02_world_gossip.sql

sql/updates/world/2014_04_24_03_world_gossip.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_03_world_gossip.sql

sql/updates/world/2014_04_24_04_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_04_world_creature_template.sql

sql/updates/world/2014_04_26_00_world_command.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_00_world_command.sql

sql/updates/world/2014_04_26_01_world_locales_creature.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_01_world_locales_creature.sql

sql/updates/world/2014_04_26_02_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_02_world_misc.sql

sql/updates/world/2014_04_26_03_world_gossip_menu_option.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_03_world_gossip_menu_option.sql

sql/updates/world/2014_04_26_04_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_04_world_creature_template.sql

sql/updates/world/2014_04_27_00_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_00_world_misc.sql

sql/updates/world/2014_04_27_01_world_gossip_menu_option.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_01_world_gossip_menu_option.sql

sql/updates/world/2014_04_27_02_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_02_world_creature_template.sql

sql/updates/world/2014_04_27_03_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_03_world_creature_template.sql

sql/updates/world/2014_04_27_04_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_04_world_creature_template.sql

sql/updates/world/2014_04_27_05_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_05_world_creature_template.sql

sql/updates/world/2014_04_27_06_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_06_world_creature_template.sql

sql/updates/world/2014_04_27_07_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_07_world_creature_template.sql

sql/updates/world/2014_04_27_08_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_08_world_creature_template.sql

sql/updates/world/2014_04_27_09_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_09_world_creature_template.sql

sql/updates/world/2014_04_27_10_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_10_world_creature_template.sql

sql/updates/world/2014_04_28_00_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_00_world_creature_template.sql

sql/updates/world/2014_04_28_01_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_01_world_creature_template.sql

sql/updates/world/2014_04_28_02_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_02_world_creature_template.sql

sql/updates/world/2014_04_28_03_world_command.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_03_world_command.sql

sql/updates/world/2014_04_28_04_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_04_world_misc.sql

sql/updates/world/2014_04_28_05_world_misc.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_05_world_misc.sql

sql/updates/world/2014_04_28_06_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_06_world_creature_template.sql

sql/updates/world/2014_04_28_07_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_07_world_creature_template.sql

sql/updates/world/2014_04_28_08_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_08_world_creature_template.sql

sql/updates/world/2014_04_28_09_world_creature_template.sql → sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_09_world_creature_template.sql

Some files were not shown because too many files have changed in this diff Show More