Commit Graph
22893 Commits
Author SHA1 Message Date
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
jackpoz 720c3cbbd0 Core/Misc: Fix exploit
Fix exploit that allowed to duplicate stackable splitable items. If the item that cast the spell can't be found anymore, the spell is cancelled.

Fixes https://github.com/TrinityCore/TrinityCore/issues/11977
2014-05-03 21:22:12 +02:00
Vincent-Michael 13ec761ad2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.h
2014-05-03 20:23:44 +02:00
Aokromes d7b1405725 Merge pull request #11968 from Dehravor/cpp11
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
2014-05-03 19:25:36 +02:00
jackpoz b7a105bcc8 Merge pull request #11984 from Unholychick/patch-1
Core/Spells: Correct a mistake in HoT aura procs
2014-05-03 18:52:03 +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
Lucas 065207b1b8 Core/Spells: Correct a mistake in HOT aura procs
A crash fix was added in 3e0d2e4944
but the usage of spellProcEvent itself was incorrect, we should instead use spellProto of aura to be procced
2014-05-03 02:28:49 +02:00
Aokromes 0c8df80415 Core/Auth: Add support for build 13930 of china
By phoenixfight closes #11978
2014-05-03 02:11:37 +02:00
jackpoz 3e0d2e4944 Core/Misc: Fix static analysis issues 2014-05-02 23:21:37 +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
jackpoz 1be3a2bdf5 Merge pull request #11981 from Unholychick/patch-1
Core/Spells: Fix hots proccing wrong auras
2014-05-02 16:32:56 +02:00
Lucas 3e78578f27 Core/Spells: Fix hots proccing wrong auras
& Partly revert unnecessary changes in 1719e19572
2014-05-02 16:17:45 +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
Vincent-Michael 0faf4b1b24 Core/Text: Fix typo in 5caf6aad98 2014-05-01 21:59:19 +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
joschiwald 3ff9589c9a Core/Battleground: fixed possible crash in BattlegroundSA
Closes #11969
2014-05-01 15:14:42 +02:00
Dehravor cbd36d5a4e Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros 2014-05-01 11:19:32 +02:00
Vincent-Michael 824ee30b7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
2014-04-30 22:59:51 +02:00
Vincent-Michael 5caf6aad98 Core/Texts:
* Fix creautre text with gender female
* Small cleanUp
* ObjectMgr.cpp/ObjectMgr.h part from joschi
2014-04-30 22:15:28 +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
jackpoz f9a6aa5479 Merge pull request #11950 from Dehravor/override-final-delete
Core/Misc: Remove obsolete C++11 backward compatibility macros
2014-04-29 19:39:40 +02:00
untaught 1896b5cb59 DB/Gossip: Fix "Alchemist Pestlezugg <Alchemy Supplies>" gossip
Closes #11958
2014-04-29 17:01:45 +02:00
Dehravor 24ae6a6802 Core/Misc: Remove obsolete C++11 backward compatibility macros
OVERRIDE, FINAL, DELETE_MEMBER
2014-04-29 16:35:11 +02:00
untaught 8c9199a9f7 DB/Gossip: Fix "Gyll <Gryphon Master>" Gossip
Closes #11956
2014-04-29 15:16:16 +02:00
Vincent-Michael 796b77ca12 Scripts: Remove old script from azuregos 2014-04-29 14:17:30 +02:00
Vincent-Michael 0f049907d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-29 09:59:03 +02:00
Aokromes 414554aefa DB/Creature: Fix even more creature templates 2014-04-29 06:31:35 +02:00
Aokromes 40e8e541ac DB/Creature: Fix even more creature templates 2014-04-29 05:10:03 +02:00
Kinzcool 1d8aa0b6b1 DB/SlavePens: Corrected a lot of wrong Slave Pens spawns 2014-04-28 20:21:35 -04:00
Vincent-Michael 65ae868cc8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-04-28 23:00:41 +02:00
Vincent-Michael ba8959b733 Core/MSVC: Remove double warning disables 2014-04-28 22:44:56 +02:00
Vincent-Michael 4dfe3246fa Core: Fix warning 2014-04-28 22:32:01 +02:00
Aokromes 08060994a9 DB/Creature: Fix even more creature templates 2014-04-28 22:20:20 +02:00
Aokromes 54a4594a9c DB/Creature: Fix even more creature templates 2014-04-28 21:59:53 +02:00
Aokromes b0f319184f DB/Creature: Fix even more creature templates 2014-04-28 21:32:23 +02:00