Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,565 Commits 4 Branches 146 Tags
0591ee53b5d848009fd258f5b2f076a7ab045fa3
Commit Graph

11540 Commits

Author SHA1 Message Date
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
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
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
DDuarte
b3166030a0 Core/Group: Update enum GroupType 2014-09-12 02:15:14 +01:00
w1sht0l1v3
c4ce889344 Core/Misc: Kill few more warnings. 2014-09-12 00:16:04 +03:00
w1sht0l1v3
0392bf9bdf Core/Misc: Get rid of some warnings. 2014-09-11 23:08:02 +03:00
Vincent-Michael
dd687592ca Core: Fix typo in cec2cc806b 2014-09-11 21:54:10 +02:00
Dr-J
cec2cc806b a correction 2014-09-11 20:50:37 +01:00
Dr-J
4331c714d7 Remove a Gossip Script which is already in DB 
Remove script for Khadgar all of the gossip menus and options are already in db and this is only a gossip script, will deal with db stuff in next commit
 2014-09-11 20:46:00 +01:00
DDuarte
cc9aa9e4e7 Core/Groups: Send correct group member count in SMSG_REAL_GROUP_UPDATE 
Fixes the error of incorrect party size on joining arenas
 2014-09-11 17:24:25 +01:00
DDuarte
0f36199120 Core/Arenas: Correct values of enum ArenaTeamEvents 
Fixes "Internal guild error" message when a player joins an arena team
 2014-09-11 14:29:38 +01:00
MitchesD
1e3aa97098 Scripts/Misc: some small changes after recent commits 2014-09-11 15:22:30 +02:00
Nyeriah
b35edcabb6 Scripts/AV: Drekthar updated to EventMaps 2014-09-11 03:25:15 -03:00
Nyeriah
ce97e9194c Scripts/Gundrak: Eck the Ferocious updated to EventMap/BossAI 
- Moved his spawn handling to instance script
 2014-09-11 02:39:57 -03:00
DDuarte
92ff34fc6a Core/Net: Fix SMSG_CHAR_ENUM structure when player has no characters 2014-09-11 04:24:07 +01:00
DDuarte
a84bfc3807 Core/Groups: Handle CMSG_GROUP_REQUEST_JOIN_UPDATES & SMSG_REAL_GROUP_UPDATE 2014-09-11 04:02:37 +01:00
Takenbacon
e427ad6e41 Core/BGs&Arenas: Fix queing 
Closes #11551
 2014-09-11 04:02:36 +01:00
jackpoz
8bb4f33852 Core/DB: Fix crash on shutdown 
Fix race condition crash on shutdown, closing MySQL connections with queries still being executed
 2014-09-10 22:39:03 +02:00
Shauren
5f62f1b6d2 Core/Misc: Fixed build with intel compiler 2014-09-10 21:18:28 +02:00
Shauren
946e2d0ca6 Core/Authserver: Added missing auth socket manager 
Closes #13085
 2014-09-10 21:17:55 +02:00