Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,034 Commits 4 Branches 146 Tags
eb8e140f7f76e1fc8927017775c86aede1af47d7
Commit Graph

3887 Commits

Author SHA1 Message Date
Vincent-Michael
eb8e140f7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-31 18:01:28 +02:00
Dr-J
9253ff7cb7 Update CMakeLists.txt 2014-07-31 00:29:54 +01:00
Dr-J
5418844f15 Delete zone_eversong_woods.cpp 2014-07-31 00:24:08 +01:00
Dr-J
5b311690d1 Remove Script from zone_eversong_woods.cpp 
This cpp is now currently redundant
 2014-07-31 00:12:33 +01:00
Vincent-Michael
a917b6599f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
 2014-07-30 22:26:59 +02:00
Dr-J
3199f2ba90 Remove Script from zone_eversong_woods.cpp 
Remove Apprentice Mirvedas script from eversong woods cpp scripts as is not longer required.
 2014-07-30 13:45:42 +01:00
joschiwald
5f9e6db27c Scripts/OutdoorPvP: dropped redundand code 2014-07-30 03:15:15 +02:00
joschiwald
04bb78f6c3 Scripts/OutdoorPvP: replaced some chat texts with proper defense messages 2014-07-29 23:45:34 +02:00
Vincent-Michael
24a14979fe Scripts/BloodmystIsle: Fix StartUp Errors 2014-07-29 20:16:37 +02:00
Shauren
903fbb6be7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-29 02:02:38 +02:00
Dr-J
6a6351d98c Update razorfen_downs.cpp 2014-07-28 23:41:17 +01:00
Shauren
2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
 2014-07-27 20:59:22 +02:00
Vincent-Michael
55eafa247d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
 2014-07-27 12:09:32 +02:00
Subv
a03c879565 Core/PreparedStatements: Fixed a change I missed in the World prepared statements for waypoints. 2014-07-25 20:18:43 -05:00
Vincent-Michael
339574e2fd Core: Fix build 2014-07-24 18:44:10 +02:00
DDuarte
cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2014-07-24 17:10:21 +01:00
DDuarte
3de1714350 Scripts&DB/Feralas Convert npc_screecher_spirit to SAI 
SAI by @Rushor and gossip by @malcrom

Closes #12630
 2014-07-24 16:38:18 +01:00
untaught
3009bb4808 Scripts/Darkshore: Fix an issue with the quest Gyromast's Revenge 
TODO: Rewrite the script in SAI

Closes #11987

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 15:18:04 +01:00
untaught
e48c37cc10 Scripts/AreaTriggers: Fix an issue with an AT for the quest The Etymidian (Sholazar Waygate) 
Closes #12178

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 15:15:18 +01:00
Vincent-Michael
296956e06e Revert "Core/Spells: Death and Decay" 
This reverts commit 02d56e00bc.
 2014-07-24 16:14:25 +02:00
Ergar
40c5737200 Scripts/Karazhan: Boss Maiden of Virtue - rewrite to events and timer adjustments 
Closes #12513 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:58:39 +01:00
Trisjdc
f79e7d7640 Core/Spells: Unrelenting Assault shouldn't proc if the target isn't explicitly casting (turns out that UNIT_STATE_CASTING even a instant cast has a 'cast time') 2014-07-24 03:52:19 +01:00
DDuarte
73df8f8381 Scripts/IoC: Rename spell_gen_* spells to spell_ioc_* 
(Additions to 6bb63ab7db679d9c)

Closes #12414 (PR)
 2014-07-24 03:49:30 +01:00
karn
26496375f8 Script/IoC: Move some spell scripts from spell_generic to isle_of_conquest cpp 
Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:49:07 +01:00
Trisjdc
c541f4f5de Scripts/Four Horsemen: Horsemen's main spells should only explicitly target players 2014-07-24 03:48:35 +01:00
DDuarte
5193eaac87 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
 2014-07-24 03:35:19 +01:00
nelegalno
7524e2dfda Scripts/WesternPlaguelands: Fix conditions to show gossip of Myranda the Hag (In Dreams quest) 
Ref #7519

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:25:33 +01:00
Rushor
79c83dc4db Scripts/Feralas: Make Screecher Spirit disappear after clicking on them 
This is a temporary solution, the script should be rewritten in SAI

Closes #12298

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:25:32 +01:00
Foldy
9e81b23a57 Scripts/ICC: Summon Sealed Chest quest npc's upon the Lich King's Death 
TODO: template updates for these npcs and gossips

Closes #10554
Closes #12591 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 01:23:45 +01:00
Vincent-Michael
8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2014-07-23 06:32:44 +02:00
jackpoz
3388587b7a Core/Misc: Replace rand() calls with SFMT 2014-07-22 21:43:19 +02:00
DDuarte
059f3030b4 Core: Fix compile and a warning in spell_paladin 2014-07-22 14:38:37 +01:00
DDuarte
01d9681a4d Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/authserver/Realms/RealmList.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
 2014-07-22 13:15:36 +01:00
Duarte Duarte
1b6ac4ac3a Scripts/ICC: Fix non-pch build 2014-07-21 23:25:14 +01:00
Golrag
1a391e9fbd Scripts/ICC: Added Orange/Green Blight Residue 
Closes #5920
Closes #12464 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-21 03:11:55 +01:00
Vincent-Michael
4e29cf74b3 Scripts/EasternKingdoms: Burn with fire (hihi) 2014-07-20 19:44:26 +02:00
Vincent-Michael
e68d3b0937 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
 2014-07-20 03:06:03 +02:00
Vincent-Michael
0531f52008 Core: Fix non pch build (gcc) 2014-07-20 02:54:12 +02:00
karn
26aaf2384c Core/Creature: Minigob Manabonk 
Closes #11097

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-19 22:50:32 +01:00
Duarte Duarte
40b4bd2eda Merge pull request #12500 from MitchesD/misc_3 
Scripts/MagistersTerrace: reworked Selin Fireheart
 2014-07-19 22:03:58 +01:00
MitchesD
6fdcefee31 Scripts/MagistersTerrace: reworked Selin Fireheart 
* removed ancient code
* converted to EventMap
* removed illogical method in instance script
 2014-07-19 22:18:41 +02:00
joschiwald
35f5a78a43 Merge pull request #12166 from MitchesD/hor 
Scripts/HoR: fixed possible exploit with taunt during escape event
 2014-07-19 21:23:18 +02:00
MitchesD
35d508cd6d Scripts/HoR: fixed possible exploit with taunt during escape event 2014-07-19 21:05:59 +02:00
joschiwald
297e63da36 Scripts/AhnKahet: Elder Nadox 
* replaced egg core script with db content
* removed useless spellscript for Guardian Aura
* fixed Swarm aura
* Patch 3.3.2 (2010-01-02): Elder Nadox now only gets one Ahn'Kahar Guardian during the encounter.

Closes #12506
 2014-07-19 20:30:13 +02:00
Shauren
0bcc92d900 Part 3: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-19 17:03:32 +02:00
Shauren
2452cfb98e Part 2: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-19 15:26:06 +02:00
Shauren
909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-07-19 03:51:11 +02:00
Vincent-Michael
9a2d86f6ae Core/Spells: Fix Quest "The Emissary" 2014-07-19 02:43:15 +02:00
Shauren
7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00
leak
aedb824e99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-07-16 17:53:33 +02:00