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
14,859 Commits 4 Branches 146 Tags
37b66384f3d905fb8de506aae48237900a1b6065
Commit Graph

3302 Commits

Author SHA1 Message Date
Spp
37b66384f3 Merge branch 'master' into 4.x 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
 2012-01-31 11:49:53 +01:00
ZxBiohazardZx
cd29b0640c DB/Loot: Reworked Mineral Veins & Deposits should fix previous issues on looting them 
Closes #3360
 2012-01-30 16:48:07 +01:00
ZxBiohazardZx
6915fec0be DB/Loot: Some ICC loot fixes: Shadowfrost Shard was added to deathbringer and dreamwalker, and set to quest-only drop. loots for blood council and dreamwalker have been increased 
Closes #1886
 2012-01-30 14:17:28 +01:00
ZxBiohazardZx
d9d1d5f7fa DB/Loot: Set correct drop percent chance for fragments on putricide 25 heroic 2012-01-30 13:50:24 +01:00
gecko32
4495d2815b DB/Loot: Blue Scepter Shard should have a 100% drop chance when on quest The Wrath of Neptulon 
Closes #5002
 2012-01-30 12:49:13 +01:00
Shauren
01aeccb8d7 Core/ObjectMgr: Improved error message to include source of the error 
SQL: Renamed files to match standards
 2012-01-30 12:41:05 +01:00
Shauren
83e0486e59 Scripts/Icecrown Citadel: Professor Putricide will now remove Mutated Plague from players when dying 2012-01-30 12:31:59 +01:00
Nay
c62a82c674 SQL: Add missing "sql properties" to conditions field SourceId 2012-01-30 07:26:38 +00:00
Souler
75992143c1 Scripts/Spells: Fix Argent Tournament mount spells: 
* Break-Shield
 * Charge
 * Defend (visual)
 * Mounted duel
 * Faction Pennants when riding argent tournament mounts
Closes #4917.
 2012-01-30 00:21:42 +01:00
zxbiohazardzx
28249f3cb5 proper deletes before inserts, add ; on statement 2012-01-29 23:33:14 +01:00
Subv2112
89297933d9 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2012-01-29 13:50:12 -05:00
Subv2112
9de9f2883e SQL/Conditions: Added SQL update from previous commit 2012-01-29 13:49:50 -05:00
Shauren
23c44b2a16 Core/Players: Fixed talents tree specific spells to work with dual spec 2012-01-29 18:22:50 +01:00
Nay
c4588e013c Merge pull request #4932 from kandera/fix_seasonl_quest_reset 
Core/Quests&GameEvents: fix seasonal quest check
 2012-01-29 08:40:39 -08:00
Shauren
ef471da666 Core/Player: Updated talent system for cataclysm 2012-01-29 17:40:14 +01:00
Shocker
4fa1de776f SQL: Correct SQL naming/line endings for recent commits 2012-01-29 17:14:32 +02:00
Shocker
ff1964906b Merge pull request #4981 from Souler/fix_omen 
Events/Lunar Festival: Fixed behaviour of Elune's Candle, Rockets and Rocket Clusters. Implemented AI for Omen and his summoning ritual.

Closes #4939
 2012-01-29 07:11:16 -08:00
QAston
72359b3d11 Db/Quests: fix q13129 quest reward - by Jildor - closes #4633 2012-01-29 14:43:11 +01:00
QAston
1c3064080d Db/Spells: Correct spell_bonus_data for Empowered Renew - by Wallker, sql formatted by kandera:) 2012-01-29 14:00:05 +01:00
QAston
3b80efe204 Core/Spells: Fix spell Gushing Wound - by kandera - closes #4628. 2012-01-29 13:52:52 +01:00
Souler
50a6ec015e Scripts/Spells: Fixed behaviour of Elune's Candle, Rockets and Rocket Clusters. 
Scripts/NPC: Implemented AI for Omen and his summoning ritual.
 2012-01-29 03:49:55 +01:00
Subv2112
7d0ec97910 SQL/Conditions: Updated conditions with CONDITION_RACE and CONDITION_CLASS. 
Malcrom's sql
 2012-01-28 12:56:32 -05:00
burnham
162ab26328 DB/Faction change: Add some missing items 
Signed-off-by: burnham <georgiosburnham@gmail.com>
 2012-01-27 14:36:30 +01:00
Kandera
df7f98004b fix seasonal quest check 2012-01-26 10:04:12 -05:00
Malcrom
de8b5d4671 DB/SAI: added SAI for quest: Elven Legends (7481, 7482) 
closes #4948
 2012-01-26 12:30:25 +01:00
