Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,480 Commits 4 Branches 146 Tags
9f4bdbe3d7ef8cbfaeb0318d8eaaf7499088d44d
Commit Graph

14480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nay
9f4bdbe3d7 Core/DB: Fix corpse loading prepared statements (typo introduced in merge) 2012-01-07 17:29:59 +00: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
Nay
ccf8b3889b Core/Protocol: Enable some handlers 2012-01-07 16:41:56 +00:00
Rat
3897d26317 Merge pull request #4652 from Gyx/4.x 
Gyx 4.x update
 2012-01-07 05:31:28 -08:00
Gyx
42f3f91ad4 P5: Typo... 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-07 12:28:09 +08:00
Gyx
f27cc65588 P4: Fixed some opcodes. Fixed HandleReadItem (CMSG_READ_ITEM). 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-07 10:24:35 +08:00
Kaelima
a79ea3dcdf Merge pull request #4672 from Subv/fix004 
Fixed gossip menu displaying for gameobjects with type GAMEOBJECT_TYPE_QUESTGIVER
 2012-01-06 06:37:20 -08:00
Shauren
1a8bf13cb6 Core/Events: Last part of seasonal quest loading/saving fixes (should all be one commit) 2012-01-06 15:08:21 +01:00
Shauren
5ae622678a Core/Events: Fixed saving seasonal quest status 2012-01-06 15:01:30 +01:00
Shauren
2bef633e1f Core/Events: Corrected column type when loading seasonal quest status 2012-01-06 14:58:55 +01:00
Shauren
0c2dd2dc7f Core/Events: Fixed crash when loading character_queststatus_seasonal 2012-01-06 14:57:01 +01: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
Gyx
5779884002 P3: And more opcodes. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-06 19:24:51 +08:00
Supabad
c4577db641 Core/Achievements: Add ACHIEVEMENT_CRITERIA_DATA_TYPE_S_PLAYER_CLASS_RACE 
Signed-off-by: Supabad <Supabad.trinity@gmail.com>
 2012-01-06 11:03:11 +01: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
Gyx
f31a7d8fed P2: More opcodes. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-06 16:35:17 +08:00
Gyx
a3b788ec65 P1: Fixed some opcodes, structure later update. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-06 15:39:38 +08: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
33de07e2dc Merge pull request #4641 from Subv/fix001 
Core/Vehicles: Vehicles with SAI should not kick their passengers when resetting
 2012-01-05 19:20:13 -08: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
Subv2112
d3b1c51b6e Core/Gossips: Fixed gossip menu displaying for gameobjects with type GAMEOBJECT_TYPE_QUESTGIVER, closes #4488 
Signed-off-by: Subv2112 <s.v.h21@hotmail.com>
 2012-01-05 21:41:17 -05:00
Subv2112
235b941964 Fixed a typo 
Signed-off-by: Subv2112 <s.v.h21@hotmail.com>
 2012-01-05 19:46:46 -05: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
Subv2112
d889edb436 Core/SAI: Self-casted auras should not be removed when the NPC resets 
Signed-off-by: Subv2112 <s.v.h21@hotmail.com>
 2012-01-05 15:09:55 -05:00
Venugh
b7959716ea Core/Commands: Implemented .reload waypoint_data command. (requests from Aokromes.) 2012-01-05 20:31:12 +01:00
Discover-
d5e740c6a7 Merge pull request #4643 from Aokromes/master 
Fix typos introduced in 65a427a322
 2012-01-05 10:33:50 -08:00
Aokromes
995fa11e01 This is ........... 3 commits to fix the typos of 3 rows.... 2012-01-05 19:11:04 +01:00
Subv2112
8197c37a92 Vehicles with SAI should not kick their passengers when resetting 
Signed-off-by: Subv2112 <s.v.h21@hotmail.com>
 2012-01-05 12:11:58 -05:00
aokromes
cc5dae032c DB/Creature: put Brother Keltan on the correct ship 
closes #1964
 2012-01-05 13:42:17 +01:00