Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,608 Commits 4 Branches 146 Tags
7a2ed4a142f49fbabaef602a512c0fb5b44ac099
Commit Graph

2052 Commits

Author SHA1 Message Date
Nay
b015ed0a99 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-11 22:38:59 +01:00
w1sht0l1v3
02096f1c23 Core/Scripts: Anub'Arak encounter changes and fixes. 2012-09-11 22:52:47 +03:00
Nay
68e0ef8039 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h
 2012-09-11 01:11:14 +01:00
Kretol
8d049545de DB/Creature: creature_model_info fix - Horde Guard 
Closes #3352
 2012-09-11 01:01:57 +01:00
Bizzy
8558a21211 DB/SAI: Fix npc Scrapped Fel Reaver 
Closes #3074
 2012-09-11 00:59:47 +01:00
nelegalno
f151ff7342 DB/Scripts: Fix quest Finding the Keymaster 
Ref #4661
Closes #2604
 2012-09-11 00:52:14 +01:00
Kinzcool
866bc4156d DB/NPC: Various fix for gossip 
Closes #7156
 2012-09-11 00:42:12 +01:00
armano2
73cdd187e2 DB/Quests: Creature involvedrelation for quest Words for Delivery 
Closes #1911
 2012-09-11 00:40:00 +01:00
Tomas
f2067f98f9 DB/Spells: Armistice aura is missing when player is in front Sunreaver Pavillion or Silver Covenant Pavillion 
Closes #1938
 2012-09-11 00:35:36 +01:00
nelegalno
9f87270d80 DB/Loot: Bump drop chance of Vic's Keys from 15% to 100% 
Closes #1954
 2012-09-11 00:33:33 +01:00
Aristoo
292cca744a DB/NPCs: Little Ooze (Rotface in ICC) can not be taunted 
Closes #1993
 2012-09-11 00:31:43 +01:00
Trista
282767450c DB/Quests: Fix quest relations for Disharmony of Flame 
Closes #2653
 2012-09-11 00:30:09 +01:00
Trista
820a14ef31 DB/Quests: Fix quest relations for Grark Lorkrub 
Closes #2659
 2012-09-11 00:28:40 +01:00
Shauren
0390f9d708 Scripts/Icecrown Citadel 
* Despawn Mutated Abomination when second phase transition ends, not begins
* Prevent Unbound Plague jumping every 0.5 seconds to bypass the mechanic by raid members stacking in one place
* Fixed Volatile Ooze not picking targets when everyone stood close to the tank
* Fixed Ooze adds pickning new targets after old one gets lost

Closes #7610
Closes #7611
Closes #7665
 2012-09-10 20:32:13 +02:00
nelegalno
7790a2d631 DB/Quests: Fix "Homeward Bound" completion text 
Closes #7454
 2012-09-10 03:19:28 +02:00
Nay
1458a006b8 Siigh 2012-09-10 02:11:21 +01:00
Nay
0a81824772 DB/Guilds: Add missing reward table 2012-09-10 02:10:28 +01:00
Nay
d97d125618 Move a SQL file 2012-09-10 02:04:21 +01:00
Vincent-Michael
75eb6fc608 DB/Game Event: Update Darkmoon Faire start times 2012-09-10 02:54:28 +02:00
Nay
d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
 2012-09-10 00:52:35 +01:00
Subv
6fc3d3a77c Core/Scripts: Some cleanup in warlock spellscripts 2012-09-09 12:28:31 -05:00
Subv
da5f8f58e2 Core/Scripts: Cleanup the warrior spell scripts 2012-09-09 11:48:29 -05:00
Vincent-Michael
8541167ff2 DB/Quests: Fix OfferRewardText for quest "Warsong Supplies" 
Closes #7279
 2012-09-09 04:27:06 +02:00
Vincent-Michael
3d360e116c SQL: Fix sql fails :-/ 2012-09-09 04:12:08 +02:00
Vincent-Michael
2317af8dd3 Core/Spells: Convert Gift of the Naaru in spell script 
Closes #6545
 2012-09-09 04:02:47 +02:00
Nay
7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-09 02:18:58 +01:00
Nay
d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Myran2
5cd9910463 Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game 2012-09-08 18:59:06 -04:00
Subv
158a86cf11 SQL/Achievements: Fixed achievement "Wrecking Ball" 
It should only count player deaths.
closes #1734
 2012-09-08 13:13:32 -05:00
Vincent-Michael
f2136eaeef DB/Creatures: Fix Kologarn InhabitType 2012-09-08 02:44:44 +02:00
Nay
242a2fdbc1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
 2012-09-08 01:34:24 +01:00
Vincent-Michael
4cf1e7309f DB/Achievement: Fix achievement "Who Needs Bloodlust"? 
Closes: #4812
 2012-09-08 02:16:35 +02:00
Subv
673ce30f38 Core/Spells: Fixed Improved Health Funnel damage reduction effect. 
Author: Josh
closes #7275
 2012-09-07 18:26:14 -05:00
Shauren
6ca7a7b78d Core/Guilds: Implemented basic guild leveling (no player statistics/reputation) 2012-09-07 14:39:19 +02:00
Nay
faf9f481ef DB/NPCs: Set UNIT_FLAG2_REGENERATE_POWER for all creatures 
(exceptions to this rule will have to be fixed)
 2012-09-07 04:12:45 +01:00
Nay
19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-07 03:36:47 +01:00
Vincent-Michael
ce42faafd9 DB/Spells: Fix Flamecap Fire damage 2012-09-07 02:02:35 +02:00
Nay
fa29f1bb27 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-04 01:04:31 +01:00
nelegalno
511beb8c19 DB/Quests: Fix required races for quest 9719 
Closes #7604
 2012-09-03 17:18:38 +01:00
Nay
6acb7f85f4 DB/GOs: Correct flags of GO 186371 
Thanks Joshh
Closes #6846
 2012-09-03 17:15:32 +01:00
Nay
874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
 2012-09-03 16:11:46 +01:00
w1sht0l1v3
128d99b29b Core/Scripts: Rewrite Cold Hearted quest. 
Closes #1758 .
 2012-09-03 15:50:08 +03:00
Nay
1a49554af8 Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap) 2012-09-02 22:52:22 +01:00
Vincent-Michael
28a5e1e148 SQL: Fix sql error (thx ChazyTheBest) 2012-09-02 21:02:35 +02:00
Nay
1731ff5ca1 SQL: Rename SQL file after PR 2012-09-02 15:50:29 +01:00
Nay
40c22de0b7 Merge pull request #7587 from acrathos/master 
DB/SAI: Thorim and Lok'lira the Crone
 2012-09-02 07:47:57 -07:00
nelegalno
f4fdb0c64c DB/Quests: Fix required races for multiple quests 
Closes #7620
 2012-09-02 15:44:00 +01:00
Nay
2e1de60593 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
 2012-09-01 22:19:13 +01:00
Gacko
74d4aec49b Core/Spell: Unlocking zuluhed chains 
Core/Spell: Unlocking zuluheds chains

Core/Spell: Unlocking zuluheds chains

Core/Spell: Unlocking zuluheds chains
 2012-09-01 00:35:52 +02:00
Santiago
0af00a8283 DB/SAI: Remove Lol'kira the Krone and Thorim cpp scripts, handled by SAI 2012-08-30 23:32:03 -03:00