Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,699 Commits 4 Branches 146 Tags
d29556ef89a9f63b8c77d98643bf210ebfeedcad
Commit Graph

7677 Commits

Author SHA1 Message Date
Vincent-Michael
d29556ef89 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-21 12:12:47 +02:00
Vincent-Michael
ef70382d5b SQL: Only 3.3.5a 2014-09-21 12:12:16 +02:00
Vincent-Michael
5061def422 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
 2014-09-21 12:11:03 +02:00
Aokromes
793c56b8b7 DB/Creature: Delete 2 duplicate spawns 2014-09-21 10:23:58 +02:00
Vincent-Michael
076158e7a0 DB/Spells: Added missing EffectItemType stuff in spell_dbc table 2014-09-21 05:20:25 +02:00
Vincent-Michael
c243bf96d4 DB/Spells: 
- Added EffectItemType columns to spell_dbc table
- Fix "Create Bundle of Bloodthistle"
 2014-09-21 04:18:31 +02:00
Dr-J
df50d07567 DB/Misc: Fix gossip condition which was never met 
Fix condition for gossip option 'Lend me a Windrider.  I'm going to Spinebreaker Post!' on Wing Commander Brack for when player has got quest http://www.wowhead.com/quest=10242/spinebreaker-post.

The existing condition quest taken (9) was never met as this quest is complete in players log as soon as taken, ie just turn in no other objectives, and even when player had quest in log gossip would never be displayed,
 2014-09-21 01:35:02 +01:00
Malcrom
cb9f7fce77 DB/Misc: Respawn Invis Infernal Caster, Wildhammer Defenders, Shadowmoon Scouts, and removed Infernals. 2014-09-20 21:57:36 -02:30
Vincent-Michael
f767aef12e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Globals/ObjectMgr.cpp
 2014-09-20 22:39:37 +02:00
Malcrom
72d08a146f DB/Misc: Add missing creature spawns to Invasion Point, Shadowmoon Valley with pathing 2014-09-20 17:11:20 -02:30
Malcrom
53dbab809f DB/Gameobject: Properly spawn Deathforged Infernals in Shadowmoon Vally 2014-09-20 15:25:31 -02:30
Malcrom
0cb1050dbf DB/Creature: Some Shadowmoon missing spawns 2014-09-20 15:11:56 -02:30
Aokromes
b5cd540758 Update and rename 2014_09_20_0_world_creature.sql to 2014_09_20_00_world_creature.sql 2014-09-20 16:42:34 +02:00
Malcrom
57dd465d9e DB/Creature: Stormpeak Wyrm proper respawntime 2014-09-20 12:03:55 -02:30
Shauren
8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.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/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.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_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-09-20 11:05:30 +02:00
Malcrom
cabaf3eb5b DB/Misc: Add pathing for Fjorn. Not 100% but scripting is hard when you have to do it in a roundabout way. 2014-09-20 01:49:47 -02:30
Malcrom
79766854e0 DB/Pathing: Pathing for existing Son of Corok. Some spawns missing, will correct in another push. 2014-09-20 01:22:11 -02:30
Malcrom
4e951f9d9b DB/Pathing: Pathing for Creteus 2014-09-19 23:09:16 -02:30
Malcrom
0b3cb10f1d DB/Misc: Redo some fixups for Dun Neffelem 2014-09-19 22:15:36 -02:30
Malcrom
9922efaa6a DB/Misc: Misc fixes 2014-09-19 21:39:53 -02:30
Malcrom
b620797b80 DB/Misc: Cosmetic fixups for Dun Neffelem 2014-09-19 20:19:00 -02:30
joschiwald
bbd13945f6 Fixed sql fail 2014-09-20 00:29:12 +02:00
joschiwald
bf37dbfb2a Core/Battlefield/WG: fixed warnings 
Ref #13169
Closes #12714
 2014-09-20 00:26:58 +02:00
ShinDarth
83f82b4a04 Core/ObjectMgr: check creature.orientation and gameobject.orientation range in loading 
Closes #13156
 2014-09-19 22:36:50 +01:00
Malcrom
0f2e63852c DB/Misc: Fix Seething Revenant Entry: 29504 spawns and add two missing paths. 2014-09-19 18:44:09 -02:30
Malcrom
050d56ac21 DB/Misc: Proper spawning and pathing of Stormpeak Wyrm 2014-09-19 16:53:40 -02:30
DDuarte
eeaf7ef6fa Revert "SQL: Update dev/world_database.sql" 
This reverts commit 09f9f3b6b1.

I forgot that world_database.sql should only get updated in TDB releases.
 2014-09-19 18:42:09 +01:00
