Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 16:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,215 Commits 4 Branches 146 Tags
b1eb4e58fdf38a045fbb734c4e7f45b660e556fc
Commit Graph

6393 Commits

Author SHA1 Message Date
Vincent-Michael
21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren
4d260a54ae Core/Spells: Fixed warrior T10 4p dps bonus 
Closes #493
 2013-08-15 16:39:31 +02:00
Vincent-Michael
fd10e25813 Misc: Random changes here and there 2013-08-15 07:47:31 +02:00
Vincent-Michael
d823057ab8 Scriped/BaradinHold: Small cleanup in 595fcdee70 2013-08-14 19:50:47 +02:00
Vincent-Michael
595fcdee70 Scripted/BaradinHold: Add missing door for Alizabal 2013-08-14 19:48:53 +02:00
Vincent-Michael
11ecb9c633 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
 2013-08-14 16:52:13 +02:00
Vincent-Michael
c8b722e4a4 Scripted/BaradinHold: Implemented Occu'thar 2013-08-14 13:36:07 +02:00
Vincent-Michael
4c64e407b7 Core/Spells: Convert hunter "Improved Mend Pet" in spell script 
Closes #5597
Closes #9006
Closes #10346
 2013-08-11 19:23:21 +02:00
Vincent-Michael
f506ee3077 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
 2013-08-11 18:37:31 +02:00
Vincent-Michael
795e9327f7 Core/Spells: Fix hunter talent "Rapid Killing" 
Close #1166
 2013-08-11 18:19:17 +02:00
Nay
2abaf6224e Core/Player: Add debug log when SendCanTakeQuestResponse(INVALIDREASON_*) is used 
Intent is to find broken quest chains
Requested by Aokromes
 2013-08-11 16:36:36 +01:00
Vincent-Michael
9e45731f32 Scripted/ToC5: Add missing stuff in c0bf535e5b 2013-08-11 11:51:59 +02:00
Vincent-Michael
c0bf535e5b Core/Spells: Convert "Summon Memory" in spell script 2013-08-11 02:07:42 +02:00
Vincent-Michael
fa0aaa5fa4 Core/Spells: Some cleanup and missing stuff in a6eee516bd 2013-08-11 01:46:29 +02:00
Vincent-Michael
2e9547b4ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
 2013-08-11 00:27:54 +02:00
Vincent-Michael
a6eee516bd Core/Spells: Fix typo in 51a7f3408f (thx to Sar777) 2013-08-11 00:26:44 +02:00
Kirkhammett
0161012c69 Scripts/ZulFarrak: Convert Witch Doctor Zum'rah from SAI to Cpp 
Closes #10508
 2013-08-10 20:36:45 +01:00
Vincent-Michael
bb9614d00d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
 2013-08-10 17:58:53 +02:00
Vincent-Michael
8acefbff8c Scripted: Use now override for instance scripts 2013-08-10 17:42:12 +02:00
Discover-
488128bada DB/EAI: Fix unit_field changes, outdated since initial 3.x versions 2013-08-10 16:31:52 +01:00
Nay
b33f80aa18 Scripts/Pet: Fix non pch compile 2013-08-10 16:00:58 +01:00
Vincent-Michael
16b8bce334 Scripted: Fix more fail in ba6e62fd6e -.- 2013-08-10 16:55:59 +02:00
Vincent-Michael
dfd0575111 Scripted: Fix typo in ba6e62fd6e (thx to Shauren) 2013-08-10 16:49:38 +02:00
Vincent-Michael
ba6e62fd6e Scripted/BaradinHold: Implemented Pit Lord Argaloth 
Note: Need some update with sniff
 2013-08-10 16:35:06 +02:00
Vincent-Michael
2c6f5e1b61 Scripted: Remove Whitespace/Tabs 2013-08-09 20:37:09 +02:00
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