Vincent-Michael ecb317c300 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.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/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp

2014-09-04 06:41:51 +02:00

..

2014_08_24_03_world_version.sql

SQL: Fix typo

2014-08-24 17:27:12 +02:00

2014_08_24_04_world_conditions.sql

DB/Conditions: Injured rainspeaker oracle

2014-08-24 21:25:30 +01:00

2014_08_25_00_world_item_enchantment_template.sql

DB/Items: Fixed some random suffix ids

2014-08-25 17:01:22 +01:00

2014_08_25_01_world_sai.sql

Correction

2014-08-25 20:20:25 +01:00

2014_08_25_02_world_sai.sql

DB/Misc: Add Cosmetic Explosion Trap spawns and SAI to despawn Unstable Explosives on use.

2014-08-25 22:14:14 +01:00

2014_08_26_00_world_sai.sql

DB/SAI: Kill SAI Errors

2014-08-26 01:47:58 +01:00

2014_08_26_01_world_spelldifficulty_dbc.sql

DB/Spells: added a few spells to spelldifficulty_dbc

2014-08-26 04:35:37 +02:00

2014_08_26_02_world_skill_fishing_base_level.sql

DB/Fishing: Add fishing level to Undercity

2014-08-26 13:22:33 +02:00

2014_08_26_04_world_sai.sql

DB/SAI: Some corrections

2014-08-26 13:04:24 +01:00

2014_08_26_05_world_sai.sql

DB/SAI: Archivist Mechaton

2014-08-26 22:13:16 +01:00

2014_08_26_06_world_creature_stats.sql

DB/Creature Stats: Armor update for Warrior class from Bestiary

2014-08-26 20:05:58 -02:30

2014_08_26_07_world_creature_stats.sql

DB/Creature Stats: Armor update for Paladin class from Bestiary

2014-08-26 22:29:36 -02:30

2014_08_26_08_world_creature_template.sql

DB/Creature_template: Gruul's Lair Damage Update

2014-08-26 23:50:10 -02:30

2014_08_27_00_world_creature_template.sql

DB/Creature: Remove unused ScriptName

2014-08-28 12:17:13 +02:00

2014_08_27_01_world_sai.sql

DB/SAI: Xarantaur

2014-08-27 21:31:26 +01:00

2014_08_27_02_world_misc.sql

SQL: Rename file

2014-08-28 18:05:54 +02:00

2014_08_28_00_world_misc.sql

SQL: Fix fail ...

2014-08-28 20:19:14 +02:00

2014_08_28_01_world_ahbot.sql

Merge branch 'Rochet2/ahbot' into master

2014-08-28 22:01:58 +02:00

2014_08_28_02_world_sai.sql

DB/Creature: Fix Veridian Broodling

2014-08-28 22:31:04 +02:00

2014_08_28_03_world_ulduar.sql

Scripts/Ulduar: Implement Mimiron

2014-08-28 22:04:01 +01:00

2014_08_28_04_world_creature_template.sql

DB/Creature: Fix faction of Mutated Abomination

2014-08-28 23:34:23 +02:00

2014_08_28_04_world_misc.sql

Scripts/Commands: Implement .guild info command

2014-08-28 23:04:52 +01:00

2014_08_28_05_world_sai.sql

DB/SAI: Grizzly Hills quest complete scripts

2014-08-28 23:15:47 +01:00

2014_08_28_06_world_command.sql

DB/Commands: Fix a typo in help text of .guild info

2014-08-28 23:59:58 +01:00

2014_08_29_00_world_creature_template.sql

DB/Creature: Fix more factions

2014-08-29 03:13:11 +02:00

2014_08_29_00_world_trinity_string_434.sql

Scripts/Commands: Added for guild info guild level output

2014-08-29 21:09:06 +02:00

2014_08_29_01_world_creature_template.sql

DB/Creature: Add trigger and civilian flags to the other difficulty entries of the Soul Consumption trigger

2014-08-29 09:46:05 +02:00

2014_08_29_02_world_creature_template.sql

DB/Creature: Fix more factions

2014-08-29 13:17:57 +02:00

2014_08_29_03_world_creature_template.sql

DB/Creature: Fix even more factions

2014-08-29 13:32:38 +02:00

2014_08_29_04_world_creature_template.sql

Scripts/ICC: Fixed Impale (Lord Marrowgar)

2014-08-29 19:00:11 +02:00

2014_08_29_05_world_creature_template.sql

DB/NPCs: Multiple updates to faction

2014-08-29 20:23:24 +01:00

2014_08_29_06_world_creature_template.sql

DB/NPCs: Update factions of wrong difficulty entries

2014-08-29 20:30:18 +01:00

2014_08_29_07_world_creature_template_335.sql

Rename 2014_08_29_07_world_creature_template.sql to 2014_08_29_07_world_creature_template_335.sql

2014-08-29 22:07:33 +01:00

2014_08_30_00_world_creature_text.sql

Core/Battleground/AV: convert trinity_strings to proper creature_text

2014-08-30 03:34:35 +02:00

2014_08_30_01_world_creature_addon.sql

DB/Creature: Remove startup error

2014-08-30 10:10:47 +02:00

2014_08_30_02_world_command.sql

Scripts/Commands: Add optional reason to server shutdown/restart commands

2014-08-30 14:07:52 +01:00

2014_08_30_03_world_sai.sql

DB/Misc: Argent Tournament Scripts

2014-08-30 15:58:07 +01:00

2014_08_31_00_world_game_tele.sql

Update and rename 2014_08_30_00_world_game_tele.sql to 2014_08_31_00_world_game_tele.sql

2014-08-31 04:34:40 +02:00

2014_08_31_01_world_misc.sql

DB/Misc: Random fixes

2014-08-31 12:39:15 +01:00

2014_08_31_02_world_spell_script_names.sql

Core/Scripts: rename files, remove whitespace and some other small changes after recent pull requests

2014-08-31 20:33:46 +02:00

2014_09_01_00_world_misc.sql

DB/Misc Greatmother Geyah

2014-09-01 03:19:30 +01:00

2014_09_02_00_world_misc_335.sql

DB/Creature: Revert faction of Fizzle Darkstorm to 3.3.5a

2014-09-02 07:54:45 +02:00

2014_09_03_00_world_creature_summon_groups.sql

Core/Misc: Kill a white line from last commit and a small change to last sql

2014-09-03 05:04:02 -03:00

2014_09_03_01_world_loot.sql

Scripts/Blood Furnace: Update Broggok's script to EventMaps

2014-09-04 00:25:49 -03:00

2014_09_04_00_world_creature_template.sql

Scripts/Blood Furnace: Update Broggok's script to EventMaps

2014-09-04 00:25:49 -03:00