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,690 Commits 4 Branches 146 Tags
97608aeff754ef94b73b868437d8f41ccace24be
Commit Graph

1458 Commits

Author SHA1 Message Date
Vincent-Michael
dee93dcc5d Scripted/IcecrownCitadel: Remove spell script for lk play movie 2013-07-22 16:15:21 +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
313ef9da33 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-20 21:07:49 +02:00
Nay
bf100ffc3c Scripts/Icecrown: Fix a double function call typo in npc_margrave_dhakar 
Thanks Josh
 2013-07-20 15:00:36 +01:00
Vincent-Michael
d4ac53083f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2013-07-19 22:33:35 +02:00
Vlad
0b9a8ccef5 Core/Misc: Change creatures and gameobject phasemask from 16 to 32 bits 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-07-19 04:03:40 +01:00
Nay
ebd9090d80 DB/NPCs: Fix Margrave Dhakar equipment 2013-07-19 03:25:52 +01:00
Nay
0691a4310f Scripts/Icecrown: Use guid instead of cached Creature* to avoid crashes in npc_margrave_dhakar 2013-07-19 02:27:56 +01:00
Nay
ff01602906 Scripts/Icecrown: Fix code style and use "best practices" on previous commit (c536ba510) 2013-07-19 00:42:59 +01:00
Nay
c536ba510d Scripts/Icecrown: Fix quest The Flesh Giant Champion 
Closes #9040
Closes #10294
 2013-07-19 00:03:27 +01:00
joschiwald
d52ce57e59 Scripts/ForgeOfSouls: move "Mirrored Soul" into SpellScripts 2013-07-19 00:24:25 +02:00
Vincent-Michael
ef8a08ee2c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-18 23:16:22 +02:00
joschiwald
06d54ba438 Scripts/VaultOfArchavon/Koralon: Fix Meteor Fists 2013-07-18 23:01:14 +02:00
Vincent-Michael
187878f9c4 Core/Spells: Update warrior/utgarde keep "Second Wind" for 4.3.4 2013-07-17 00:42:46 +02:00
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
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
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
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
Vincent-Michael
029fe277b0 Scripted/Naxxramas: Missing cleanup in f90078f979 :P 2013-07-01 17:52:25 +02:00
Vincent-Michael
f90078f979 Scripted/Naxxramas: Fix Four Horsemen Chest 2013-07-01 17:44:26 +02:00
Shauren
9e5ce92a82 Scripts/Icecrown Citadel: Fixed Blood Queen Lana'thel flight phase 
Closes #8759
 2013-06-30 16:34:56 +02: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
Shauren
13208ff257 Core/Vehicles: Implemented vehicle seat flag that makes passengers unselectable and dropped redundant UNIT_STATE_ONVEHICLE (it is only checked in the same places as unselectable unit flag) 2013-06-29 15:20:15 +02:00
w1sht0l1v3
44c844d6fd Scripts/The Storm Peaks: Use proper vehicle check on prisoners from Cold Hearted quest. 2013-06-29 14:50:37 +03:00
Malcrom
4761590c4a Core/Scripting: Update Injured Goblin Miner script to use DB gossip. 2013-06-26 13:36:53 -02:30
Malcrom
f4bceb86c0 Core/Scripting: Replace a couple core scripts in Storm Peaks with SAI and DB gossip. 2013-06-26 13:18:17 -02:30
Malcrom
83c1e69d74 Core/Scripting: Update npc_agnetta_tyrsdottar to use db gossip. 2013-06-26 12:43:45 -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
180cd5cf6e Core: Fix warning 2013-06-23 01:49:28 +02:00
Vincent-Michael
7e01ac23db Scripts: Fix some typos 2013-06-22 17:24:23 +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
15ef29800a Core: Fix build 2013-06-21 22:22:21 +02:00
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
Vincent-Michael
4a8e92e8af Core/GameEvent: Add log for game_event_creature/game_event_gameobject contains creature/gameobject not found in table creature/gameobject table 2013-06-21 21:56:16 +02:00
Vincent-Michael
a0fad6faa9 Core: Fix warnings and some cleanup 2013-06-21 18:06:38 +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
Malcrom
3a30a0bb35 Core/Scripting: Some updates to Zul'Drak scripts. 2013-06-18 18:12:45 -02:30
Shauren
f517467817 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-18 21:04:31 +02:00
Shauren
89ec907539 Core/Objects: Refactored MovementInfo structure 2013-06-18 18:15:33 +02:00
Vincent-Michael
09eea66ee1 Core: Fix warnings 2013-06-18 16:51:56 +02:00
Shauren
b6aadc6698 Scripts/Misc: Use new movement flag setting methods in scripts 2013-06-18 16:48:46 +02:00