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

20618 Commits

This Branch
This Branch
All Branches
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
blub
922fba3a13 Merge pull request #10305 from joschiwald/koralon 
Scripts/VaultOfArchavon/Koralon: Fix Meteor Fists
 2013-07-18 14:14:32 -07:00
Vincent-Michael
c401c342d1 Core/Spells: Fix fail in 0b94293dba 2013-07-18 23:11:07 +02:00
joschiwald
06d54ba438 Scripts/VaultOfArchavon/Koralon: Fix Meteor Fists 2013-07-18 23:01:14 +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
Aokromes
1c2213d796 DB/Condition: Correct target of spell 63126 
Fix by dr-j closes #10281
 2013-07-18 17:55:33 +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
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
Vincent-Michael
d40725f93c SQL: Fix sql import error 2013-07-17 10:53:08 +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
Malcrom
83a31eaf96 DB/Conditions: Fix error in a previous commit. 2013-07-16 21:36:37 -02:30
Nay
b95b19b3cb TDB 424.05 2013-07-17 00:56:05 +01:00
Nay
b27777fa3e TDB 335.52 - 2013/07/17 2013-07-17 00:56:04 +01:00
Nay
3875ae0c66 TDB 335.52 - 2013/07/17 TDB335.52 2013-07-17 00:27:42 +01:00
Nay
0337174bc4 SQL: Fix a typo in 2013_05_11_00_world_spelleffect_dbc_434.sql 2013-07-17 00:09:06 +01: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
0cb8e12add DB/Condition: Fix startup error 2013-07-16 18:20:17 +02:00
Vincent-Michael
e90550fc07 DB/Gameobject: Fix spawnMask for Orb of Naxxramas 2013-07-16 16:05:21 +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
Kinzcool
4c3d2bdb54 DB/Misc: Few fixes for Naxxramas. 2013-07-16 00:07:56 -04: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
f8e56c18b2 DB/Gossip: Gossip fixup for Drull and Tog'thar 2013-07-15 14:38:48 -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
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
8b0cea7a5e SQL: Prevent a warning in 2013_07_14_01_world_item_template.sql 2013-07-14 18:46:48 +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
bedb2e56e2 DB/Errors: Fix a db startup error 2013-07-14 14:46:03 +01: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
Malcrom
4aad735af9 Core/Scripting: Add Wrathbone Flayer script to show channelling visual and correct combat AI. 2013-07-13 09:27:27 -02:30
Nay
4ecc68d3a5 DB/EAI: Remove forgotten EAI scripts 
984fa01b61
 2013-07-12 14:40:54 +01:00
Aokromes
984fa01b61 DB/Misc: Fix Blowing Hodir's Horn 
Fix by KirkHammett closes #10270
 2013-07-12 13:20:54 +02:00