Vincent-Michael
|
f16f427c48
|
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/CharacterHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
src/server/scripts/Spells/spell_hunter.cpp
|
2013-08-18 18:13:14 +02:00 |
|
joschiwald
|
2b19ba1879
|
Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes
|
2013-08-18 01:41:10 +02:00 |
|
w1sht0l1v3
|
1ad954e215
|
Core/Scripts: Placeholders for instances Maraudon and Dire Maul.
It is needed for Random Dungeon Finder credit.
|
2013-08-17 19:14:48 +03:00 |
|
w1sht0l1v3
|
0333d22fe9
|
Core/Scripts: Placeholder for instance Ragefire Chasm.
It is needed for Random Dungeon Finder credit.
|
2013-08-17 15:25:09 +03: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 |
|
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 |
|
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 |
|
joschiwald
|
0667e89005
|
Scripts/DrakTharonKeep: add some spellscripts, add yells to novos, and do some cosmetic changes
|
2013-08-07 17:31:36 +02:00 |
|
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 |
|
Vincent-Michael
|
75e6c40630
|
Core/Misc: Rename some no name enums
|
2013-08-06 21:16:05 +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
|
ac10589eda
|
Core/Misc: Fixed some issues found by Coverity Scan
|
2013-08-01 21:31:11 +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 |
|
Vincent-Michael
|
4d251bf707
|
Core/Misc: Fix db startup errors
|
2013-07-26 14:38:34 +02:00 |
|
Vincent-Michael
|
8adad5ebf4
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_dk.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
|
2013-07-24 03:21:25 +02:00 |
|
keke222
|
e11714e948
|
Scripts/Onyxia's Lair: Fixed movement during flight phase and set proper InhabitType
Closes #10335
|
2013-07-23 17:18: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
|
7104e3c70f
|
Core: Fix build
|
2013-07-15 17:44:32 +02:00 |
|
Vincent-Michael
|
de193fc80d
|
Scripted: Add some missing override
|
2013-07-15 15:14:01 +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 |
|
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 |
|
Vincent-Michael
|
e464d2bd2c
|
Scripted: Some cleanups + ninja changes
|
2013-07-08 21:15:23 +02:00 |
|
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 |
|
Vincent-Michael
|
6079f369af
|
Scripted/Misc: Some cleanup
|
2013-07-06 01:00:05 +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 |
|
Shauren
|
112bc49c9a
|
Core/Units: Removed most calls to SendMovementFlagUpdate for creatures
|
2013-06-30 16:31:24 +02:00 |
|
Vincent-Michael
|
676c7341d6
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
|
2013-06-30 00:36:03 +02:00 |
|
Malcrom
|
b669a2142e
|
Core/Scripting: Some boss script fixes.
|
2013-06-23 11:27:33 -02:30 |
|
Shauren
|
3f3a32df34
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-06-23 14:51:52 +02:00 |
|
Vincent-Michael
|
e6185c92fc
|
Scripts: Convert DoCast(me->GetVictim(), SPELL_XXXXX); in DoCastVictim(SPELL_XXX);
|
2013-06-22 16:53:13 +02:00 |
|
Vincent-Michael
|
154dd37743
|
Scripts: Add missing code and fix codestyle
|
2013-06-22 16:45:48 +02:00 |
|
Malcrom
|
6623a9dc42
|
Core/Scripting: Renamed Dark Portal scripts to The Black Morass
|
2013-06-21 23:14:59 -02:30 |
|
Malcrom
|
7e76ab97f8
|
Core/Scripting: Updates to Dark Portal Instance Scripting
|
2013-06-21 21:56:21 -02:30 |
|
Vincent-Michael
|
614e674b34
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Northrend/zone_zuldrak.cpp
|
2013-06-21 22:04:11 +02:00 |
|
kaelima
|
a50fef2336
|
Scripts: Prevented several KilledUnit texts to yelled for non-players such as pets
|
2013-06-19 00:41:40 +02:00 |
|
Shauren
|
b6aadc6698
|
Scripts/Misc: Use new movement flag setting methods in scripts
|
2013-06-18 16:48:46 +02:00 |
|
Vincent-Michael
|
87d9d1d705
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.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_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ghostlands.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_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.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_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/Spells/spell_pet.cpp
src/server/scripts/Spells/spell_shaman.cpp
|
2013-06-13 19:35:01 +02:00 |
|
Malcrom
|
ec474a62e5
|
Core: More Function Renaming.
|
2013-06-11 21:25:12 -02:30 |
|
Malcrom
|
66978cfc3b
|
Core: Some function renaming.
|
2013-06-11 19:54:27 -02:30 |
|