Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,952 Commits 4 Branches 146 Tags
d8861342a3a526b94de42fe4f8b7c726d12f509a
Commit Graph

4768 Commits

Author SHA1 Message Date
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
Vincent-Michael
13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
 2014-07-14 21:01:55 +02:00
Vincent-Michael
6dba04c0cc Scripts/Commands: Fix warnings vs2014 ctp (no support) 2014-07-14 10:53:49 +02:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Vincent-Michael
0f5c481cd4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
 2014-07-12 18:08:30 +02:00
Shauren
6d8dbb5c4a Core/Misc: Renamed a few spell and skill line related methods to follow tc coding standards 2014-07-12 17:28:35 +02:00
Shauren
d91964912e Core/Skills: Fixed spells automatically learned from skill lines adding more skill lines 2014-07-12 17:27:26 +02:00
Vincent-Michael
3f0ce25d5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-12 05:09:46 +02:00
Shauren
de82146df8 Core/Commands: Fixed crashes caused by using .account lock ip and .account lock country commands from console - these commands apply to currently logged account so they cannot be used from console 2014-07-12 01:17:46 +02:00
Vincent-Michael
1bc482d3d6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-07-12 00:24:23 +02:00
Vincent-Michael
00a8a9ebb4 Core: Fix warnings with other way 2014-07-11 21:50:49 +02:00
Vincent-Michael
c8e75073bf Scripts/Misc: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:24:55 +02:00
Vincent-Michael
29e0538624 Core: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:08:35 +02:00
Vincent-Michael
b62ee5eea2 Scripts/BlackTemplate: Fix warnings vs2014 ctp (no support) 2014-07-11 19:42:20 +02:00
Vincent-Michael
6797d78c1b Scripts/Misc: Added missing break in 495ca8c2dc (thx to @ccrs) 2014-07-11 17:36:52 +02:00
Vincent-Michael
4f619eb937 Core/LFG: Fix warning with vs2014 ctp (no support) 2014-07-11 17:04:01 +02:00
Vincent-Michael
495ca8c2dc Scripts/Misc: Fix some warnings with vs2014 ctp (no support) 2014-07-11 16:39:44 +02:00
Vincent-Michael
79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
 2014-07-09 21:09:47 +02:00
joschiwald
7a67d816d9 Core/Battleground: 
* added a possibility to reload battleground templates
* cleaned up the template structure
* use mapids from BattlemasterList.dbc to calculate random bg
 2014-07-09 16:43:56 +02:00
Aokromes
900fb17229 Merge pull request #12417 from gerripeach/remove_old_boss 
Core/Scripts: Remove script from old boss
 2014-07-09 08:36:58 +02:00
Vincent-Michael
7462fa63fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 00:14:53 +02:00
Vincent-Michael
ba2563da5a Core/Spells: Convert "Shaman T10 Elemental 2P Bonus" in spell script 2014-07-07 21:50:18 +02:00