Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,902 Commits 4 Branches 146 Tags
c9fc56364bbb89ea18f5206b43e55e2b7aa652bd
Commit Graph

1897 Commits

Author SHA1 Message Date
Subv
d82266bc0e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level2.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Kalimdor/azuremyst_isle.cpp
	src/server/shared/Logging/Log.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
 2012-08-07 13:44:22 -05:00
Nay
4d8b06d0bd DB/Schema: Change basehp/mana/armor in creature_classlevelstatus to unsigned mediumint 
There's no reason to be cheap...
 2012-08-06 19:21:04 +01:00
Nay
b72373f1ee Core/Creature: Add basehp3 to creature_classlevelstats 2012-08-06 19:11:30 +01:00
Spp
483fb42306 Core/Logging: Move player delete logging to new type LOG_FILTER_PLAYER_DELETE (34). Also add missing sql from 55ce180f28 2012-08-06 08:49:31 +02:00
Nay
c6c9f7b58f Scripts/Commands: remove reload item_set_names and locales_item_set_name 2012-08-05 19:49:59 +01:00
Subv
2c20cc98c9 Core/Protocol: Removed SMSG_ITEM_NAME_QUERY_RESPONSE, it no longer exists 2012-08-05 10:13:48 -05:00
Subv
0e581b7991 Core/Items: Removed no longer needed code for item set names and item set names locales 2012-08-05 10:09:56 -05:00
Vincent-Michael
cc0ff69ca4 Core/Commands: 
* Add remove support for disable command
* Add quest disables support
* Add check for no existent entry
* Fix problems with flags 0
* Fix code style
 2012-08-05 02:02:35 +02:00
Subv
d9da2e8e50 Core/Player: Use DBC data to set the correct amount of hp and mana based on player level and class 2012-08-04 11:33:49 -05:00
TheSensei
63f8cf2770 DB/Quest: add quest&seasonal relations for Midsummer Fire Festival 2012-08-04 18:33:29 +02:00
ZxBiohazardZx
0deaa521bc DB/Disables another 39 deprecated quests 2012-08-04 17:43:45 +02:00
ZxBiohazardZx
61c93deecf DB/Disables: add priest T3 as well, stupid "of Faith" suffix got unnoted 2012-08-04 17:23:57 +02:00
ZxBiohazardZx
6a7dc4d28b DB/Disables: add T3 deprecated quests 2012-08-04 17:16:34 +02:00
ZxBiohazardZx
0b3343dd68 DB/Quest: Add questrelations for Honor the Flame quests 
Closes #5989
 2012-08-04 16:57:08 +02:00
ZxBiohazardZx
71b0dc94c1 DB/Quest: add dungeonflag for rewardquests 2012-08-04 16:28:38 +02:00
ZxBiohazardZx
d2ae736f6d DB/Disables: another 26 related to BG's deprecated. also fixed an SQL syntax error on previous file, wrong file got committed 2012-08-04 16:17:48 +02:00
ZxBiohazardZx
5c73852382 DB/Disables: disable 35 deprecated CtA quests 2012-08-04 15:59:34 +02:00
ZxBiohazardZx
76ef6e45a2 DB/Disables: Disable 35 quests named OR containing a - that should not be attainable 2012-08-04 15:42:50 +02:00
ZxBiohazardZx
c4d01e58c4 DB/Disables: Disable 21 quests named REUSE or UNUSED 2012-08-04 15:08:12 +02:00
ZxBiohazardZx
0285425c3e DB/Disables: Disable 47 placeholders and deprecated quests 2012-08-04 14:38:42 +02:00
ZxBiohazardZx
1dd2a70cd5 DB/Disables: Disable 217 quests that shouldnt be attainable ingame, part of a cleanup 2012-08-04 13:53:23 +02:00
kaelima
e72f01650c Core/Misc: Minor update to SMSG_GUILD_QUERY_RESPONSE, added a value to enum MailStationery, some comments to a few dbcs. 
DB: Renamed merged sql files
 2012-08-02 08:04:12 +02:00
Kaelima
6ae147aa80 Merge pull request #7065 from Vincent-Michael/PainAndSuffering 
Core/Spells: Fix Pain and Suffering reduces damage
 2012-08-01 22:56:51 -07:00
