Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,609 Commits 4 Branches 146 Tags
177ecd6dace5622e207b407b23aea537d6c3a4aa
Commit Graph

2988 Commits

Author SHA1 Message Date
Vincent-Michael
177ecd6dac Core/Spells: Convert/Update some warlock spells in spell scripts for 4.3.4 2013-07-18 00:45:13 +02:00
Vincent-Michael
63675c3b0b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-07-17 20:24:29 +02:00
Vincent-Michael
4ba3c2e51d Misc: Some cleanup 2013-07-17 19:42:15 +02:00
Malcrom
8cec422c05 DB/Gossip: Add some missing gossip. 2013-07-17 06:12:20 -02:30
Malcrom
8462a09264 DB/Gossip: Added missing gossip for Royal Historian Archesonus. Removed cpp script. 2013-07-16 21:42:40 -02:30
Vincent-Michael
187878f9c4 Core/Spells: Update warrior/utgarde keep "Second Wind" for 4.3.4 2013-07-17 00:42:46 +02:00
Nay
8edbc2152e Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/zone_the_barrens.cpp
 2013-07-16 14:42:38 +01:00
Malcrom
bd3fa71d32 DB/Gossip: Add and fix a few more gossip menus. 2013-07-15 19:57:18 -02:30
Malcrom
53e5075005 Scripting/Black Fathom Deeps: Fixed script to use proper spell. 2013-07-15 15:15:23 -02:30
Malcrom
cff725982d DB/Gossip: Added gossip for Morridune. 2013-07-15 14:53:20 -02:30
Malcrom
9e91219cd3 DB/Gossip: Add missing gossip for Sputtervalve. Moved all scripting to SAI. 2013-07-15 13:51:51 -02:30
Vincent-Michael
56bd42dcf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 2013-07-15 18:04:04 +02:00
Vincent-Michael
7104e3c70f Core: Fix build 2013-07-15 17:44:32 +02:00
Shauren
779a59e7e2 Core/Config: Refactored ConfigMgr 
* Loading initial configuration files is now separate from loading any additional custom configs
 2013-07-15 17:31:44 +02:00
Vincent-Michael
de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Vincent-Michael
baeecba6c9 Core: Fix build 2013-07-15 01:07:02 +02:00
Vincent-Michael
08c1a81096 Scripted/Misc: Fix random stuff 2013-07-15 01:01:37 +02:00
Vincent-Michael
9e9bdd77c5 Core: Fix build 2013-07-14 22:48:56 +02:00
Nay
b56b282eee Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
 2013-07-14 16:10:20 +01:00
Nay
d6f3460796 Script/Commands: Fix a crash in .arena captain command 2013-07-13 23:07:01 +01:00
Malcrom
4aad735af9 Core/Scripting: Add Wrathbone Flayer script to show channelling visual and correct combat AI. 2013-07-13 09:27:27 -02:30
Shauren
30f6efb416 Core/Quests: Fixed quest sharing 2013-07-11 21:45:14 +02:00
Machiavelli
93226005c6 Scripts/Akama: Uninitialized variable 2013-07-11 13:45:51 +02:00
Malcrom
f274560c4a Core/Scripting: Minor fix to Shade of Akama Script. 2013-07-10 21:21:05 -02:30
Malcrom
b7cf456f53 Core/Scripting: Additions to Shade of Akama Script. Just ending sequence left to do. 
Please supply feedback if anything is not like offi so I can fix.
 2013-07-10 18:29:32 -02:30
Malcrom
50e59114b1 Core/Scripting: Some cleanup for Hyjal Script. 2013-07-10 16:36:23 -02:30
Malcrom
f44f004dc5 Core/Scripting: Fixup Onyxia Script to use events. 2013-07-10 14:09:32 -02:30
Malcrom
4fe0f1339e Core/Scripting: A couple fixes for Hellfire Ramparts. 2013-07-10 13:09:37 -02:30
Malcrom
7d5be7a3ef Core/Scripting: A little update to Hellfire Ramparts. Thanks joschiwald. 2013-07-10 11:51:15 -02:30
Malcrom
81d8739d68 Core/Scripting: Converted Watchkeeper Gargolmar to use events. 2013-07-10 00:13:36 -02:30
Malcrom
ea49f98170 Core/Scripting: Fix up Hellfire Ramparts instance and add Instance save. 2013-07-09 23:32:34 -02:30
Malcrom
d5687a1003 Core/Scripting: Few minor fixes for Shattered Halls. 2013-07-09 18:42:52 -02:30
Malcrom
fb783fb098 Core/Scripting: A couple fixes for shattered Halls 2013-07-09 18:27:03 -02:30
Malcrom
17398a4043 Core / Scripting: Coverted a couple Shattered Halls npc scripts to use events 2013-07-09 07:10:48 -02:30
Malcrom
ebe1ef2492 Core / Scripting: Updates to Shattered Halls and added Instance save. 2013-07-08 23:29:55 -02:30
Vincent-Michael
e464d2bd2c Scripted: Some cleanups + ninja changes 2013-07-08 21:15:23 +02:00
Malcrom
d8b39e9bae Core/Scripting: Fix some errors in Shade of Akama script. 2013-07-08 16:31:29 -02:30
Malcrom
ac85fac977 Core / Scripting: fix a few warnings. 2013-07-08 14:44:10 -02:30
Malcrom
92eec6831a Core: Scripting: Shade of Akama WIP 2013-07-08 12:39:32 -02:30
Nay
3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts) 
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
 2013-07-06 20:21:45 +01:00
Warpten
e49c7aa765 Spells/Priest: Fixed Dispel Magic. 2013-07-06 14:48:40 +02:00
Vincent-Michael
6079f369af Scripted/Misc: Some cleanup 2013-07-06 01:00:05 +02:00
Vincent-Michael
f97cf4a1d8 Scripted/Eversong Woods: Add Missing cleanup 2013-07-05 17:32:38 +02:00
Vincent-Michael
f46f7a3414 Misc: 
- Fix missing newlines
- Fix some startup errors
 2013-07-05 17:21:21 +02:00
Vincent-Michael
644e75487d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
	src/server/scripts/Spells/spell_item.cpp
 2013-07-04 23:08:02 +02:00
Vincent-Michael
b4d4e04f53 Scripts/Misc: Rename creatures with mob_ / mobs_ in npc_ 
Note: Have fun :P
 2013-07-04 22:11:47 +02:00
Nay
85db1fc943 Scripts/Razorfen Kraul: Fix build and a possible crash 2013-07-04 17:12:29 +01:00
Mislav Blazevic
9c1cca395b Scripts/Razorfen Kraul add script for quest 1221 
Credits to @XFurry , he is original author.

Closes #8165
Closes #10152

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-07-04 17:00:23 +01:00
Aokromes
258df112a8 Core/Scripting: Allow Headless Horseman to be attacked 
Fix by digz6666.
Note: this script needs rewrite, any pull request doing it is welcome.
Closes #3568
 2013-07-02 17:38:07 +02:00
Malcrom
19aeac3abd Core/Scripting: Fix Gossip option select for npc_spirit_of_olum 2013-07-02 00:09:33 -02:30