Commit Graph

21898 Commits

Author SHA1 Message Date
Nyeriah
66c90122ec Scripts/OnyxiaLair:
- Potential null pointer crash fix
- Reset react state properly on wipes during air phase
2014-09-14 12:16:07 -03:00
Malcrom
14367ca8c0 Scripting/Stand spell: Remove UNIT_FIELD_FLAGS change from spell script. 2014-09-14 12:37:04 -02:30
Shauren
2a1a294383 Scripts/Commands: Fixed build with -DSCRIPTS=0 2014-09-14 16:54:21 +02:00
jackpoz
16f0f05d44 Core/Misc: Fix issues reported by static analysis 2014-09-14 16:34:15 +02:00
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
DDuarte
2e026fab0d Tools/Extractors: Add new locales: ptBR, ptPT and itIT 2014-09-14 15:12:31 +01:00
DDuarte
a432bc7168 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-14 14:56:35 +01:00
Malcrom
716c2918d2 Scripting/Spell Stand: Move this spell to spells generic. 2014-09-14 11:15:25 -02:30
horn
cd2f8412e5 Core/Groups: Fix setting the group roles and Role Check feature 2014-09-14 12:06:00 +02:00
Vincent-Michael
a91e0eed80 Core/DBC: Fix typo 2014-09-14 05:06:00 +02:00
Subv
af877867bf Core/Quests: Fixed an issue with self-completing quests. 2014-09-13 17:57:42 -05:00
Subv
60eafebbcb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/QuestHandler.cpp
2014-09-13 16:50:09 -05:00
Sebastian Valle Herrera
1e5f269d7d Core/Quests: Don't display a message if the player doesn't meet the requirements for the next (automatic) quest in a chain. 2014-09-13 16:40:52 -05:00
Vincent-Michael
3b0617ec45 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-13 23:29:43 +02:00
Vincent-Michael
5af2be7468 Scripts/Misc: Fix issues reported by static analysis 2014-09-13 23:15:00 +02:00
Vincent-Michael
0591ee53b5 Core/Misc: Fix merge fail 2014-09-13 22:59:28 +02:00
Vincent-Michael
ca3961f987 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
2014-09-13 22:38:25 +02:00
MitchesD
d9fdbb06e4 Scripts/CoS: Salarmm rewritten to BossAI/EventMap 2014-09-13 21:39:26 +02:00
joschiwald
59baaeec48 Core/Chat: cleanup MonsterText methods 2014-09-13 20:41:31 +02:00
Vincent-Michael
11bb300c69 Script/CoS: Fix quest credit for mal ganis (but @Aokromes like more HACKS) 2014-09-13 19:14:32 +02:00
Nyeriah
e746e8685c Scripts/UtigardePinnacle: Use a generic spell to calculate the damage for Dark Slash instead
Thanks to @Vincent_Michael for the heads up
2014-09-13 11:10:33 -03:00
ShinDarth
524788712a Core/BGs: Correct GetUniqueBracketId() for 4.3.4 2014-09-13 14:41:43 +01:00
Nyeriah
12e405bedd Scripts/UtgardePinnacle: King Ymiron
- Updated to EventMaps
- Replaced manual summons with proper spells
- Fixed glitch where boss would resume fight/run back to his main target before the ancestor summon roleplay was over (it might still need few adjustments i.e fire on boat is currently missing)
- Implemented damage calculation for spell Dark Slash (http://www.wowhead.com/spell=48292) as previously the spell would do no damage and it's BasePoints is 0
2014-09-13 10:33:51 -03:00
ccrs
05aa0d51b1 Core/Units: Take into account HoverHeight in IsWithinMeleeRange
Fixes #12059
Closes #13104
2014-09-13 14:06:37 +01:00
DDuarte
b9b2a87d42 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-13 13:55:17 +01:00
ShinDarth
dbbc5bfb50 Core/BG: use new GetUniqueBracketID() method to store statistics
Closes #13122
2014-09-13 13:54:05 +01:00
DDuarte
27479cf571 Core/Scripts: Nuke db_script_string table and make SCRIPT_COMMAND_TALK with broadcast_text instead
Original code by @Ascathor with modifications
Closes #13092
2014-09-13 02:45:51 +01:00
Shauren
ce67a097bf Core/Entities: Use new PackedGuid class 2014-09-13 01:12:16 +02:00
jackpoz
f5a3913d95 Core/Misc: Refactor scripts to fix static analysis warnings
Fifth batch of fixes targeting 100 issues reported by Coverity
2014-09-13 00:01:34 +02:00
Shauren
2fc52b5af6 Core/Entities: Added ObjectGuid class from MaNGOS 2014-09-12 23:49:30 +02:00
Subv
08bbe41ded Core/Quests: Fixed what appears to be a merge error, only prompt the player to take the next quest in a chain if he meets the conditions. 2014-09-12 15:27:06 -05:00
Shauren
e6032a5e75 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-09-12 22:11:14 +02:00
Shauren
ee0df6aa86 Core/NetworkIO: Applied 4.3.4 changes to "new" network code 2014-09-12 22:09:07 +02:00
Shauren
de4aea093b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Server/WorldSocket.h
2014-09-12 20:27:46 +02:00
Shauren
7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp
2014-09-12 20:26:46 +02:00
Shauren
b3f7210f4d Core/WorldSocket: Refactored client packet header check 2014-09-12 20:25:13 +02:00
Shauren
8f5ae1fb90 Core/Misc: Added const modifier to MessageBuffer::Write parameter 2014-09-12 20:20:35 +02:00
Vincent-Michael
d88f71cd4c Core: Fix warning 2014-09-12 19:56:17 +02:00
Vincent-Michael
53ee1eff0b Core: Fix warning 2014-09-12 19:51:29 +02:00
Shauren
6dff6b7425 Core/NetworkIO: Set non blocking mode on sockets properly 2014-09-12 19:34:26 +02:00
DDuarte
dcba0106d6 Core/Skills: Fix rogue's lock picking
Fixes #12677
Closes #13111
2014-09-12 18:11:19 +01:00
Subv
b7865a3eb5 Core/Quests: Only prompt the player to take the next quest in a chain if he meets the conditions for that quest. 2014-09-12 11:32:50 -05:00
Malcrom
be8111b0a2 Scripting: Felwood: A little cleanup to my previous commit 2014-09-12 12:40:58 -02:30
Malcrom
43597c4474 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-09-12 12:20:37 -02:30
Malcrom
6686c952b5 Scripting/Felwood: And some quest spells for quest 27989 & 27995 2014-09-12 12:13:38 -02:30
MitchesD
d7b0ee7c03 Merge pull request #12927 from MitchesD/misc_3
Scripts/CoS: implemented Infinite Corruptor, improvements in instance sc...
2014-09-12 15:25:07 +02:00
Dr-J
4e25304a66 Remove mount vendor cpp script 2014-09-12 13:48:51 +01:00
MitchesD
cc00d2f181 Scripts/CoS: implemented Infinite Corruptor, improvements in instance script and Meathook converted to BossAI
Guardian of Time should have some text, but I have not found anything in sniff. Also the whole event needs to be rewritten and improved.
2014-09-12 14:46:41 +02:00
DDuarte
d60beaccf6 Misc/Config: Update CharacterCreating.Disabled.RaceMask
Ref #13110
2014-09-12 13:21:07 +01:00
DDuarte
1d166d07bc Misc/Config: Update CharacterCreating.Disabled.RaceMask
Fixes  #1311
2014-09-12 04:08:58 +01:00