Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,570 Commits 4 Branches 146 Tags
60eafebbcb425ee2bb25dd5b14fcaa349c86210f
Commit Graph

24570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9b363e10d7 SQL: Fix sql import 2014-09-13 23:23:58 +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
Vincent-Michael
c7639ca6a1 SQL: Fix travis build 2014-09-13 11:52:03 +02:00
Dr-J
8bb086ef23 DB/Misc: Fix visual appearance for some quest flight paths 
Fix appearance of player when taking flight for As the Crow Flies and Spiritual Insight

Link the spells which give transform (Stormcrow Shape for As the Crow Flies and Spiritual Insight for Spiritual Insight

Script to remove this at end of path, the zangarmarsh one lasts about 5 seconds longer than flight path, but the dragonblight one has 1 min left at end so needed to remove that,

Also dont know if anyone can think of a way of how to this but during as the crow flies the player is meant to receive a few whispers from ysiel during the flight path,

If you search spell_dbc for as the crow flies you will find there are a number of auras with name as the crow flies whisper aura with different effect msic values and different durations ranging from 3 to 467 I have a feeling these are meant to trigger the whispers when the auras expire think the values in effectvaluemisc2 maybe event ids.
 2014-09-13 03:32:10 +01:00
DDuarte
073221c395 SQL: Update /dev/world_database.sql 
Forgotten change of 27479cf571
 2014-09-13 02:57: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
Dr-J
aceec68325 DB/Quest: The Demoniac Scryer 
Closes # 2610

Script for http://www.wowhead.com/quest=10838/the-demoniac-scryer
 2014-09-12 21:59:56 +01: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
Aokromes
4d48d0eea7 DB/Gameobject: Allow to target 2 gameobjects 
Closes  #13093, closes #13094
 2014-09-12 19:57:59 +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
Dr-J
f6b05f0e60 DB/Misc: Couple more fixes 
closes #13112
closes #13115
 2014-09-12 13:44:43 +01: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
Dr-J
ca604cd86a DB/Misc: Random fixes/error fixes 2014-09-12 01:01:46 +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