Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,565 Commits 4 Branches 146 Tags
5cbe4abae3cc7aa5019ebfcfb2682a1c8ea439bf
Commit Graph

3521 Commits

Author SHA1 Message Date
Gyx
3230fc4d02 P10: Update account expansion default 3 for 4.x 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-10 10:07:22 +08:00
Gyx
d0e201eafe P6: Rename 4.x sql 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-08 09:39:12 +08:00
Nay
66e1bc1aec Change the way we deal with SQL files and merges on 4.x: 
- All SQLs will be in sql/update/world;
- If after a master->4.x merge any DB content needs to be removed, a new SQL on 4.x shall remove that content from this branch
- Old SQLs shall not be changed
(Deleted 4.x folder)
 2012-01-07 17:17:13 +00:00
Nay
9c26ce8da5 Merge branch 'master' into 4.x 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
 2012-01-07 17:13:42 +00:00
ZxBiohazardZx
7f241e5b64 DB/Commits: fix the filenaming on the files used in pull request from nelgano and fix some errors, please do not create pull requests for database fixes, the issuetracker will do... 
Closes #2732, #4461, #1860, #2026, #4187, #4569
 2012-01-06 13:54:34 +01:00
nelegalno
f3b50ffe11 Db/Loot: Fix items dropped in Narain's Special Kit 2012-01-06 13:38:26 +01:00
Discover-
5a6822174e Merge pull request #4657 from nelegalno/last_attempt_13 
Creatures with EAI flag set but no EAI script
 2012-01-06 04:35:44 -08:00
Discover-
541b040570 Merge pull request #4658 from nelegalno/last_attempt_12 
Fix Captain Vimes questrelation
 2012-01-06 04:16:36 -08:00
Discover-
3362ac8c3d Merge pull request #4668 from nelegalno/last_attempt_02 
Ogre Heaven fix PrevQuestID by shlomi1515
 2012-01-06 04:16:01 -08:00
Discover-
33498924be Merge pull request #4662 from nelegalno/last_attempt_08 
Fix Quest 11795, 11887
 2012-01-06 04:14:36 -08:00
Discover-
2625de44da Merge pull request #4664 from nelegalno/last_attempt_06 
Drowned Guardian & Phylactery Guardian summoned NPC should not give XP
 2012-01-06 04:10:19 -08:00
Discover-
43f1715c96 Merge pull request #4665 from nelegalno/last_attempt_05 
Fix Report to Gryan Stoutmantle creature_questrelation values
 2012-01-06 04:09:50 -08:00
Discover-
8e8cb98842 Merge pull request #4666 from nelegalno/last_attempt_04 
Tiger Matriarch Credit have SAI flag but no SAI script
 2012-01-06 04:08:58 -08:00
nelegalno
64d9be1a7d Creatures with EAI flag set but no EAI script 2012-01-06 13:42:49 +02:00
nelegalno
1122b7b322 Fix Captain Vimes questrelation 
Closes #4569
 2012-01-06 13:41:46 +02:00
ZxBiohazardZx
c3ac958c0c DB/Achievements: add data to match Realm First! <class> <race> 2012-01-06 12:38:48 +01:00
nelegalno
40109fd041 Fix Quest 11795, 11887 'Emergency Protocol: Section 8.2, Paragraph C', 'Emergency Supplies' by Pitcrawler 
Closes #2026 & #4187
 2012-01-06 13:34:06 +02:00
nelegalno
7def2c7b25 Drowned Guardian & Phylactery Guardian summoned NPC should not give XP fix by tobmaps 
Closes #1860
 2012-01-06 13:32:33 +02:00
nelegalno
7d72c7fef4 Fix Report to Gryan Stoutmantle creature_questrelation values by nelegalno 
Closes #4461
 2012-01-06 13:31:47 +02:00
nelegalno
6be242053f Tiger Matriarch Credit have no SAI script 2012-01-06 13:30:51 +02:00
nelegalno
14f309f72e Ogre Heaven fix PrevQuestID by shlomi1515 
Closes #2732
 2012-01-06 13:28:53 +02:00
ZxBiohazardZx
3d9d76f31c DB/Creature: Spell interruption is now part of DBC so can be removed from the mechanic immune masks 2012-01-06 10:09:17 +01:00
Shocker
736bf37d04 SQL: Fix an sql error 
Closes #4647
 2012-01-06 07:55:10 +02:00
