Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,036 Commits 4 Branches 146 Tags
2a1ad10b806ffad2be227ef2aa6ce1ca12e6cf5f
Commit Graph

25036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nyeriah
2a1ad10b80 Scripts/ToC: Twin Val'kyr 
- Script rewritten to EventMaps
- Implemented random special ability sequence
- Adjusted timer for special abilities to 45 seconds
- Misc clean up.
Closes #7546

(cherry picked from commit e5da0dccfa)
 2014-11-01 00:47:15 -02:00
Shauren
5781119c4b Core/Entities: Fixed data sent in movement packets - time3 in transport block is actually the id of a vehicle we are passenger on 2014-11-01 00:24:10 +01:00
Nyeriah
39c09a60dd DB/Achievement: Remove unneeded criteria data for "A Tribute to Immortality" 
Required team is already checked from dbc on criteria update
Closes #4622
Thanks to @joschiwald

(cherry picked from commit 1823e2f9b8)
 2014-10-30 20:11:52 -02:00
DDuarte
dbf5aa73e5 SQL: Update /dev/world_database.sql 2014-10-30 13:46:06 +00:00
Nyeriah
23ae2b2521 DB/Disables: Remove criteria for the "Shattered" achievement from disables 
...as it works fine. Ulduar/Ignis achievement.

(cherry picked from commit 799bdc1710)
 2014-10-30 04:45:35 -02:00
Nyeriah
379be86493 Scripts/Ulduar: Fix Ignis' Slag Pot periodic ticks and enable achievement "Hot Pocket" 
(cherry picked from commit 21820b425b)
 2014-10-29 21:54:15 -02:00
Unholychick
ccb055d95f Scripts/Ulduar: Fix Ignis' golems not shattering in 25m 
Closes #10519

(cherry picked from commit 60493b3057)
 2014-10-29 14:57:38 -02:00
Nyeriah
3bb3283c07 Scripts/Ulduar: Fix Kologarn's arms being despawned before they're used to access the rubble spawning triggers 
(cherry picked from commit 4c93ac74da)
 2014-10-29 14:54:43 -02:00
Dr-J
a8b7bda072 DB/Misc: Zone Wide Texts 2014-10-27 16:13:49 +00:00
Aokromes
4fde97407b Merge pull request #13454 from ShinDarth/434_fix 
Code/Quests: Fix QUEST_FLAGS_PLAYER_CAST quests
 2014-10-25 10:22:10 +02:00
ShinDarth
02a107731e Fix #13351 2014-10-25 10:00:47 +02:00
Shauren
58a33a8e7b Core/Corpses: Fixed loading corpse guid during server startup 2014-10-24 18:53:07 +02:00
Dr-J
07cf7a6484 DB/Misc: Hellfire Peninsula Pathing 
By @Kittnz
 2014-10-22 22:29:54 +01:00
Aokromes
6da0beed0c Core/Quests: quests which have been added with no questgiver (like spells) will now also show a icon in the quest log 
By Northstrider and Malcrom
 2014-10-21 23:43:36 +02:00
