Commit Graph
15808 Commits
Author SHA1 Message Date
Warpten 0b72a91e76 Core/Hunters: Fixed focus power for pets.
Closes #8553.
2013-02-01 19:56:02 +01:00
Vincent_Michael 8350c088c7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-31 21:53:29 +01:00
Vincent_Michael 8e7806379d Core/Spells: Fix Gas Cloud Tracking stacking with other tracking spells 2013-01-31 19:59:44 +01:00
Spp 67d46ae1ae Scripts/Commands: Show correct guild Rank when using .pinfo command
(Corrections to 1b551cc1)
2013-01-31 09:18:42 +01:00
Gacko 0a9fbc6588 Script/ICC: Fix phase check in Saurfang script
... typos - typos everywhere. me->request(glasses);
2013-01-31 08:45:47 +01:00
Vincent_Michael 9a0525757a Core: Fix some warnings 2013-01-31 00:35:33 +01:00
Warpten a4b1f1c45f Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate. 2013-01-31 00:21:28 +01:00
Vincent_Michael 71a0cc1706 Core/Spells: Add missing break in f5fd7bad69
Thx Nayd
2013-01-31 00:18:27 +01:00
Vincent_Michael f5fd7bad69 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
2013-01-31 00:10:17 +01:00
Shauren 15e42ac797 Core/Players: Improvements to currency handling. 2013-01-30 20:40:02 +01:00
Gacko 754418a8de Script/ICC: Fix phase check in Saurfang script
Related to changes in dbecf05e39
2013-01-30 19:34:59 +01:00
Vincent_Michael 716c2db403 Core: Fix warnings 2013-01-30 19:09:09 +01:00
Gacko dbecf05e39 Core: Logical fixes and improvements in EventMap 2013-01-30 18:39:34 +01:00
Vincent_Michael 5a74336c5e Core: Fix non pch build 2013-01-30 18:24:29 +01:00
Vincent_Michael 8814d8c136 Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup 2013-01-30 18:06:19 +01:00
Spp 709129f222 Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
Conflicts:
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/Formulas.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Waypoints/WaypointManager.cpp
	src/server/game/Skills/SkillDiscovery.cpp
	src/server/game/Skills/SkillExtraItems.cpp
	src/server/game/Warden/WardenCheckMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
2013-01-30 11:57:02 +01:00
Spp 8cd408ae6c Core/Misc: Some changes to minimize differences with 4.3.4 branch 2013-01-30 10:34:18 +01:00
Spp c4e4cb1b5c Core/Misc: Remove using directive from header files (It will eventually lead to name collisions) 2013-01-30 09:06:19 +01:00
Spp 2c32393a39 Core/Misc: Always state what columns are affected by MySQL statements 2013-01-30 08:42:01 +01:00
Spp fa5dd4bd4e Core/Misc: Remove some calls to const_cast 2013-01-30 08:39:06 +01:00
Shocker b427068c39 Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless and Cataclysmic Gladiator).
Also remove some unused outdated defines

WARNING! Run the SQL query before you start your emulator because it will reset all titles on login otherwise
2013-01-30 07:05:19 +02:00
Nay 92d92df809 Core/Object: Re-add a line that somehow got removed in a merge
Thanks Warpten for noticing
2013-01-30 01:33:12 +00:00
Souler d92347bc22 Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new one
Closes #8433
2013-01-29 15:10:47 +00:00
Nay 4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
Nay 1b180e683e Core&DB/Trainers: Remove trainer_spell from creature_template since it is not longer necessary on Cata 2013-01-29 02:25:24 +00:00
Gacko 29cd1dbec1 Core/Quest: Bloody Breakout
Closes #641
2013-01-28 19:50:01 +01:00
Nay 112c2a8dd0 Core/Misc: Fix a merge failure in SpellAuraEffects.cpp
Thanks Tuxity and Vincent
2013-01-28 12:53:51 +00:00
Nay 98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge
There are probably other merge issues that got through, please report them
2013-01-28 02:54:27 +00:00
Nay b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.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_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2013-01-28 01:04:37 +00:00
Shauren 6e80357f8e Core/Authserver: Added possibility to allow realm connections both from "world" and local networks. 2013-01-27 17:33:01 +01:00
Shauren e1d12de2b1 Core/Battlegrounds: Fixed arena scoreboards not showing all players. 2013-01-27 11:56:56 +01:00
Nay 1b551cc157 Scripts/Commands: Add guild info to .pinfo
Original patch by @secharles, modified

