Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,713 Commits 4 Branches 146 Tags
8a110f2645efdba4e15ddd13745b1b4110a7c8cb
Commit Graph

6803 Commits

Author SHA1 Message Date
Vincent-Michael
8a110f2645 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.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/Spells/spell_paladin.cpp
 2014-04-19 19:57:46 +02:00
Unholychick
574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript 
Closes #11896
Closes #3464
 2014-04-18 20:21:05 +02:00
Dr-J
220a45b0cf Scripts/Ulduar: Archivum Console 
- Scripts for Archivum Console, Brann Bronzebeard (33235), Prospector Doren/Loren
- Fixing quest chaining for both versions of the archivum data disc chains
- Fixes loot so correct quest starter item drops from assembly when done in hard mode rather than 10m quest item dropping in 25 and nothing dropping in 10 man
- Scripted events for turn in of Archivum Data Disk, The celestial Planetarium and watcher Analysis's and turn in of ancient history (Val'anyr, Hammer of Ancient Kings chain)
- Fix both versions of the Celestial Planetarium

Closes #11547
Closes #11556
 2014-04-17 21:52:08 +02:00
Aokromes
b0d0bed9ef DB/Creature: Highlord Bolvar Fordragon 
By MitchesD, closes #11893
 2014-04-17 07:56:50 +02:00
Kinzcool
f9381d2e8c DB/Creatures: Added trigger flag to the remaining triggers 2014-04-16 20:15:01 -04:00
joschiwald
119688d964 Rename 2014_02_15_00_world_spelldifficulty_dbc.sql to 2014_04_17_01_world_spelldifficulty_dbc.sql 2014-04-17 02:03:53 +02:00
joschiwald
8877a87c99 Merge pull request #11614 from MitchesD/kelthuzad 
Scripts/Kelthuzad: move spells into spelldifficulty_dbc and cleanup
 2014-04-17 02:02:51 +02:00
joschiwald
0a014e1431 Scripts/UtgardeKeep: fixed some issues on Ingvar the Plunderer 
Closes #10859
 2014-04-17 00:09:43 +02:00
Kinzcool
07fd33fa2a DB/BroadcastText: Corrected texts using backslashes and ALL the errored "EmoteDelay"s due to a fail in the parser *cough* *cough* 2014-04-15 20:51:56 -04:00
Kinzcool
d26889744d DB/NPCText: Conversion to BroadcastText system for npc text (part IV) 2014-04-15 20:08:10 -04:00
w1sht0l1v3
f3fa0d0d37 DB/SAI: Runes of Compulsion (Quest: 12093) 
Closes #4898
 2014-04-16 00:42:06 +03:00
Kinzcool
3332ea9df8 DB/Gossips: Conversion to BroadcastText system for gossips (part III) 2014-04-14 19:21:52 -04:00
Kinzcool
798b73a1ae DB/CreatureText: Conversion to BroadcastText system part II 2014-04-14 15:29:11 -04:00
untaught
b9a62115b1 Core/Spells: fixed Relic of the Earthen Ring 
Closes #11282
 2014-04-14 19:48:13 +02:00
Kinzcool
6464cfd033 DB/CreatureText: Started the conversion to the BroadcastText system 2014-04-13 20:36:34 -04:00
Aokromes
9568829dbf DB/Item: Fix Essence of the Pure Flame scaling 
By gecko32, closes #1925
 2014-04-12 17:56:09 +02:00
Vincent-Michael
e4b14b943d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names.sql
	sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_character.cpp
	src/server/scripts/Commands/cs_lookup.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-04-05 20:43:05 +02:00
joschiwald
29610b250d Core/Spells: fixed Throw Shield Visual and Clone Weapon 2014-04-05 00:37:07 +02:00
Kinzcool
65e9691b23 DB/Creatures: Added some data for dataless NPCs 2014-04-04 13:34:26 -04:00
Aokromes
818278a71e DB/SAI: Fix few startup errors after 96b3df2 2014-04-03 10:13:37 +02:00
Kinzcool
13acbd12d5 DB/Gameobjects: Updated the WDBVerified of the gameobject templates of a4487f8f58 -.- 2014-04-02 22:45:38 -04:00
Kinzcool
a4487f8f58 DB/Gameobjects: Added spawns on Development Land 2014-04-02 22:34:06 -04:00
Aokromes
2ae903d27d DB/SAI: Fix Arcane Disturbances after quest_?_scripts removal 
By untaught, closes #5412
 2014-04-02 21:55:52 +02:00
