Commit Graph

8124 Commits

Author SHA1 Message Date
Vincent-Michael
7462fa63fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 00:14:53 +02:00
Vincent-Michael
ba2563da5a Core/Spells: Convert "Shaman T10 Elemental 2P Bonus" in spell script 2014-07-07 21:50:18 +02:00
Vincent-Michael
e1a3908c85 SQL: rename now correct ... 2014-07-07 16:52:44 +02:00
Vincent-Michael
3604ca83c1 And github editor sucks too :/ 2014-07-07 16:50:30 +02:00
blub
e9b06e416a Rename sql/updates/world/ 2014_07_07_02_world_spell_game_event_creature.sql to sql/updates/world_2014_07_07_02_world_spell_game_event_creature.sql
Aokromes you sucks :P
2014-07-07 16:43:23 +02:00
Aokromes
3ed700da3c DB/Creature: Midsummer Fire Festival Spawns
By Gooyeth
2014-07-07 16:32:04 +02:00
untaught
f64add02e8 Core/Spells: fixed Fate Rune of Unsurpassed Vigor 2014-07-07 16:27:09 +02:00
Aokromes
fb52609c3e DB/Creature: Add 2 missing texts to Opus 2014-07-07 13:35:50 +02:00
Vincent-Michael
9799a88c8d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-07 09:58:43 +02:00
Aokromes
072787b58f DB/Quest: Kaw the Mammoth Destroyer
By dr-j, closes #12409
2014-07-06 13:29:23 +02:00
Aokromes
6c757c4ae9 DB/Quest: Steady as a Rock?
By untaught, closes #3976
2014-07-06 10:03:26 +02:00
Vincent-Michael
79286ef743 TDB 434.6 - 2014/07/05 2014-07-06 00:24:01 +02:00
Vincent-Michael
249e08f830 SQL: Rename for 4.3.4 release 2014-07-05 23:48:27 +02:00
Vincent-Michael
1b02c85c17 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-05 23:44:33 +02:00
Vincent-Michael
8edecb0da6 TDB 335.54 - 2014/07/05 2014-07-05 22:50:21 +02:00
Gacko
3e33120dc8 DB/Spell: Gain focus for using Steady Shot and Cobra Shot
Thanks @RezolveX
2014-07-05 20:34:10 +02:00
Gacko
03b1464412 Wrong branch... 2014-07-05 20:33:43 +02:00
Gacko
65170d8aa4 DB/Spell: Gain focus for using Steady Shot and Cobra Shot
Thanks @RezolveX
2014-07-05 20:31:43 +02:00
Vincent-Michael
722a5ba7ee Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
2014-07-05 20:14:14 +02:00
Vincent-Michael
63784fee2a SQL: Fix end of file 2014-07-05 19:44:31 +02:00
Dr-J
23e4dfd8e8 DB/SAI: Fix db startup errros 2014-07-05 19:41:57 +02:00
Vincent-Michael
7008ac98aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-05 14:29:12 +02:00
Vincent-Michael
a508ce1976 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
2014-07-05 14:28:58 +02:00
Aokromes
2042b09526 DB/Creature: Fix Abyssal Flamewalker
By mario-64 and dr-j, closes #10699
2014-07-05 08:28:32 +02:00
Shauren
53a469a52b DB/Skills: Corrected languages for night elves, taurens and blood elves 2014-07-04 18:03:59 +02:00
Shauren
70daf21554 Rename 2014_07_01_02_world playercreateinfo_skills.sql to 2014_07_01_02_world_playercreateinfo_skills.sql 2014-07-04 14:27:27 +02:00
joschiwald
7b74a725c8 Core/Spells: fixed Deep Freeze after 2a3546ca36
Closes #12424
2014-07-03 22:32:41 +02:00
Aokromes
37f7cc4615 DB/Items: Fix typos on 4c3cb80
By dr-j
2014-07-03 12:26:40 +02:00
Aokromes
13f849aea8 Rename 2014_06_20_01_world_spell_dbc.sql to 2014_06_20_01_world_creature_text.sql 2014-07-03 08:32:14 +02:00
Aokromes
9f0698b605 DB/Vendor: Add Arcanum of the Stalwart Protector reputation version 2014-07-02 14:48:04 +02:00
Aokromes
4c3cb8038a DB/Items: Fix realtime duration of event items
By dr-j closes #12421
2014-07-02 13:33:10 +02:00
Aokromes
2ca24b0906 DB/SAI: Fix Cosmetic Chains on Kirgaraak
By dr-j, closes #12420
2014-07-02 13:30:56 +02:00
Aokromes
1e15c577eb DB/Misc: Fix some runtime errors/incorrect triggers
By dr-j
2014-07-02 09:53:30 +02:00
Shauren
abb16a521a Update 2014_07_01_02_world playercreateinfo_skills.sql
Fixed table name
2014-07-01 17:33:44 +02:00
Shauren
2a3546ca36 Core/Skills: Use SkillLineAbility.dbc to determine player initial spells - skill assignment done in a new table playercreateinfo_skills
* Removed DK start skill hacks
* Resolved missing skills in character skill tab

Closes #12311
2014-07-01 17:20:48 +02:00
Aokromes
d4cec6b397 DB/Misc: Fix some startup errors
By dr-j
2014-07-01 16:14:14 +02:00
Aokromes
4a05a082fd DB/Quest: The Left Piece of Lord Valthalak's Amulet
By dr-j, closes #11753
2014-07-01 12:18:16 +02:00
Vincent-Michael
39140fe1cc DB/Locale: Fix some locales problems
Preparation for tdb release in soon soon (Fix first db errors) :P
2014-06-29 23:52:19 +02:00
Aokromes
a1bbadbfc7 Rename 2014_06_29_02_world_misc.sql to 2014_06_29_02_world_misc.sql 2014-06-29 19:28:47 +02:00
Aokromes
ef8549c6a6 DB/Misc: correct some trinity_string encoding
By easy1, closes #11912
2014-06-29 18:42:49 +02:00
Vincent-Michael
3cb066f6fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Handlers/MailHandler.cpp
2014-06-29 17:32:12 +02:00
Aokromes
f8720d5be0 DB/Quest: Added the proper special flags to one quest 2014-06-29 10:11:26 +02:00
Aokromes
8556d00c9c DB/Misc: Add gossip_menu_options and conditions to multiple trainers
By dr-j
2014-06-29 05:17:07 +02:00
Vincent-Michael
a3e34f5621 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 23:06:10 +02:00
Aokromes
a36925937a DB/Misc: Add conditions to one mage trainer
By dr-j.
2014-06-28 22:04:46 +02:00
Vincent-Michael
3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
2014-06-28 21:07:41 +02:00
jackpoz
1bd4ff6cb9 Revert "Scripts/Ulduar: Implement Mimiron" 2014-06-28 13:49:34 +02:00
Trisjdc
0ac6f16896 Merge pull request #12268 from Unholychick/patch_mimironnew
Scripts/Ulduar: Implement Mimiron
2014-06-28 12:17:32 +01:00
Aokromes
68958205d4 DB/Conditions: Arcanum of the stalwart protector
Closes #10163
2014-06-28 03:57:17 +02:00
Aokromes
c97a994564 DB/Misc: Karen No (and related quests)
By Wylath, closes #9217
2014-06-28 03:37:46 +02:00