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,878 Commits 4 Branches 146 Tags
43f0b67e99ed96df7dd9bbc64d5ffbcf8af2511f
Commit Graph

7757 Commits

Author SHA1 Message Date
Vincent-Michael
949cbc23cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-05 22:03:43 +02:00
Dr-J
32903b080e DB/Misc: Couple more scripts 
* Repeating eent between Harbinger Vurenn, General Arlos and Counselor Talbot in Valiance Keep
* Script, text and conditions for Crusader of Virtue
 2014-10-05 17:52:52 +01:00
Aokromes
df516dd5ce DB/Creature: correct spawn of 5 creatures 2014-10-05 09:49:41 +02:00
Aokromes
9db31555e9 DB/Creature: BroadcastTextID for npc_text 
By 41782992, closes #13275
 2014-10-05 09:02:10 +02:00
Vincent-Michael
689b7f6d56 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-05 03:44:35 +02:00
Vincent-Michael
adefe39bf6 DB/Brewfest: Added missing brewfest spawn in shatttath 2014-10-05 03:21:26 +02:00
Vincent-Michael
f989c7182c Core/Misc: Added support for calculate zoneId/areaId for creature / gameoject table at loading (Slow server startup ca.3-4 sec.) 2014-10-05 01:57:37 +02:00
Aokromes
5a8f27dda1 DB/Creature: K3 Perimeter Turret 
By cr4st, closes  #13158
 2014-10-05 01:06:52 +02:00
Aokromes
2272c63c35 DB/Creature: Linda Ann Kastinglow & Arcanist Alec 
By Killyana. closes #12524
 2014-10-05 01:01:03 +02:00
Aokromes
d08c3776b7 DB/Gossips: Assigned some gossips to their BroadcastTextId 
By 41782992, closes https://github.com/TrinityCore/TrinityCore/issues/13239
 2014-10-05 00:04:53 +02:00
MitchesD
b4e5384d27 DB/SAI: fix more startup errors 
Updates https://github.com/TrinityCore/TrinityCore/issues/13256
 2014-10-04 18:50:42 +02:00
Vincent-Michael
973df92043 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-04 16:32:14 +02:00
MitchesD
4c4f2b5645 DB/SAI: fixed some startup errors 
Updates https://github.com/TrinityCore/TrinityCore/issues/13256
 2014-10-04 15:44:44 +02:00
Vincent-Michael
a73cee97e2 SQL: Fix typo :/ 2014-10-04 04:20:17 +02:00
Vincent-Michael
8ff3c3a285 DB/Spells: Convert spell_dbc from branch master without effect data 2014-10-04 04:17:07 +02:00
Vincent-Michael
995ace8988 SQL: Fix typo 2014-10-04 03:52:47 +02:00
Vincent-Michael
90b3e69b06 DB/Spells: Convert some spells dbc stuff from branch master 2014-10-04 03:41:47 +02:00
Vincent-Michael
10e8a110e6 DB/Spells: Fix typo 2014-10-03 19:03:50 +02:00
Vincent-Michael
caeb933d9e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-02 22:36:58 +02:00
Vincent-Michael
4322a0dc37 DB/Quests: Fix half sleep fail in 6a47175523 2014-10-02 19:54:25 +02:00
Vincent-Michael
3545d60b7d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-02 05:50:35 +02:00
Vincent-Michael
6a47175523 Core/Spells: Added hack for "Bark for the Barleybrews!" quest credit (for alliance-side) (meh, blizzard :/) 2014-10-02 05:49:32 +02:00
Vincent-Michael
7696bec538 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-01 21:25:41 +02:00
Vincent-Michael
6357560186 Core/Spells: Added hack for "There and Back Again" quest credit (for alliance-side) (meh, blizzard :/) 2014-10-01 20:53:16 +02:00
Vincent-Michael
faa4fc1b31 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-30 22:33:30 +02:00
Vincent-Michael
f9cf45981f DB/Brewfest: Convert some brewfest for alliance: 
- Fix Quest "Bark for the Barleybrews!" (for Alliance-side)
- Fix Quest "Bark for the Thunderbrews!" (for Alliance-side)
 2014-09-30 22:07:26 +02:00