Aokromes
62de85c7dd DB/Creature: Fix some startup errors 2014-10-21 18:37:02 +02:00
DDuarte
9e12b969c3 TDB 434.09 - 2014/10/19 TDB434.09 2014-10-19 04:56:59 +01:00
DDuarte
efa79f4469 Scripts/Cmds: Replace AccountMgr::normalizeString with Utf8ToUpperOnlyLatin 2014-10-19 04:06:01 +01:00
DDuarte
02842a20b6 Core/Shared: Fix typo in LoginDatabase enum 2014-10-19 03:50:53 +01:00
DDuarte
69f1bb118f Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_22_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_02_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_00_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_02_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_01_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_04_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_15_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_16_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_17_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_04_world.sql
	sql/updates/world/017_2014_09_21_04_world.sql
	sql/updates/world/017_2014_09_21_05_world.sql
	sql/updates/world/017_2014_09_21_06_world.sql
	sql/updates/world/017_2014_09_21_07_world.sql
	sql/updates/world/040_2014_09_22_00_world.sql
	sql/updates/world/040_2014_09_23_00_world.sql
	sql/updates/world/040_2014_09_23_01_world.sql
	sql/updates/world/040_2014_09_23_02_world.sql
	sql/updates/world/040_2014_09_23_03_world.sql
	sql/updates/world/040_2014_09_23_04_world.sql
	sql/updates/world/040_2014_09_24_00_world.sql
	sql/updates/world/040_2014_09_24_01_world.sql
	sql/updates/world/040_2014_09_25_00_world.sql
	sql/updates/world/040_2014_09_25_01_world.sql
	sql/updates/world/040_2014_09_25_02_world.sql
	sql/updates/world/040_2014_09_26_00_world.sql
	sql/updates/world/040_2014_09_26_01_world.sql
	sql/updates/world/040_2014_09_26_02_world.sql
	sql/updates/world/040_2014_09_26_03_world.sql
	sql/updates/world/040_2014_09_27_00_world.sql
	sql/updates/world/040_2014_09_27_01_world.sql
	sql/updates/world/048_2014_09_27_02_world.sql
	sql/updates/world/048_2014_09_27_03_world.sql
	sql/updates/world/050_2014_09_28_00_world.sql
	sql/updates/world/050_2014_09_28_01_world.sql
	sql/updates/world/050_2014_09_29_00_world.sql
	sql/updates/world/050_2014_09_29_01_world.sql
	sql/updates/world/050_2014_09_29_02_world_335.sql
	sql/updates/world/050_2014_09_29_03_world.sql
	sql/updates/world/050_2014_09_30_00_world_335.sql
	sql/updates/world/051_2014_09_30_01_world.sql
	sql/updates/world/051_2014_09_30_02_world.sql
	sql/updates/world/052_2014_10_01_00_world.sql
	sql/updates/world/053_2014_10_01_01_world.sql
	sql/updates/world/054_2014_10_02_00_world.sql
	sql/updates/world/058_2014_10_04_00_world.sql
	sql/updates/world/062_2014_10_05_01_world.sql
	sql/updates/world/062_2014_10_05_02_world.sql
	sql/updates/world/062_2014_10_05_03_world.sql
	sql/updates/world/062_2014_10_05_04_world.sql
	sql/updates/world/062_2014_10_05_05_world.sql
	sql/updates/world/062_2014_10_05_06_world.sql
	sql/updates/world/062_2014_10_05_07_world.sql
	sql/updates/world/062_2014_10_06_00_world.sql
	sql/updates/world/062_2014_10_06_01_world.sql
	sql/updates/world/062_2014_10_06_02_world.sql
	sql/updates/world/062_2014_10_06_03_world.sql
	sql/updates/world/062_2014_10_06_04_world.sql
	sql/updates/world/062_2014_10_06_05_world.sql
	sql/updates/world/065_2014_10_06_06_world.sql
	sql/updates/world/065_2014_10_07_00_world.sql
	sql/updates/world/065_2014_10_07_01_world.sql
	sql/updates/world/065_2014_10_08_00_world.sql
	sql/updates/world/065_2014_10_08_01_world.sql
	sql/updates/world/065_2014_10_08_02_world.sql
	sql/updates/world/065_2014_10_09_00_world.sql
	sql/updates/world/065_2014_10_09_01_world.sql
	sql/updates/world/065_2014_10_09_02_world.sql
	sql/updates/world/071_2014_10_10_00_world.sql
	sql/updates/world/071_2014_10_10_01_world_335.sql
	sql/updates/world/071_2014_10_10_03_world.sql
	sql/updates/world/071_2014_10_10_04_world_335.sql
	sql/updates/world/071_2014_10_10_05_world.sql
	sql/updates/world/072_2014_10_04_01_world.sql
	sql/updates/world/072_2014_10_05_00_world.sql
	sql/updates/world/074_2014_10_10_06_world.sql
	sql/updates/world/074_2014_10_11_00_world.sql
	sql/updates/world/075_2014_10_11_01_world.sql
	sql/updates/world/075_2014_10_11_02_world.sql
	sql/updates/world/075_2014_10_11_03_world.sql
	sql/updates/world/075_2014_10_11_04_world.sql
	sql/updates/world/075_2014_10_11_05_world.sql
	sql/updates/world/075_2014_10_11_06_world.sql
	sql/updates/world/075_2014_10_11_07_world.sql
	sql/updates/world/075_2014_10_12_00_world.sql
	sql/updates/world/075_2014_10_12_01_world.sql
	sql/updates/world/075_2014_10_12_04_world.sql
	sql/updates/world/075_2014_10_12_06_world.sql
	sql/updates/world/075_2014_10_12_07_world.sql
	sql/updates/world/077_2014_10_13_00_world.sql
	sql/updates/world/077_2014_10_13_01_world.sql
	sql/updates/world/077_2014_10_15_00_world.sql
	sql/updates/world/077_2014_10_16_00_world.sql
	sql/updates/world/077_2014_10_17_00_world.sql
	sql/updates/world/077_2014_10_18_00_world.sql
	sql/updates/world/077_2014_10_18_01_world.sql
	sql/updates/world/077_2014_10_18_02_world.sql
	sql/updates/world/077_2014_10_18_03_world.sql
	sql/updates/world/077_2014_10_18_04_world.sql
	sql/updates/world/2014_09_21_04_world.sql
	sql/updates/world/2014_09_21_05_world.sql
	sql/updates/world/2014_09_21_06_world.sql
	sql/updates/world/2014_09_21_07_world.sql
	sql/updates/world/2014_09_22_00_world.sql
	sql/updates/world/2014_09_23_00_world.sql
	sql/updates/world/2014_09_23_01_world.sql
	sql/updates/world/2014_09_23_02_world.sql
	sql/updates/world/2014_09_23_03_world.sql
	sql/updates/world/2014_09_23_04_world.sql
	sql/updates/world/2014_09_24_00_world.sql
	sql/updates/world/2014_09_24_01_world.sql
	sql/updates/world/2014_09_25_00_world.sql
	sql/updates/world/2014_09_25_01_world.sql
	sql/updates/world/2014_09_25_02_world.sql
	sql/updates/world/2014_09_26_00_world.sql
	sql/updates/world/2014_09_26_01_world.sql
	sql/updates/world/2014_09_26_02_world.sql
	sql/updates/world/2014_09_26_03_world.sql
	sql/updates/world/2014_09_27_00_world.sql
	sql/updates/world/2014_09_27_01_world.sql
	sql/updates/world/2014_09_27_02_world.sql
	sql/updates/world/2014_09_27_03_world.sql
	sql/updates/world/2014_09_28_00_world.sql
	sql/updates/world/2014_09_28_01_world.sql
	sql/updates/world/2014_09_29_00_world.sql
	sql/updates/world/2014_09_29_01_world.sql
	sql/updates/world/2014_09_29_02_world_335.sql
	sql/updates/world/2014_09_29_03_world.sql
	sql/updates/world/2014_09_30_00_world_335.sql
	sql/updates/world/2014_09_30_01_world.sql
	sql/updates/world/2014_09_30_02_world.sql
	sql/updates/world/2014_10_01_00_world.sql
	sql/updates/world/2014_10_01_01_world.sql
	sql/updates/world/2014_10_02_00_world.sql
	sql/updates/world/2014_10_04_00_world.sql
	sql/updates/world/2014_10_04_01_world.sql
	sql/updates/world/2014_10_05_00_world.sql
	sql/updates/world/2014_10_05_01_world.sql
	sql/updates/world/2014_10_05_02_world.sql
	sql/updates/world/2014_10_05_03_world.sql
	sql/updates/world/2014_10_05_04_world.sql
	sql/updates/world/2014_10_05_05_world.sql
	sql/updates/world/2014_10_05_06_world.sql
	sql/updates/world/2014_10_05_07_world.sql
	sql/updates/world/2014_10_06_00_world.sql
	sql/updates/world/2014_10_06_01_world.sql
	sql/updates/world/2014_10_06_02_world.sql
	sql/updates/world/2014_10_06_03_world.sql
	sql/updates/world/2014_10_06_04_world.sql
	sql/updates/world/2014_10_06_05_world.sql
	sql/updates/world/2014_10_06_06_world.sql
	sql/updates/world/2014_10_07_00_world.sql
	sql/updates/world/2014_10_07_01_world.sql
	sql/updates/world/2014_10_08_00_world.sql
	sql/updates/world/2014_10_08_01_world.sql
	sql/updates/world/2014_10_08_02_world.sql
	sql/updates/world/2014_10_09_00_world.sql
	sql/updates/world/2014_10_09_01_world.sql
	sql/updates/world/2014_10_09_02_world.sql
	sql/updates/world/2014_10_10_00_world.sql
	sql/updates/world/2014_10_10_01_world_335.sql
	sql/updates/world/2014_10_10_03_world.sql
	sql/updates/world/2014_10_10_04_world_335.sql
	sql/updates/world/2014_10_10_05_world.sql
	sql/updates/world/2014_10_10_06_world.sql
	sql/updates/world/2014_10_11_00_world.sql
	sql/updates/world/2014_10_11_01_world.sql
	sql/updates/world/2014_10_11_02_world.sql
	sql/updates/world/2014_10_11_03_world.sql
	sql/updates/world/2014_10_11_04_world.sql
	sql/updates/world/2014_10_11_05_world.sql
	sql/updates/world/2014_10_11_06_world.sql
	sql/updates/world/2014_10_11_07_world.sql
	sql/updates/world/2014_10_12_00_world.sql
	sql/updates/world/2014_10_12_01_world.sql
	sql/updates/world/2014_10_12_04_world.sql
	sql/updates/world/2014_10_12_06_world.sql
	sql/updates/world/2014_10_12_07_world.sql
	sql/updates/world/2014_10_13_00_world.sql
	sql/updates/world/2014_10_13_01_world.sql
	sql/updates/world/2014_10_15_00_world.sql
	sql/updates/world/2014_10_16_00_world.sql
	sql/updates/world/2014_10_17_00_world.sql
	sql/updates/world/2014_10_18_00_world.sql
	sql/updates/world/2014_10_18_01_world.sql
	sql/updates/world/2014_10_18_02_world.sql
	sql/updates/world/2014_10_18_03_world.sql
	sql/updates/world/2014_10_18_04_world.sql
 2014-10-19 03:49:11 +01:00
