Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vincent-Michael committed 2014-08-24 17:24:20 +02:00
2 parents 772c293b24 d088a368f1
commit 10e00f32fd
215 files changed
+13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

contrib/merge_updates_windows.bat
+1
View File
@@ -1 +1,2 @@
copy /a ..\sql\updates\world\*.sql /b world_updates.sql
copy /a ..\sql\updates\auth\*.sql /b auth_updates.sql
sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/auth/2014_07_09_00_auth_rbac_permission.sql
View File
File renamed without changes.
sql/updates/world/2014_07_06_00_world_version.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_06_00_world_version.sql
View File
File renamed without changes.
sql/updates/world/2014_07_06_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_06_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_06_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_06_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_07_00_world_creature_text.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_07_00_world_creature_text.sql
View File
File renamed without changes.
sql/updates/world/2014_07_07_01_world_spell_script_names.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_07_01_world_spell_script_names.sql
View File
File renamed without changes.
sql/updates/world/2014_07_07_02_world_spell_game_event_creature.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_07_02_world_spell_game_event_creature.sql
View File
File renamed without changes.
sql/updates/world/2014_07_07_03_world_spell_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_07_03_world_spell_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_00_world_creature_queststarter.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_00_world_creature_queststarter.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_01_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_01_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_03_world_creature.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_03_world_creature.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_04_world_creature.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_04_world_creature.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_05_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_05_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_06_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_06_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_07_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_07_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_08_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_08_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_09_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_09_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_10_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_10_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_08_11_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_08_11_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_01_world_creature.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_01_world_creature.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_02_world_creature_template_addon.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_02_world_creature_template_addon.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_03_world_command.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_03_world_command.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_04_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_04_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_05_world_gameobject_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_05_world_gameobject_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_06_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_06_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_07_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_07_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_09_08_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_09_08_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_10_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_10_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_10_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_10_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_12_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_12_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_12_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_12_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_13_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_13_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_13_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_13_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_13_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_13_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_13_03_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_13_03_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_14_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_14_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_14_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_14_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_15_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_15_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_15_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_15_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_15_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_15_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_16_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_16_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_16_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_16_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_16_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_16_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_16_03_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_16_03_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_00_world_conditions.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_00_world_conditions.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_01_world_creature.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_01_world_creature.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_02_world_creature_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_02_world_creature_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_03_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_03_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_04_world_creature_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_04_world_creature_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_05_world_creature_text.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_05_world_creature_text.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_06_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_06_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_18_07_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_18_07_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_00_world_spell_custom_attr.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_00_world_spell_custom_attr.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_01_world_creature_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_01_world_creature_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_03_world_creature_addon.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_03_world_creature_addon.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_04_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_04_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_05_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_05_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_06_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_06_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_07_world_quest_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_07_world_quest_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_08_world_page_text.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_08_world_page_text.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_09_world_ahn_kahet.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_09_world_ahn_kahet.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_10_world_conditions.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_10_world_conditions.sql
View File
File renamed without changes.
sql/updates/world/2014_07_19_11_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_19_11_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_20_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_20_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_20_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_20_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_20_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_20_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_20_03_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_20_03_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_20_04_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_20_04_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_20_05_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_20_05_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_02_world_creature_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_02_world_creature_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_03_world_creature.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_03_world_creature.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_04_world_spell_script_names.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_04_world_spell_script_names.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_05_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_05_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_06_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_06_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_07_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_07_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_08_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_08_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_21_09_world_creature_template.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_21_09_world_creature_template.sql
View File
File renamed without changes.
sql/updates/world/2014_07_22_00_world_conditions.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_22_00_world_conditions.sql
View File
File renamed without changes.
sql/updates/world/2014_07_22_01_world_playercreateinfo_skills.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_22_01_world_playercreateinfo_skills.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_01_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_01_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_02_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_02_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_03_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_03_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_04_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_04_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_05_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_05_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_06_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_06_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_07_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_07_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_23_08_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_23_08_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_24_00_world_gossip_menu.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_24_00_world_gossip_menu.sql
View File
File renamed without changes.
sql/updates/world/2014_07_24_00_world_misc.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_24_00_world_misc.sql
View File
File renamed without changes.
sql/updates/world/2014_07_24_00_world_sai.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_24_00_world_sai.sql
View File
File renamed without changes.
sql/updates/world/2014_07_24_02_world_gossip.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_24_02_world_gossip.sql
View File
File renamed without changes.
sql/updates/world/2014_07_24_03_world_gameobject.sql → sql/old/3.3.5a/TDB54_to_TDB55_updates/world/2014_07_24_03_world_gameobject.sql
View File
File renamed without changes.
Loaded 100 of 215 files, more files were not shown because too many files have changed in this diff. Show more