Shocker
bad912e69d Merge branch 'master' of github.com:TrinityCore/TrinityCore 2012-01-06 07:51:14 +02:00
Shocker
0b10ded2d8 SQL: Some newline file endings 2012-01-06 07:47:57 +02:00
Shocker
e0bafc73f8 Merge pull request #4649 from Souler/fix_simon_game 
Scripts/Quest: An Apexis Relic and The Relic's Emanation and Guardian of the Monument
 2012-01-05 19:14:23 -08:00
Shocker
0412c80083 Merge pull request #4645 from Venugh/waypoint 
Core/Commands: Implement .reload waypoint_data
 2012-01-05 19:10:06 -08:00
Souler
2d8a6fdf15 Scripts/Quests: An Apexis Relic, The Relic's Emanation and Guardian of the Monument. 2012-01-06 01:19:07 +01:00
kaelima
9817771973 DB: 
- Corrected the name of one recently pushed sql file.
- Added some stuff to 728c07b888 (for The Etymidian)
 2012-01-05 21:56:18 +01:00
Venugh
b7959716ea Core/Commands: Implemented .reload waypoint_data command. (requests from Aokromes.) 2012-01-05 20:31:12 +01:00
aokromes
cc5dae032c DB/Creature: put Brother Keltan on the correct ship 
closes #1964
 2012-01-05 13:42:17 +01:00
Shauren
01900b5829 Core/Events 
* Changed how quests are linked to events (no longer in Quest class)
* Added quest validation when loading game_event_seasonal_questrelation
* Renamed fields in new table to be consistent with game_event* tables
* Corrected db data (some entries had -1 as event id)
 2012-01-05 13:27:17 +01:00
Aokromes
fc987e9a2f DB/Reputation: add correct reputation gains for ashen verdict 
closes #4353
 2012-01-05 12:57:50 +01:00
kandera
ac265d7ea2 DB/Creatures: add mechanic immune mask data to Scourgelord Tyrannus 
closes #3985
 2012-01-05 12:20:29 +01:00
malcrom
16458fa075 DB/Waypoints: Add pathing for Nethervine Inciter "Botanica" 
closes #4431
 2012-01-05 11:57:55 +01:00
kandera
031ff47e7c DB/Creature: Fix Highlord Nemesis Trainer 
closes #3942
 2012-01-05 11:44:32 +01:00
tREAk
728c07b888 DB/Creatures: Fixes the Vehicle -The Etymidian- required for Quest Reclamation (12546) 
closes #3713
 2012-01-05 11:25:07 +01:00
kaelima
aa51133d28 DB/Spells: add voices to Corrupted Ashbringer 
closes #3705
 2012-01-05 11:23:13 +01:00
shlomi1515
d8827d8a6a DB/Creature: fix position of a Stormforged Raider 
closes #3644
 2012-01-05 11:16:18 +01:00
svannon
e670f14e6f DB/Gameobject: add missing South Point Station Valve 
closes #3594
 2012-01-05 11:14:02 +01:00
svannon
7931896649 DB/Quest: The Core's Keeper add modelinfo and addon data 
closes #3460
 2012-01-05 11:00:41 +01:00
durotar
02cf6e156e DB/Quest: Need to know now has all objects 
closes #3443
 2012-01-05 10:58:18 +01:00
svannon
0d6a66a88f DB/Gameobject: add Saga of the Twins 
closes #3438
 2012-01-05 10:55:50 +01:00
zoidmann
c7e054712b DB/Scripts: correct scripttexts for The Art Of Persuasion 
closes #3423
 2012-01-05 10:50:29 +01:00
malcrom
52b6871146 DB/Gossip: Some Missing Gossip 
closes #4521
 2012-01-05 00:25:40 +01:00
malcrom
0d6a84c8f9 DB/Gossip: Missing Scholazar Basin gossip 
closes #4315
 2012-01-05 00:23:42 +01:00
malcrom
0dad9029e1 DB/Gossip: still more missing gossip 
closes #4597
 2012-01-05 00:21:32 +01:00
malcrom
74bdd6d965 DB/Gossip: Death Knight Zone Gossips 2012-01-05 00:15:46 +01:00
malcrom
b7e135a17f DB/Gossip: Missing Stormwind Gossips 
closes #4564
 2012-01-05 00:14:18 +01:00
malcrom
be02b0a873 DB/Gossip: more missing gossips 
closes #4585
 2012-01-05 00:12:17 +01:00