DDuarte
5474ed1882 TDB 335.57 - 2014/10/20 TDB335.57 2014-10-19 03:40:47 +01:00
DDuarte
12d9b544ef SQL: Add ALL sqls from the TDB 4.3.4 repo 2014-10-19 03:08:58 +01:00
DDuarte
eb68b11627 Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 2014-10-19 00:22:33 +01:00
DDuarte
5bf55eacfd Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h
 2014-10-19 00:18:06 +01:00
Nyeriah
5462936896 Scripts/Commands: Fix static analysis issues 2014-10-18 20:17:31 -03:00
Heihachi
15a9c6729e Scripts/Commands: Implement mutehistory command for GM's with requested improvements 
Closes #13350
 2014-10-18 23:34:18 +01:00
treak
f21b55068c Script/Spell: fix Mixology value bonus 
Closes #13297
Fixes #2172

This might not be best solution but a better way could not be found for the moment.
 2014-10-18 22:36:31 +01:00
Nyeriah
2f016098c2 Scripts/Commands: Implement commands to set and get boss states during run time 
Closes #13186
 2014-10-18 22:05:04 +01:00
Intra
98e1e06830 Scripts/MC: Rework Shazzrah script and implement spell script 
Closes #13317
 2014-10-18 22:57:30 +02:00
