Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36: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
Vincent-Michael
a6d2faf163 Core: Fix build 
(cherry picked from commit 81daef8b22)
 2013-08-09 19:28:47 +01:00
Vincent-Michael
81daef8b22 Core: Fix build 2013-08-09 20:23:49 +02:00
Vincent-Michael
99aa4649d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/CMakeLists.txt
 2013-08-09 20:02:21 +02:00
Vincent-Michael
8aff3945f2 Scripted: Fix non pch build 2013-08-09 20:00:18 +02:00
Vincent-Michael
dbb40dd4fe Scripted/Pets: Move some player pets in pet_xxx.cpp 2013-08-09 19:22:16 +02:00
untaught
92fdb7aed1 DB/SAI: Fix quest Jormuttar is Soo Fat... 
Scripts/Spells: Script spell Bear Flank Master

Closes #10484
 2013-08-09 12:55:26 +01:00
Vincent-Michael
80d7c093eb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-08 20:56:27 +02:00
MitchesD
8f50e30904 Scripts/DrakTharonKeep: update Trollgore 
Closes #10453

Signed-off-by: joschiwald <joschiwald@online.de>
 2013-08-08 00:25:53 +02:00
Malcrom
090f348d59 Scripting/Sethekk Halls: Move Boss Anzu from EAI to CPP and some cleanup. 2013-08-07 18:53:17 -02:30
Vincent-Michael
2daa8ed56f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-08-07 20:07:05 +02:00
Vincent-Michael
1e8fd6489d Core: Fix non pch build 2013-08-07 18:44:23 +02:00
joschiwald
0667e89005 Scripts/DrakTharonKeep: add some spellscripts, add yells to novos, and do some cosmetic changes 2013-08-07 17:31:36 +02:00
Malcrom
f4815fbf80 Scripting/Mana Tombs: Move Yor scripting from EAI to CPP. 2013-08-07 11:42:13 -02:30
Malcrom
f5e4fd67c3 Scripting: Moved Lord Valthalak from EAI to CPP. Moved all Blackrock Instances to Blackrock Mountain Dir. 2013-08-07 10:50:06 -02:30
Vincent-Michael
c0fc0f237f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/shared/DataStores/DBCFileLoader.h
 2013-08-07 11:59:51 +02:00
Spp
33f8c3ead4 Core/Battleground: Get rid of dinamic casts BattlegroundXX outside Battleground scope by implementing generic functions (2/2) 
- CheckAchievementCriteriaMeet
 2013-08-07 11:13:53 +02:00
Spp
b05665660a Core/Battleground: Get rid of dinamic casts BattlegroundXX outside Battleground scope by implementing generic functions (1/2) 
- HandleQuestComplete, CanActivateGO and IsSpellAllowed
 2013-08-07 10:31:13 +02:00
Kirkhammett
c8bfb9cf4d DB&Scripts/Icecrown: Fix quest The Last Line Of Defense and script Argent Cannons 
Closes #998
Closes #10460
 2013-08-06 23:16:03 +01:00
Vincent-Michael
75e6c40630 Core/Misc: Rename some no name enums 2013-08-06 21:16:05 +02:00
Vincent-Michael
0c96062687 Scripted/Kezan: Fix warnings 2013-08-06 20:32:15 +02:00
Vincent-Michael
5af9056050 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-06 20:25:36 +02:00
snakeice
75b4b0594f Scripts/HoR: Major changes: 
- Fixed Intro timers
- Fixed mobs aggro
- Fixed General's shield trow
- Added Jaina / Sylvannas / Lich King escape event

Closes #10303
Closes #2505
Closes #9865
 2013-08-06 19:05:47 +01:00
Nay
e139c1e9af Scripts/Kezan: Fix a typo (build) 2013-08-06 17:32:30 +01:00
Nay
1bf1f95a8e Merge pull request #10455 from Discover-/Battleground-Reinterpret-Casts 
Core/Misc: Implement reinterpret casts for all battleground classes and ...
 2013-08-06 08:31:59 -07:00
Ukulutl
df9f34cde7 Scripts/Kezan: Fix quest "Good Help is Hard to Find" 
Added Maelstorm to scriptloader

Close #10337

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-08-06 13:18:58 +01:00
Nay
3995a55b2d Merge pull request #10282 from NorthStrider/4.3.4 
Scripts/ICC: fixed the frozen throne model display
 2013-08-06 04:53:34 -07:00
Discover-
7f744de746 Core/Misc: Implement reinterpret casts for all battleground classes and use them. 2013-08-06 13:26:52 +02:00
Vincent-Michael
820f002135 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/scripts/Commands/cs_reload.cpp
 2013-08-06 10:03:44 +02:00
Nay
a71fcee27d DB/Schema: Rename _questrelation tables to _queststarter and _involvedrelation to _questender, for creature and gameobject 2013-08-06 00:04:29 +01:00
Vincent-Michael
2f3388828b Scripts/Commands: Fix compile (v3) 2013-08-06 00:40:14 +02:00
Nay
2bd4049890 Scripts/Commands: Fix compile (v2) 2013-08-05 22:55:06 +01:00
Nay
df6e66555b Scripts/Commands: Fix compile 2013-08-05 22:41:37 +01:00
Vincent-Michael
2d3fd62aee Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_npc.cpp
 2013-08-05 21:15:35 +02:00
Vincent-Michael
d24bb958da Core: Random changes 2013-08-05 21:13:20 +02:00
Vincent-Michael
f37d0495e1 Core/Commands: Add .npc info more infos for unit_flags 2013-08-05 20:13:04 +02:00
Vincent-Michael
38cddb42ae Core/Commands: Add .npc info mechanicImmuneMask infos 2013-08-05 20:13:04 +02:00
Vincent-Michael
341dabb423 Core/Commands: Add .npc info more infos for unit_flags 2013-08-05 14:51:42 +02:00
Vincent-Michael
cfe4154376 Core/Commands: Add .npc info mechanicImmuneMask infos 2013-08-04 19:33:42 +02:00
Vincent-Michael
39cce3344c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 2013-08-02 14:41:33 +02:00
Shauren
5ae86ee2a8 Fixed compile 2013-08-01 22:22:39 +02:00
Vincent-Michael
26d090fa9a Core/Spells: Fix druid talent "Nature's Grace" 2013-08-01 22:02:14 +02:00
Shauren
ac10589eda Core/Misc: Fixed some issues found by Coverity Scan 2013-08-01 21:31:11 +02:00
Shauren
3814bbdd46 Core/Misc: Fixed compile warnings 2013-08-01 18:03:48 +02:00
Vincent-Michael
b8b21ce1f8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-01 17:22:42 +02:00
Vincent-Michael
a71341bbcf Core/Spells: Fix rogue talent "Overkill" (thx to @timh52280) 
Close #10411
 2013-08-01 17:22:03 +02:00
Vincent-Michael
bab04cc5f8 Core/Spells: Fix try for logic fail in 4ba3c2e51d 2013-07-30 23:59:30 +02:00
Vincent-Michael
d50eafad6d Core/Spells: Fix hunter "Cobra Shot" 2013-07-30 21:54:16 +02:00
joschiwald
0d0baf004d Scripts/DrakTharonKeep: fix copy paste fail 
Closes #10402
 2013-07-30 15:46:56 +02:00
Nay
b21fe684c1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellMgr.cpp
 2013-07-30 14:14:22 +01:00
Nay
394b2c6845 Scripts/OnyxiasLair: Fix a crash in boss_onyxia 
Closes #10393

Note: this just fixes the crash, not the issues the script has (a.k.a rewrite this)
 2013-07-29 21:46:49 +01:00