Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,939 Commits 4 Branches 146 Tags
cfe644b457a8262d7cd4ee613c7e05ea5b9a328b
Commit Graph

6940 Commits

Author SHA1 Message Date
Vincent-Michael
cfe644b457 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Quests/QuestDef.cpp
 2014-05-11 23:08:54 +02:00
Kinzcool
668ed58847 DB/Gameobjects: Updated the VerifiedBuild of some gameobjects 2014-05-11 13:05:42 -04:00
Kinzcool
4453cdc5bd DB/Gameobjects: Fixed Gymer's cage phasemask to make it appear while doing "The Storm King's Vengeance" quest 2014-05-11 04:09:08 -04:00
Kinzcool
392e045bda DB: Changed WDBVerified startdard to VerifiedBuild 2014-05-11 03:15:31 -04:00
Kinzcool
ac4fb9db24 DB/Gameobjects: Added some missing gameobjects spawns 2014-05-11 01:52:35 -04:00
joschiwald
066e55729f Merge pull request #11960 from MitchesD/hor 
Scripts/HallsOfReflection: Major changes
 2014-05-10 21:38:58 +02:00
MitchesD
8e7cf15dd1 Scripts/HallsOfReflection: Major changes 
* corrections to Intro Event (Falric, Marwyn etc.)
* fixed issues with Frostsworn General
* improved the whole Wrath of the Lich King event
* implemented outro gunship
* optimalization code and cleanup and fixed some typos
* Big thanks to @joschiwald, he is author too ;-)
 2014-05-10 21:37:33 +02:00
Aokromes
c861e64a56 DB/Misc: Delete some incorrect player_factionchange_items 
Closes #12005
 2014-05-10 20:36:38 +02:00
Vincent-Michael
37d2777f27 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-09 17:20:39 +02:00
joschiwald
7aef44630e Merge pull request #12035 from MitchesD/duskwood 
Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fi...
 2014-05-09 17:19:29 +02:00
MitchesD
eabec73d98 Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fixed some issues there 2014-05-09 16:59:55 +02:00
Vincent-Michael
b6a9e56193 DB/Gossip: Fix some gossip in dalaran 2014-05-09 03:19:37 +02:00
Vincent-Michael
33978774ff SQL: Rename in correct name 2014-05-08 23:36:28 +02:00
Vincent-Michael
2c48938c6d DB/Instance: Fix Ahn''Kahet exit (portal/areatrigger) 2014-05-08 23:36:21 +02:00
Vincent-Michael
45ead7fb87 SQL: Rename in correct name 2014-05-08 23:35:36 +02:00
Vincent-Michael
53edb30f06 DB/Instance: Fix Ahn''Kahet exit (portal/areatrigger) 2014-05-08 23:33:53 +02:00
Aokromes
70dd848785 DB/Quest: The Bones of Nozronn 
By phoenixfight, closes #11985
 2014-05-08 18:40:39 +02:00
Vincent-Michael
09ff96914a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-08 02:47:29 +02:00
ccrs
5e4083bc45 DB/Gossip: Remove "Jarin Dawnglow <Innkeeper>" double gossip 
Closes #12019
 2014-05-07 16:23:13 +02:00
Aokromes
3751d547c0 DB/Creature: Fix incorrect flags_extra for 30413 
By untaught, closes #12010
 2014-05-07 12:23:10 +02:00
Vincent-Michael
5ca548602c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-05 16:13:40 +02:00
Gacko
5dd3fbcb19 Fix import 2014-05-04 16:24:33 +02:00
w1sht0l1v3
fdbb96d396 DB/Creature: Add some missing spawns in HoL. 2014-05-04 16:56:53 +03:00
Aokromes
fd7a40ca97 DB/Creature: Remove more incorrect trigger flags 
By dr-j, closes #11995 
Closes #7744
 2014-05-04 14:55:06 +02:00
Vincent-Michael
49018c4bdb DB/CreatureTexts: Set some creature_text field BroadcastTextId to 0 because change on cata/mop 2014-05-04 12:12:01 +02:00
Vincent-Michael
3b9da8498f DB/CreatureTexts: Set some creature_text field BroadcastTextId to 0 because change on cata/mop 2014-05-04 12:10:52 +02:00
Aokromes
f16caf49ac DB/Quest: Prepping the Speech 
By untaught, closes #11348
 2014-05-04 04:26:35 +02:00
Vincent-Michael
5e3e431b06 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-04 04:24:59 +02:00
Aokromes
2cd0388adf DB/Creature: Remove Trigger Flags on Chaotic Rift 
By dr-j, closes #11988
 2014-05-04 04:22:05 +02:00
Vincent-Michael
9a8cd0593c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-03 18:20:28 +02:00
untaught
91839946b5 DB/Gossip: Fix some gossip stuff 2014-05-03 17:53:38 +02:00
Aokromes
42be4c1da7 DB/Creature: Remove trigger flags from Dead Caravan mobs 
By phoenixfight, closes #11986
 2014-05-03 07:21:59 +02:00
Vincent-Michael
43c78c4a8e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-02 20:55:53 +02:00
Aokromes
ddf5a7fc96 DB/Creature: Fix Dead Mage Hunter 
By dr-j closes #11979
 2014-05-02 13:25:54 +02:00
untaught
ca5dafe6af DB/Gossip: Fix some gossip stuff 2014-05-02 01:55:06 +02:00
Sarjuuk
5c7bcbc8b1 DB/Locales: Fix some item locales because items renamed on cata 
Closes #11974
 2014-05-02 01:48:46 +02:00
Vincent-Michael
e7eed54c10 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-01 22:20:55 +02:00
Aokromes
92e4777746 DB/Creature Fix incorrect trigger flags on Enchanted Tiki Warrior 
By dr-j closes #11973
 2014-05-01 18:06:52 +02:00
Vincent-Michael
cdae208b9a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-30 09:19:57 +02:00
Aokromes
394ac748f8 DB/Creature: Fix even more creature templates 2014-04-30 08:09:42 +02:00
Aokromes
2477b1cba4 DB/Creature: Fix even more creature templates 2014-04-30 07:51:28 +02:00
Aokromes
89fd7af4c6 DB/Creature: Fix even more creature templates 2014-04-30 07:19:40 +02:00
Aokromes
0e09e203fd DB/Creature: Fix even more creature templates 2014-04-30 06:50:05 +02:00
Aokromes
2a3945f0bf DB/Creature: Fix even more creature templates 2014-04-30 06:17:44 +02:00
Aokromes
9ea2e6e663 DB/Misc: Fix some incorrect triggers 
By dr-j, closes #11963
 2014-04-30 05:27:26 +02:00
Vincent-Michael
fb36d551d0 DB/Seasonal: 
* Added missing seasonal quest in game_event_seasonal_questrelation table
* Remove all event = 0 in character_queststatus_seasonal table
 2014-04-30 01:40:53 +02:00
Aokromes
073a57743a DB/Loot: Fix drops of Fragment of Val'anyr 
By dr-j, closes #11959.
 2014-04-29 21:58:16 +02:00
Vincent-Michael
3ce6a9d5cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.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/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.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/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.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_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
 2014-04-29 20:14:42 +02:00
untaught
1896b5cb59 DB/Gossip: Fix "Alchemist Pestlezugg <Alchemy Supplies>" gossip 
Closes #11958
 2014-04-29 17:01:45 +02:00
untaught
8c9199a9f7 DB/Gossip: Fix "Gyll <Gryphon Master>" Gossip 
Closes #11956
 2014-04-29 15:16:16 +02:00