Golrag
5ede64260c Core/BattlegroundIC: 
* Fixed Catapults
* Fixed Graveyards
* Fixed Cannons on Gunships
* More Blizzlike Teleport to Gunship
* Fixed Gunship Teleport to Hangar
* Fixed Teleporters

Closes #13052
Fixes #12323 and #9557
 2014-10-18 21:33:21 +01:00
mik1893
ef4043436b Core/Spells: Grounding Totem: - correctly magnet spells and dies - let missile spells fly on it and destroys all spells during the travel time of first one 
Thx @amsjunior1

Closes #13147
Fixes #5611
 2014-10-18 21:13:37 +01:00
DDuarte
e07d3ebe4e SQL: Rename file added in PR 2014-10-18 20:58:07 +01:00
trickerer
47359a1ae2 Core/Spells: Trigger extra attacks on proper target 
Ref #6892

Closes #11001
 2014-10-18 20:51:00 +01:00
Duarte Duarte
670d12722c Merge pull request #13245 from Mihapro/4.3.4 
DB/Quests: Fear No Evil changes
 2014-10-18 18:59:31 +01:00
Duarte Duarte
996ad78122 Merge pull request #13353 from ShinDarth/335_quest_tracker 
Core/Quest: implement Quest Tracker
 2014-10-18 18:57:30 +01:00
ShinDarth
e806fc8a02 Core/Quest: implement Quest Tracker 2014-10-18 18:37:39 +02:00
Shauren
4a0be2bffc Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
 2014-10-18 16:00:20 +02:00
Warpten
8308f4a234 Merge pull request #13334 from Exodius/master 
Core/Spells: Fix Ebon Plague and Wandering Plague
 2014-10-18 15:54:49 +02:00
Shauren
c238e8faff Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Handlers/GroupHandler.cpp
 2014-10-18 15:54:30 +02:00
joschiwald
0de1603944 Core/ObjectAccessor: don't use singleton when calling static methods 2014-10-18 15:13:29 +02:00
Shauren
1d1b3269c1 Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows 2014-10-18 14:57:49 +02:00
Shauren
55e7879aec Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows 2014-10-18 14:05:55 +02:00
Shauren
130bceac9d CI/Travis: Use a different ZeroMQ package for travis only 2014-10-18 12:04:22 +02:00
Shauren
552b64f1cb CI/Travis: Added libzmq-dev to install list 2014-10-18 11:58:21 +02:00
Shauren
d2973fce98 Merge pull request #13352 from ShinDarth/4.3.4 
Core/LootMgr:  Restore Build
 2014-10-18 11:56:25 +02:00
ShinDarth
4940f8c37e Core/LootMgr: restore build 2014-10-18 11:27:36 +02:00
DDuarte
fc4f3fbc95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Loot/LootMgr.cpp
 2014-10-18 01:53:53 +01:00
Duarte Duarte
2523b47619 Merge pull request #13313 from ShinDarth/335_fix 
Improve logs of missing *_loot_templates
 2014-10-17 23:38:23 +01:00
Vincent-Michael
89fae5d172 Core: Fix merge fail 2014-10-18 00:37:24 +02:00
Vincent-Michael
35bd935779 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
 2014-10-18 00:32:39 +02:00
Shauren
69a17346d4 More build fixes, everyone loves pch 2014-10-18 00:26:41 +02:00