Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-01 14:46:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,618 Commits 4 Branches 146 Tags
ef8a08ee2c52cd00f64f0283a8862bace4e09b21
Commit Graph

6723 Commits

Author SHA1 Message Date
Vincent-Michael
ef8a08ee2c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-07-18 23:16:22 +02:00
Nay
eca90db56b Scripts/Commands/Arena: Replace a call of GetPlayerNameByGUID by GetCharacterNameData 2013-07-18 21:07:00 +01:00
Vincent-Michael
de673fc4b0 Core/Spells: Convert/Update more spells for 4.3.4 2013-07-18 18:20:01 +02:00
Vincent-Michael
0b94293dba Core/Spells: Convert/Update more spells for 4.3.4 2013-07-18 15:23:09 +02:00
Vincent-Michael
98c8dc346a Core/Spells: Convert/Update more spells in spell script for 4.3.4 2013-07-18 12:05:57 +02:00
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
Nay
ff3524fabc Merge remote-tracking branch 'origin/master' into 4.3.4 2013-07-16 23:51:11 +01: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
0e4816771a Core/Conditions: Add more infos for invalid skill condition log error 2013-07-16 18:22:03 +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
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
08c1a81096 Scripted/Misc: Fix random stuff 2013-07-15 01:01:37 +02:00
Nay
b87f794e16 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2013-07-14 18:59:09 +01:00
Nay
ee31174caa DB/Items: Change item_template.Flags to uint32 (int(10) unsigned) 2013-07-14 18:15:42 +01: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
Warpten
cd3a7f4175 Core/Players: Dueling players in your party / raid should not make them always detectable. 
Fixes seeing stealthed rogues & druids, as well as invisible mages in duels.
 2013-07-14 16:46:11 +02:00
Nay
d6f3460796 Script/Commands: Fix a crash in .arena captain command 2013-07-13 23:07:01 +01:00
Shauren
330dd624b6 Core/Movement: Do not remove movement flags that have special opcodes associated with them on teleport 
Closes #10162
 2013-07-13 15:26:10 +02:00
Shauren
30f6efb416 Core/Quests: Fixed quest sharing 2013-07-11 21:45:14 +02:00
Shauren
f8ba2c066b Core/Units: Removed check for current movement flags in SetRooted method to restore its old functionality as we relied on its old broken state 2013-07-09 17:36:10 +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
Warpten
95245d90ab Core/Guilds: Some stuff that didnt get staged... 
Also fixed non-PCH build (I guess, not enough horsepower to check myself sadly)
 2013-07-06 15:28:12 +02:00
Warpten
37c048b8db Core/Players: Fixed SMSG_DUEL_WINNER. 
Closes #9401.
 2013-07-06 15:06:29 +02:00
Warpten
99792f8750 Core/Guilds: Fixed 7th and 8th guild bault tabs. 2013-07-06 15:03:23 +02: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
hexa-
7da727c6fe Core/Spells: Remove correct stack of Deadly Poison when using Envenom 2013-07-02 05:27:09 +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
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
Gacko
fb72716668 Fix typos in previous commit 2013-06-29 16:47:08 +02:00
Naios
642ed8a5d2 Core/PhaseMgr: Fixed an updateleak that occured if the rewarded quest hadn't requirements 
* Fixed the range for phase ids in the phase_definition table
* solves http://www.trinitycore.org/f/topic/8737-condition-quest-rewarded-dosnt-work-instantly/
 2013-06-29 15:44:32 +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
Vincent-Michael
08e2b03b28 Core: Fix warnings 2013-06-29 01:56:44 +02:00
Shauren
f4f09e3eb5 Core/Auras: Fixed SPELL_AURA_CAST_WHILE_WALKING for channeling spells 
Closes #9947
 2013-06-29 00:11:33 +02:00
Shauren
66d8bdb943 Core/Units: Fixed a mistake that cause unroot packet not to be sent when stun was removed 2013-06-28 17:00:57 +02:00
Shauren
1bb4ceded3 Core/PacketIO: Enabled CMSG_LFG_GET_STATUS (disabled it by mistake) 2013-06-28 16:59:44 +02:00
Northstrider
9ba6c9bd8d Core/PacketIO: updated and enabled 2 lfg opcodes 2013-06-28 01:41:00 +02:00
Shauren
36c866f9ff Core/PacketIO: Updated and enabled more LFG opcodes 2013-06-27 12:48:34 +02:00
Shauren
ccca0874a2 Core/PacketIO: Implemented CMSG_LFG_LOCK_INFO_REQUEST and cleaned up opcodes that don't exist anymore 2013-06-26 19:51:28 +02:00
Malcrom
eb74361470 Core/Scripting: Updated BWL Scripts. Thanks to gerripeach for the base. 
Closes #4952 #9283
 2013-06-24 13:48:02 -02:30
Shauren
ab601de6af Core/PacketIO: Send proper SPLINE_ROOT packets for stunned creatures 2013-06-23 20:15:02 +02:00
Shauren
9d9a92a56d Core/Instances: Fixed loading DungeonEncounters.dbc (-1 means all difficulties), thx Northstrider for pointing it out 2013-06-23 19:40:00 +02:00
Shauren
ab1fa7b3ad Core/PacketIO: Implemented SMSG_WORLD_SERVER_INFO 2013-06-23 18:56:10 +02:00
Shauren
6bccfe997c Merge fixups 2013-06-23 15:11:08 +02:00
Shauren
3f3a32df34 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-23 14:51:52 +02:00
Shauren
a2855e84c5 Core/PacketIO: Enabled more opcodes 2013-06-23 12:55:54 +02:00
Shauren
89466f76ac Core/Auras: Fixed crashes introduced in 1addad4dbd 
Closes #10081
 2013-06-23 11:20:13 +02:00
Shauren
e74c0e9f00 Core/PacketIO: Updates and enabled a bunch of opcodes 2013-06-23 00:07:25 +02:00