Discover-
b67b75c758 DB/Misc: Correct ending lines in last two commits 2012-01-24 21:36:30 +01:00
Discover-
52132770df Merge pull request #4944 from Souler/script_cleanup 
Convert some coded scripts to DB
 2012-01-24 12:34:52 -08:00
Discover-
126d3c8339 Scripts/Spells: Script spell Refocus 2012-01-24 21:23:05 +01:00
Souler
e552b1744c DB/Conditions: Convert Dame Evniki Kapsalis script into conditions 
DB/SAI: Convert Priestess Alorah and Grimmin scripts into SmartAI
 2012-01-24 15:12:47 +01:00
Aokromes
7c5504f75d Fix sql 2012-01-24 06:03:35 +01:00
Manuel Carrasco
78ede251b0 Scripts/UK: Improvements to my last commit. Thanks to Vincent-Michael 2012-01-23 23:15:57 -03:00
Manuel Carrasco
40c6e7bcdb Scripts/UK: Re-written Prince Keleseth script. 
* Corrected spawns amount, only 4 Skeletons must be spawned not 5.
* Adjusted timers, now they are blizzlike.
    * This also includes skeleton resurrection timer.
* Removed hacky code that was replacing spells (they are casted now).
* Implemented "On The Rocks" achievement.

Thanks to Subv for help.
 2012-01-23 20:03:06 -03:00
Discover-
14c9478c93 DB/SAI: Add SAI for Windle Sparkshine - he will now light up Dalaran when night starts in-game 
Note: requires 1b2c413933
 2012-01-23 23:14:21 +01:00
ZxBiohazardZx
ad8a975050 DB/Creature: remove creature_addon data for nonexisting creature 2012-01-22 20:13:32 +01:00
Discover-
93ecf7104c DB/SAI: Fix the last error on this file, sorry guys 2012-01-22 18:42:50 +01:00
Discover-
f0dbea1428 DB/SAI: Correct delete statements in previous commit - thanks @Malcrom 2012-01-22 18:23:12 +01:00
Discover-
6d7a64a5aa DB/SAI: Kill some start-up errors 2012-01-22 17:22:17 +01:00
Manuel Carrasco
78daae91b2 SQL/Conditions: Fixed typo, it must 23324 instead of 23342. Author: Aokromes 2012-01-22 03:45:51 -03:00
Manuel Carrasco
2f2304e0c2 SQL: Fixed startup error. Author: Aokromes. 2012-01-22 03:26:18 -03:00
Manuel Carrasco
e522160be6 Fix some errors in previous SQL updates. Author: Malcrom 2012-01-21 21:09:22 -03:00
Shocker
c04c247f20 SQL: Fix file naming after recent pull 2012-01-21 18:36:08 +02:00
Shocker
8045210d73 Merge pull request #4874 from Vincent-Michael/AchievementFix 
Core/Achievements: Fix The Alterac Blitz, Let's Get This Done and Flurry achievements
 2012-01-21 08:27:00 -08:00
kandera
e748c0fe03 DB/Creature: update vendor for Arcanum Of Torment 
Closes #4901
 2012-01-21 14:08:38 +01:00
ZxBiohazardZx
9c2767b7f4 DB/Creature: put proper spawns from sniff for 7th Legion Rifleman and converted EAI to SAI 
Should fix lagging of the Naxxramas area
 2012-01-21 13:41:16 +01:00
Vincent-Core
7f193bd828 Merge branch 'master' of git://github.com/TrinityCore/TrinityCore into AchievementFix 2012-01-19 22:31:45 +01:00
Valcorb
8fa2aa7190 DB/Quest: A Rough Ride (12536) SAI added 
Closes #4528
 2012-01-19 09:40:49 +01:00
Discover
cd968a5d4c DB/SAI: Making Sense of It J.D. Collie SAI 
Closes #3682
 2012-01-19 09:34:11 +01:00
Discover
677ef4da6d DB/SAI: Ledger from Tanaris Wooden Outhouse SAI 
Closes #3683
 2012-01-19 09:32:45 +01:00
Discover
cd16d465bf DB/SAI: The Dormant Shade: Lillith's Dinner Table SAI 
Closes #3684
 2012-01-19 09:31:14 +01:00
Discover
6383cc251d DB/SAI: Text for This is Going to be Hard 
Closes #3687
 2012-01-19 09:04:12 +01:00