Vincent-Michael
364f32f1ba DB/Brewfest: Convert some brewfest for alliance: 
- Fix Quest "There and Back Again" (for Alliance-side)
- Fix Quest "Now This is Ram Racing... Almost." (for Alliance-side)
 2014-09-30 21:33:33 +02:00
Vincent-Michael
479afe6123 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-30 18:20:20 +02:00
Dr-J
3f5e3a877a DB/Misc: The Green Hills of Stranglethorn (3.3.5) 
Script replacement of misplaced chapters if player is rewarded for quest which rewards chapter but does not have item and has not turned in quest 338.
 2014-09-30 16:07:24 +01:00
Mihapro
79936ef1b0 DB/Quests: Fear No Evil quest script 
Closes #13236
Fixes #12331
 2014-09-29 14:17:24 +01:00
DDuarte
f805d04941 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-29 12:48:34 +01:00
Kinzcool
35b267e7f7 DB/Gossips: Added some more assignation to their proper BroadcastTextID 2014-09-29 06:54:04 -04:00
Aokromes
b705e7093c DB/Quest: Fix more locales on 3.3.5a 2014-09-29 04:50:20 +02:00
Kinzcool
70bf81ad1b DB/Gossips: Added a missing one from 8983fbba53 2014-09-28 22:32:53 -04:00
Kinzcool
8983fbba53 DB/Gossips: Localized talents gossips by assigning them to their BroadcastTextID 
* Closes #12546
 2014-09-28 21:54:51 -04:00
Aokromes
9657d1879a Rename 2014_09_28_00_world_conversion.sql to 2014_09_28_00_world.sql 2014-09-28 11:02:49 +02:00
Aokromes
653641e679 DB/Misc: Fix startup errors 2014-09-28 11:00:46 +02:00
Kinzcool
acb2a35fcb DB/BroadcastText: Assigned BroadcastTextIDs to some texts 2014-09-27 23:23:15 -04:00
Vincent-Michael
aa638d9bc7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Loot/LootMgr.cpp
 2014-09-28 04:25:15 +02:00
Vincent-Michael
bcfc2911b4 SQL: Fix sql import on unix 2014-09-28 04:09:40 +02:00
Malcrom
8a7f06fe43 DB/Loot Template: If I put the updates sql in the right dir in the first place none of this would be happening... 2014-09-27 22:49:56 -02:30
Malcrom
0d92b4cc15 DB/Loot: Update SQL 2014-09-27 22:46:07 -02:30
Malcrom
55b43c6751 Core/LootMgr: Update lootMgr to normalize loot_template tables 2014-09-27 22:40:58 -02:30
Aokromes
e755502a7f Update 2014_09_22_00_world.sql 
Fix travis import
 2014-09-27 22:01:27 +02:00
Vincent-Michael
774195a935 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-27 12:45:29 +02:00
Nyeriah
3282dea5c5 DB/SAI: Re-add SAI for Sprinkle that was accidentally deleted at d672e78a5b 2014-09-27 06:29:04 -03:00
Vincent-Michael
da91ae1f22 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-09-27 05:23:46 +02:00
Vincent-Michael
eccc6e97ea SQL: meh, save button 2014-09-27 02:17:06 +02:00
Vincent-Michael
ebdf156212 DB/Gameobject: Fix wrong "Brewfest Banner" position in durotar 2014-09-27 02:14:57 +02:00
Vincent-Michael
a6a23a73af Misc/Brewfest: Fix Quest "11407 - Bark for Drohn''s Distillery!" / "11408 -Bark for T''chali''s Voodoo Brewery!" 2014-09-27 01:19:20 +02:00