Kaelima
99d3918d34 Merge pull request #6800 from Vincent-Michael/cod 
Core/Spells: Fix Curse of Doom (thx to Warpten / joschiwald for helping)
 2012-08-01 22:56:30 -07:00
Exodius
e655bf6e1d DB/Loot: Add missing loot item, fixes quest zeth'gor must burn 
Closes #7237

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-08-01 18:38:43 +01:00
Nay
a14b89c0f3 DB/Creature: Re-guid 3 npc spawns added in previous commit 
Thanks to Aokromes for noticing the high guids
 2012-08-01 18:24:36 +01:00
Trista
6f332385e2 DB/SAI: Fix quests Words of Power 
Ref #79
Ref #2259
Closes #4638
Closes #7249

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-08-01 18:01:11 +01:00
shlomi1515
c8ac3144f2 DB/SAI: Fix quest Measuring Warp Energies 
Closes #2367
Closes #6266

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:53:29 +01:00
Nay
3439adea78 DB/Gossip: Fix innkeeper Keldamyr 
Closes #2223
 2012-07-29 03:45:40 +01:00
tharaca
4fa57d7b2c DB/SAI: Fix quest Meeting at the Blackwing Coven 
Closes #2564
Thanks to nelegalno and gecko32

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:30:57 +01:00
ZxBiohazardZx
d0e63ea07e DB/SAI: Reward box on quest Nolkai's Words completion 
Closes #3083

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:25:43 +01:00
WishToDie
64b6a77af5 DB/SAI: Better implemention of quest "Argent Crusade, We Are Leaving!" fix 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:21:20 +01:00
WishToDie
524a3662da DB/SAI: Fix quest Life or Death 
Closes #3317

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:13:23 +01:00
Alestaan
f5db194352 DB/SAI: Fix quest Draconis Gastritis 
Closes #3439

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:08:31 +01:00
Valcorb
b138428f8a DB/SAI: Fix quest Truce 
Closes #6453

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:03:36 +01:00
shlomi1515
d7d023c362 DB/SAI: Fix quest Argent Crusade, We Are Leaving! 
Closes #3229

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 03:02:45 +01:00
Vincent-Michael
86042facd7 DB/Quests: Nether-Stalker Mah'duun and Wind Trader Zhareem Quest Pooling 
Closes #7186
Closes #7187

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 02:52:16 +01:00
Odyssey
bbc649a45f DB/Faction Change: Faction change item/spell conversion for Reins of the Traveler's Tundra Mammoth 
Closes #7174

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-29 02:47:56 +01:00
Shauren
fc453ab623 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-23 00:13:13 +02:00
durotar
c00a485bb7 DB/SAI: Fix quest Reclusive Runemaster 
Closes #6765
Closes #1873

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 03:07:09 +01:00
durotar
ec0163562c DB/GOs: Missing spawn and pooling for Inconspicuous Landmark (Tanaris) 
Closes #6771

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 03:04:45 +01:00
SignFinder
c2ab5ee974 DB/Conditions: Missing condition for gameobject Sha'ni Proudtusk's Remains 
Closes #6863

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:59:20 +01:00
Exodius
3f986a8f66 DB/NPCs: Proper flags for Night Elf Corpse 
Closes #6928

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:54:27 +01:00
durotar
72f42e2c14 DB/NPCs: Add missing conditions for Exarch Menelaous & quest 
Closes #6952

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:51:19 +01:00
Exodius
2ed3676896 DB/NPCs: Remove onkill reputation from Fire Beetle 
Closes #6953

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:48:57 +01:00
trista
f9317e06b2 DB/NPCs: Spell vehicles and immunities for Salvaged Chopper - 25 version (Ulduar) 
Closes #7010
Closes #4076

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:46:29 +01:00
trista
61d725247a DB/SAI: Fix achievements Dwarfageddon 10/25 
Closes #7007
Closes #4235

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:42:38 +01:00
Trista
63a29bb292 DB/SAI: Scripts for Liquid Pyrite (Ulduar) 
Closes #7021

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:39:16 +01:00
Kinzcool
9e950fc27d DB/NPCs: Add many missing gossips to multiple creatures 
Closes #7003

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:37:24 +01:00
durotar
63555231a9 DB/Scripts: Fix a text in Trial of the Crusader, Twin Valkyrs 
Closes #7055

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-07-22 02:34:17 +01:00