Closes #8946
2013-01-26 21:33:13 +00:00
Vincent_Michael ceed5ea42f Scripts/Icecrown Citadel: Fix warning 2013-01-26 19:57:11 +01:00
Vincent_Michael 480c847156 Core: Some cosmetic changes 2013-01-26 19:49:53 +01:00
Nay 18f5de77c3 Core/GossipDef: Fix a build error from 9812afe08b
*slaps MrSmite*
2013-01-26 17:48:47 +00:00
Nay 9812afe08b Merge pull request #9063 from MrSmite/QuestLevelsInUi
Option to show quest levels in dialogs
2013-01-26 09:23:58 -08:00
w1sht0l1v3 f0800d3926 Scripts/ShadowmoonValley: Fixup script for Lord Illidan Stormrage quest to be doable.
Notice: this whole script needs a proper rewrite(contains wrong Illidan npc id,bad dialogues,etc).
2013-01-26 19:19:55 +02:00
Shauren a3d07b5e6a Core/Spells: Fixed Darkflight, Two Forms and Running Wild for worgens.
Closes #8905
2013-01-26 13:25:06 +01:00
MrSmite a45f7fd878 Adds CONF option to show quest levels in dialogs.
Example: [13] Westfall Stew

Default = 0 (off). Make sure to set UI.ShowQuestLevelsInDialogs to 1 to turn it on

NOTES:

* DO NOT supply the quest level when using commands such as .lookup quest, it
is not actually part of the title (even though it will be printed in the result)

* Also adds the level in the quest tracker and quest log

* If locale is used, the level is added after the proper title is looked up

* LUA Mods that offer this feature do not work properly with TC, most will not put the level in all dialogs. Users who have such mods should disable the mod's feature or they may see the quest level listed twice.

Example: [13][13] Westfall Stew
2013-01-25 21:47:07 -05:00
WishToDie 1348e4e44d Fix Typo. 2013-01-26 00:57:10 +02:00
w1sht0l1v3 6acfa49065 Script/Commands: Implement command to list the members of a group/party. 2013-01-26 00:41:46 +02:00
Machiavelli 61495d18a3 Core/Log: Fix crash due to uninitialized variable 2013-01-25 21:40:21 +01:00
thomas33 c36aa6e7af fix typo 2013-01-25 12:25:06 +01:00
Shauren 705d0c8865 Scripts/Icecrown Citadel: Fixed possible crash with Bone Spike Graveyard
Closes #7171
2013-01-24 22:51:42 +01:00
Shauren 1c7ade5e54 Scripts/Icecrown Citadel: Fixed Deathbringer Saurfang's Blood Power scaling on first attempt.
Closes #3283
2013-01-24 22:46:45 +01:00
Spp 0d3cc3ae3a Core/Log: Fix console colors (missing change from 53a3373)
Closes #9051
2013-01-24 21:52:29 +01:00
Nay a3c9e67731 Merge pull request #8953 from MrSmite/PetAI_PassiveCastFix
Fix passive pets not using spells when commanded to attack
2013-01-24 08:55:31 -08:00
Nay c757d24c5a Merge pull request #8978 from Naios/sai_timed_cond
Core/SmartScripts: Check Conditions also for timed Events
2013-01-24 08:50:51 -08:00
Shauren bf0c976f76 Core/Players: Fixed uninitialized variable for item swaps 2013-01-24 17:23:34 +01:00
Spp 53a3373a98 Core/Logging: Fix all possible crashes when using bad Appender config settings 2013-01-24 16:57:35 +01:00