Kinzcool
b7ab8a1332 DB/Gameobjects: Added "a few" missing gameobjects 2014-04-01 21:01:23 -04:00
Aokromes
f57907e214 DB/Gameobject: Delete another TEMP gameobject 2014-04-01 14:35:53 +02:00
Aokromes
470d3f2651 DB/Gameobject: Fix 2 Gameobjects names after 8ff8f30 and 33be04d 2014-04-01 11:56:56 +02:00
Aokromes
6815e2bc35 DB/Misc: Fix startup errors after 8ff8f30 and 33be04d 2014-04-01 08:58:27 +02:00
Kinzcool
33be04ddcd DB/Gameobjects: Bye bye old "TEMP" Gameobjects... 2014-03-31 20:58:17 -04:00
Kinzcool
8ff8f3034e DB/Gameobjects: Spring clean up for "TEMP" spell focus gameobjects. 
* Added missing spell focus gameobjects.
* Old "TEMP" gameobjects now have sniffs values for their radius and the proper entries.
 2014-03-31 20:48:22 -04:00
Kinzcool
9c5e14b41e DB/Creatures: Corrected creature addon values for mounts 2014-03-31 01:29:22 -04:00
Kinzcool
d2f6495083 DB/Creatures: Added all NPC mounts with sniff values 2014-03-30 23:47:40 -04:00
Kinzcool
60e87db489 DB/BroadcastText: Created BroadcastText table -- contains every gossip, creature text & npc text. Note that it has NO use for you for now except if you want to pick some texts from it to add them to your scripts/Pull Requests. This file will be used as a globalized table which other ones will link to in the future. 2014-03-30 21:26:11 -04:00
Kinzcool
96b3df24cd DB/Equipment: Killed the errors added in b7a915c396 2014-03-30 18:28:52 -04:00
Kinzcool
b7a915c396 DB/Equipment: Added blizzlike values for the equipement of every NPC. 2014-03-30 17:16:43 -04:00
Gacko
e8df0643a3 DB/SAI: Fix warning about missing creature_text (wrong target_type) 2014-03-30 22:29:20 +02:00
Aokromes
b61e497516 Update 2014_03_30_02_world_game_event_335.sql 2014-03-30 16:54:55 +02:00
Aokromes
b84903a250 DB/Gameevent: Fix typo 2014-03-30 16:45:59 +02:00
Aokromes
338a0047c5 Rename 2014_03_29_01_world_creature.sql to 2014_03_30_01_world_creature.sql 2014-03-30 14:44:41 +02:00
Aokromes
909041257c DB/Creature: Remove 2 no longer existing mobs 2014-03-30 14:44:11 +02:00
Aokromes
efa6bf857b DB/Gameevent: Fix Noblegarden start date acording ingame calendar 
NOTE This is only valid for wow 3.3.5a
 2014-03-30 10:07:57 +02:00
Aokromes
d3e292fe1e DB/Creature: Remove 2 no longer existing mobs 
Gal'darah Image and Ingvar the Plunderer Image where removed with the introduction of 3.3 weekly quests.
 2014-03-29 19:15:49 +01:00
Vincent-Michael
4a5d7a395b DB/SAI: Fix "Badlands Enraged Rock Elemental" event spam 
Closes #11802
 2014-03-29 18:19:08 +01:00
Shauren
3fd6dd6175 Core/Loot 
* Master Looter cannot freely loot items under threshold
* Update round robin looter only if loot is not empty
* Fixed loot bag icon appearing in raid frames when loot method was not Master Looter
* Fixed changing loot method reseting current round robin looter
 2014-03-29 13:29:22 +01:00
Shauren
dee867547d Merge pull request #11719 from Dehravor/master-loot 
Core/Loot: Fix master loot
 2014-03-29 13:24:48 +01:00
Duarte Duarte
e4c57d839d TDB 335.53 - 2014/03/29 2014-03-29 04:58:38 +00:00
Kinzcool
205294b856 DB/Text: Added the missing page texts for the book "The Archmage Antonidas - Part I" 2014-03-28 21:22:19 -04:00
Kinzcool
d8779da3a2 DB/Text: Added the missing page texts for the book "Portals are NOT Garbage Bins!" 
Closes #3362
 2014-03-28 20:25:34 -04:00
Gacko
30894c2bad Quest: Direhorn Raiders 
Remove duplicate kill credit
 2014-03-26 18:54:40 +01:00
Gacko
46b8bc8882 Fix non-pch build and remove blank line 2014-03-26 18:51:09 +01:00
Gacko
808a1998c6 Quest: The Power of the Elements 
Remove hack SAI, use aura script
 2014-03-26 18:36:39 +01:00