Commit Graph
16442 Commits
Author SHA1 Message Date
Vincent-Michael 87d9d1d705 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.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/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.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_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.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_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/zone_dalaran.cpp
	src/server/scripts/Spells/spell_pet.cpp
	src/server/scripts/Spells/spell_shaman.cpp
2013-06-13 19:35:01 +02:00
Vincent-Michael 1c9a3d5621 Scripted/Quest: Fix codestyle in 4065a8509f 2013-06-13 18:37:59 +02:00
Malcrom 8fb1e4e06c Scripting: Minor visual script fix. 2013-06-13 12:41:34 -02:30
Trinity 5a7d74ce87 Fix warning 2013-06-13 14:58:07 +02:00
Pitcrawler ca100a30f0 DB/Quests: Fix Convocation at Zul'Heb, closes #9122 2013-06-13 12:44:07 +02:00
Malcrom 4065a8509f Script: Add scripting for Quest A Blade Fit For A Champion
Still need pooled spawning for entry 33224. Aokromes has info if someone wants to do it.
2013-06-13 00:50:21 -02:30
Pitcrawler 2f771d4950 DB/Quests: Fix Badlands Reagent Run II, closes #9880
Thanks @joschiwald and @Kirkhammett
2013-06-12 21:15:17 +02:00
Vincent-Michael 3a7a681319 Core/Gossip: Add missing check for only class trainers in 46374bf533 2013-06-12 17:16:13 +02:00
Spp a54244fb2d Fix compile 2013-06-12 14:16:51 +02:00
Malcrom 4096c54efa Core: More Function name updates 2013-06-11 22:02:00 -02:30
Malcrom ec474a62e5 Core: More Function Renaming. 2013-06-11 21:25:12 -02:30
Malcrom 66978cfc3b Core: Some function renaming. 2013-06-11 19:54:27 -02:30
Vincent-Michael 46374bf533 Core/Gossip: Add log for GOSSIP_OPTION_TRAINER for missing conditions 2013-06-12 00:09:10 +02:00
Malcrom 047608e7de Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet(). 2013-06-11 18:39:51 -02:30
Vincent-Michael 0bebf40fe7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp
2013-06-11 22:07:11 +02:00
Shauren 9ec22fffa0 Core/Objects: Object scale will now also affect bounding radius and combat reach fields 2013-06-11 17:28:16 +02:00
Shauren ef15fe8ed2 Core/Instances: Fixed a bug that caused switching group leader inside active instance to cause players not being saved when a boss was killed.
Closes #5109
2013-06-11 15:50:08 +02:00
Shauren e824cbff6c Merge pull request #9984 from Rochet2/master
Core/Scripts: Added missing call for OnQuestComplete and cleared up argument name in OnLevelChanged
2013-06-10 13:56:29 -07:00
kaelima 1455a08906 Core/Auctionhouse: Fix crash when reloading AH items
- Removed a really strange comment
2013-06-10 12:47:01 +02:00
Warpten 2a62e70795 Core/Movement: Fixed player death caused by MSG_MOVE_STOP_PITCH.
Loopings, yay!
2013-06-10 12:41:04 +02:00
Rochet2 a51cd86628 Quest Complete, OnLevelChanged 2013-06-10 13:23:30 +03:00
w1sht0l1v3 5f33bfb925 Core/Scripts: Fix Drake Hunt, closes #2005 2013-06-09 22:14:20 +03:00
Pitcrawler fb28dcb3c4 DB/Quests: Fix The Explorer's League Outpost
Move a corescript to SAI
2013-06-09 18:10:03 +02:00
Shauren f8d9a8d2e9 Core/Spells: Fixed fishing broken in a recent commit 2013-06-08 23:11:18 +02:00
Vincent-Michael cd24f8521c Core/Gossip: Revert unlearn and dual spec gossip stuff in c238cae7d0 2013-06-08 20:51:39 +02:00
Pitcrawler 368e3c17a1 Core/Scripts: Simplify spellscript from 1f785905d5 2013-06-08 19:30:40 +02:00
Pitcrawler 1f785905d5 DB/Quests: Fix Danger! Explosives!, closes #6850 closes #9458 2013-06-08 16:21:24 +02:00
Warpten 732a58c57c Core/Guilds: Fixed Guild XP per day cap. 2013-06-07 22:33:46 +03:00
Shauren c3c66060f6 Core/Auras: Implemented SPELL_AURA_MOD_SPELL_CATEGORY_COOLDOWN 2013-06-07 20:35:30 +02:00
Shauren 3f5276501d Core/Spells: Fixed category cooldowns 2013-06-07 18:31:31 +02:00
Shauren 5254e5ead1 Core/PacketIO: Send item create object blocks only to their owner 2013-06-07 17:50:39 +02:00
Shauren 0e2053fb4b Core/PacketIO: Enabled CMSG_REQUEST_VEHICLE_SWITCH_SEAT and fixed client crashes when moving on vehicles
Closes #9622
2013-06-07 17:47:29 +02:00
Shauren b77d6f50dc Core/PacketIO: Fixed structure of SMSG_UPDATE_OBJECT CreateObject block for objects on transports/vehicles 2013-06-07 16:17:24 +02:00
Shauren bd6ea751c0 Core/Auras: Fixed SPELL_AURA_CAST_WHILE_WALKING 2013-06-07 16:08:09 +02:00
Shauren 88bbff2236 Core/Creatures
* Refactored setting movement flags into separate method
* Falling creatures are no longer treated as flying for movement flag setting purposes
2013-06-07 16:05:39 +02:00
Shauren e21b94c25c Core/Maps: Fixed Map::IsInWater returning true at any height above water 2013-06-07 16:00:44 +02:00
Shauren 5b17964e9d Core: Fixed compile without PCH 2013-06-05 15:00:43 +02:00
corbi e185713464 Stats Limits 2013-06-05 10:34:05 +03:00
Ascathor 3e985c636d Core/Conditions: Adding more information to the invalid quest condition log error 2013-06-04 17:52:32 +02:00
Shauren eed1286a8c Core/Vehicles: Handle vehicle seat switches through aura effects. 2013-06-04 16:28:30 +02:00
Shauren cbd69f12bd Core/Movement: Refactored removing transport part of movement info structure into a separate method. Also corrects seat set after exiting vehicle 2013-06-04 14:52:38 +02:00
Malcrom a8d1fafa0a Scripting: fix gossip scripting for rogue trainers 2013-06-03 23:31:20 -02:30
Malcrom c238cae7d0 Core: Remove some no longer needed gossip code. 2013-06-03 22:33:26 -02:30
Vincent-Michael 872c0c9c73 Core Whitespace cleanup 2013-06-03 20:37:59 +02:00
Vincent-Michael efb4fb4959 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
2013-06-03 18:19:18 +02:00
Vincent-Michael f6c1a9a8c4 Core: Fix warning 2013-06-03 18:04:42 +02:00
Shauren 6fed4f1f2f Core/Players: Fixed talent specialization spells not being saved to database 2013-06-03 13:34:33 +02:00
Subv 1d1bb84cf9 Merge pull request #9854 from Ascathor/master
Core/Command: Optimized .pinfo more
2013-06-02 17:52:27 -07:00
Vincent-Michael 216827201e Script/Ulduar: Fix try for Assembly Of Iron achievement "I choose you, xxx" 2013-06-02 23:16:18 +02:00
joschiwald 3e108f0680 DB/Autobroadcast: Update correct db struktur and auth base 2013-06-02 19:41:27 +02:00