DDuarte
09f9f3b6b1 SQL: Update dev/world_database.sql 2014-09-19 18:18:18 +01:00
Dr-J
72dcd95015 DB/Misc: Medical Supplies / Sunhawk Reclaimer 
* Spawn Missing Medical Supplies http://www.wowhead.com/object=181898/medical-supplies
* Script Sunhawk Reclaimer
 2014-09-19 17:20:31 +01:00
Dr-J
d672e78a5b DB/Misc: Various Fixes 
* Noggenfogger Elixir  - Fix by @Rushor Closes #13041
* Sprinkle's Secret Ingredient  - Fix by @Rushor Closes #13040
* Xavian Satyrs - Fix by @Rushor Closes #12965
* Icepaw Bear / Tails up - Closes #13030
 2014-09-19 13:47:25 +01:00
Malcrom
bb5becaffc DB/Misc: Some misc fixes for Northrend. Mostly fix flight speed of some npcs. 2014-09-18 23:42:41 -02:30
Dr-J
5b363992ff DB/Gossip: Proenitus 
Closes #13165
 2014-09-19 01:48:48 +01:00
Dr-J
3a7fed7346 DB/Misc: More texts 
Howling Fjord again,

also fixes the error from 55ecd1c913
 2014-09-19 01:12:52 +01:00
joschiwald
e567ab9597 Core/Texts: added TextRange parameter to creature_text 
Ranges:
0 - Normal (Default)
1 - Area
2 - Zone
3 - Map
4 - World

Ref #13116
 2014-09-18 23:33:59 +02:00
Aokromes
46193d6a14 DB/Creature: Remove disable combat movement from some SAI 
By Malcrom
 2014-09-18 22:50:55 +02:00
Vincent-Michael
ad49bd5194 SQL: Fix sql import 2014-09-18 06:05:38 +02:00
Dr-J
55ecd1c913 DB/Misc: Queen Angerboda 
Fixes script for the Slumbering King.

Closes #10247
 2014-09-18 01:06:27 +01:00
joschiwald
0e877e784d forgotten to click save :( 2014-09-18 00:44:48 +02:00
joschiwald
60176157a7 Scripts/Gundrak: cleanup InstanceScript 
* converted Gal'Darah and Moorabi to BossAI
* add and correct some texts
* fixed altar activation spell visual
 2014-09-18 00:38:28 +02:00
Dr-J
86f9b1d3e2 DB/Quest: Matis the Cruel 
Script this quest,

* One line is not proper text and thus no broadcast text id, the proper text is same line but with $n instead of npc name but on tc this gets filled by player name which for this text is not the right behaviour
* Know Matis gets up again after been captured, same happens on retail did not mean to replicate that bug but managed too.
 2014-09-17 21:31:42 +01:00
Nyeriah
2a262aad21 Scripts/Quest: Script spell for quest "Fumping" 
Updates https://github.com/TrinityCore/TrinityCore/issues/11418
 2014-09-16 17:49:16 -03:00
Shauren
7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
 2014-09-16 21:50:01 +02:00
Vincent-Michael
7cbaa028cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-16 21:09:19 +02:00
Dr-J
6810a4469e DB/Misc: DB Stuff for some quests. 
DB Changes for Fumping and A Really Big Worm

Neither of these quests will work until they get cpp support (spell scripts), @Nyeriah is on this believe, she already has spellscript for first now just 2nd is taking a while longer.
 2014-09-16 17:58:30 +01:00
Nyeriah
4e521c1253 SQL: Fix typo at e23814c85b 2014-09-16 11:49:53 -03:00
Nyeriah
e23814c85b DB/Achievement: Set proper map difficulty for achievement "Oh Novos!" 
Closes https://github.com/TrinityCore/TrinityCore/issues/13150
 2014-09-16 11:39:35 -03:00
Dr-J
0a205a460c DB/Misc: Respawn some npcs I did not mean to delete 
closes #13143
 2014-09-15 22:38:58 +01:00
Dr-J
cf04e19c33 DB/Misc; Spawns 
Delete permament spawns of Frigid Ghoul and Frigid and get the npcs which attack these to cast the spells to summon them as they do in sniff.
 2014-09-15 18:20:51 +01:00
Dr-J
38200f8360 Addition to 43e209e320 
I could have sworn I already added broadcast texts to original sql but seems where missing,
 2014-09-15 13:18:05 +01:00
Aokromes
d4703319ab DB/Gameobject: Revert flags for Ulduar Teleporter 
By digz6666, closes #13126
 2014-09-15 13:02:07 +02:00