Vincent-Michael
|
34cd8e808e
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
|
2013-08-20 17:48:18 +02:00 |
|
joschiwald
|
e0f010b310
|
Scripts: Random script fixes and code optimizations
|
2013-08-19 20:03:06 +02:00 |
|
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
|
0333d22fe9
|
Core/Scripts: Placeholder for instance Ragefire Chasm.
It is needed for Random Dungeon Finder credit.
|
2013-08-17 15:25:09 +03:00 |
|
w1sht0l1v3
|
7b9f34afc5
|
Core/Scripts: Placeholder for instance The Stockade.
It is needed for Random Dungeon Finder credit.
Correct entry for last encounter in the instance.
|
2013-08-17 14:59:49 +03: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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Vincent-Michael
|
d5d3e785b7
|
DB/Player: Fix clear glyph for some class
|
2013-07-26 18:09:10 +02:00 |
|
Vincent-Michael
|
4d251bf707
|
Core/Misc: Fix db startup errors
|
2013-07-26 14:38:34 +02:00 |
|
Vincent-Michael
|
b684cd6079
|
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
|
2013-07-21 23:49:38 +02:00 |
|
Shauren
|
3d6b88f5aa
|
Fixed compile warnings
|
2013-07-21 14:17:24 +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 |
|
Malcrom
|
8462a09264
|
DB/Gossip: Added missing gossip for Royal Historian Archesonus. Removed cpp script.
|
2013-07-16 21:42:40 -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 |
|
Vincent-Michael
|
de193fc80d
|
Scripted: Add some missing override
|
2013-07-15 15:14:01 +02:00 |
|
Vincent-Michael
|
08c1a81096
|
Scripted/Misc: Fix random stuff
|
2013-07-15 01:01:37 +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 |
|
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
|
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 |
|
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
|
722f7068f2
|
Core/Scripting: More updates for BRS instance. Added missing scripts for urok and gizrul.
|
2013-07-01 10:19:18 -02:30 |
|
Malcrom
|
1eaf3c9c9d
|
Core/Scripting: Gyth event still not finished but completable.
|
2013-06-30 13:39:07 -02:30 |
|
Shauren
|
112bc49c9a
|
Core/Units: Removed most calls to SendMovementFlagUpdate for creatures
|
2013-06-30 16:31:24 +02:00 |
|
Vincent-Michael
|
ece52c11d2
|
Core: Fix build
|
2013-06-30 13:00:39 +02:00 |
|
Malcrom
|
4ed70c7094
|
Core/Scripting: A few fixes for Blackrock Spire. Emberseer now setting properly after wipe and Gyth/Rend event is getting closer to complete.
|
2013-06-30 00:24:01 -02:30 |
|
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 |
|
Krzysztof Rapacki
|
75f535c65e
|
Scripts/Blackwing Lair: Fixed out of bounds array access
|
2013-06-27 09:45:49 +02:00 |
|
Aokromes
|
9ea2b218cb
|
Core/Scripting: Typo fix
|
2013-06-27 03:23:23 +02:00 |
|
Malcrom
|
651a966e92
|
Core/Scripting: More BRS updates. Emberseer is still buggy if player resets. Working on it.
|
2013-06-26 15:38:19 -02:30 |
|
Aokromes
|
563c75c3e9
|
Core/Scripting: Typo fix
|
2013-06-26 10:36:10 +02:00 |
|