Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,226 Commits 4 Branches 146 Tags
56cd111c64cecaa9ac5df0a1e57cd3fdcd6a19b8
Commit Graph

3776 Commits

Author SHA1 Message Date
Spp
5cff9e0716 Merge branch 'master' into 4.x 
Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
 2012-02-23 13:06:35 +01:00
Nay
9219625243 DB/Conditions: Fix remaining DB sql errors 2012-02-22 23:05:31 +00:00
w1sht0l1v3
1fc122e5c6 DB/Quests: Mounting Hodir's Helm. 
DB/Quests: Quest relations for Polishing the Helm.
Closes #5231
 2012-02-22 22:38:16 +00:00
Malcrom
1536a340af db/loot: Fix sql add line at end. 2012-02-22 14:09:45 -03:30
Malcrom
f2891f61da db/text: Invisible Stalker text for Wintergrasp 2012-02-22 13:21:09 -03:30
Malcrom
7da99c4589 db/SAI: Move Kalaran Windblade script to SAI and improved scripting and gossip. 2012-02-22 12:59:46 -03:30
Malcrom
6870ee5848 db/Gossip: Some missing Gossip data from Pitcrawler & myself 2012-02-21 20:11:41 -03:30
Malcrom
0cb8bc12ee Fix typo on previous commit 2012-02-21 20:07:36 -03:30
Malcrom
74fc13596c DB/Scripts: Remove 2 cpp scripts in Searing Gorge and replace with SAI. 2012-02-21 20:03:12 -03:30
ZxBiohazardZx
9dbcdf0eb1 DB/Loot: Add loot for Apprentice Osterkilgr 
Closes #5269
 2012-02-21 20:44:35 +01:00
Gecko32
3b8510e65a DB/Loot: lower some green dropchances to more acceptable rate 
Closes #5269
 2012-02-21 20:42:13 +01:00
ZxBiohazardZx
ce819b21b9 Renumber the file & typofix on 2012_02_21_creature_loot_template 2012-02-21 20:29:02 +01:00
ZxBiohazardZx
a6bfce2e1a DB/Loot: Add loot to Crown <name> 
Closes #5248
 2012-02-21 20:21:57 +01:00
QAston
18948755ca Merge. 2012-02-21 20:17:45 +01:00
QAston
f09b5a6bea Core/Db/Conditions: 
-Drop condition CONDITION_SPELL_SCRIPT_TARGET, use other condition types instead
-Change CONDITION_SOURCE_TYPE_SPELL_SCRIPT_TARGET to CONDITION_SOURCE_TYPE_SPELL_IMPLICIT_TARGET:
--allow using this condition for more spell implicit target types (not just ENTRY)
--SourceGroup value for this src type is now effMask and it's now required

Core/Spells: Unify the way implicit targets are handled, fully implement some partially implemented target types, fix some minor bugs found on the way, general improvements and cleanup.
 2012-02-21 20:17:45 +01:00
ZxBiohazardZx
6155fdd103 DB/Loot: Updated trashloot for Hellfire Citadel 
Closes #5296
 2012-02-21 20:04:31 +01:00
Machiavelli
16818d7548 Core/Conditions: Convert npc_spellclick_spells data to condition system. This implements CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT (previous CONDITION_SOURCE_TYPE_UNUSED_18). Wiki needs to be updated accordingly. 2012-02-20 23:25:59 +01:00
Malcrom
1155161916 db/misc: Fix a few errors 2012-02-20 18:51:46 -03:30
Nay
7be89c89b0 DB/SAI: Set a few restrictions on SMART_EVENT_UPDATE_OOC. These actions should not be performed every few milliseconds. 2012-02-20 15:35:05 +00:00
Malcrom
6ac6431e4d db/text: fix talk text for Erich Lohan. Removed them from waypoints and added to SAI 2012-02-19 22:04:25 -03:30
Malcrom
35bc842fde Scripts/npc_sergeant_bly: Talk text was placholders. Replaced with Creature text. 2012-02-19 21:30:43 -03:30
Malcrom
355fe08e04 DB/Misc: Some gossip and inhabittype updates 2012-02-19 16:57:30 -03:30
leak
8e3a4b956e Core/Warden: Base implementation for Warden functionality 
Note: The default config file action for clients failing the checks can be changed for each check via the characters.warden_action table

Credits to TOM_RUS
 2012-02-19 13:51:16 +01:00
leak
f0f68f15a8 DB/Schema: Update auth db base SQL to recent mysqldump format 2012-02-19 13:21:14 +01:00
CDawg
a2d128286e DB/GOs: (Re?)Add meeting stone to UK 
Closes #5232
 2012-02-19 00:27:42 +00:00
nelegalno
306666dd6f DB/Quests: Proper required classes for Dire Maul book quests 
Closes #4753
 2012-02-19 00:08:43 +00:00
nelegalno
465b6a0978 DB/Quests: Proper required races and quest relations for Shadowmourne quest line 
Closes #4775
 2012-02-19 00:06:54 +00:00
Malcrom
de823937b7 DB/Gossip: Cleanup sql updates 2012-02-18 19:45:14 -03:30
Malcrom
ee1fb1dd8c DB/Gossip: Fix error in Fallen Hero of the Horde gossip 2012-02-18 19:40:46 -03:30
Malcrom
f87da6d664 DB/Gossip: Fix gossip for Fallen Hero of the Horde and remove cpp script. 2012-02-18 15:38:51 -03:30
Malcrom
f7a0f59e80 DB/Gossip: Some missing Nagrand Gossip converted from UDB and conditions added by Pitcrawler. 2012-02-18 14:18:19 -03:30
Nay
c91ec2eede DB/NPCs: Fix MovementType & waypoints 
Should kill the "missing path id 0" spam.
 2012-02-18 16:43:33 +00:00
Vincent-Michael
20dd507882 DB/Script Names: Fix some typos in spell_sha_healing_stream_totem 
(c517806a23)
 2012-02-18 16:01:15 +00:00
Malcrom
a67b3116e9 DB/Gossip: Rouge & Hunter Class Trainers gossip fixup & missing gossip from Zabra'jin in Zangermarsh & Thunderlord Stronghold in Blade's Edge Mountains 2012-02-18 09:18:12 -03:30
Malcrom
958c32b026 Move gossip for Lore Keeper of Norgannon to db. Remove cpp script. Also rename some incorrectly named sql updates. 2012-02-18 08:27:00 -03:30
QAston
e212116b1f Update file names after pull request merge. 2012-02-18 12:15:52 +01:00
Kandera
c517806a23 Scripts/Spells: Convert code from Spell::EffectDummy to spell scripts. 2012-02-18 12:12:49 +01:00
Malcrom
590025181a Waypoints for Eye of Thrallmar spawns in Hellfire 2012-02-17 22:33:17 -03:30
QAston
e47ec04b4d Core/Db/Conditions: Drop CONDITION_CREATURE_TARGET, CONDITION_TARGET_HEALTH_BELOW_PCT, CONDITION_TARGET_RANGE and 3rd parameter for CONDITION_AURA. Instead of those use other available conditions, which are not limited to player's selection only. 2012-02-16 13:16:43 +01:00
QAston
ad6613261c Core/Db/Conditions: Drop usage of CONDITION_ITEM_TARGET and CONDITION_SOURCE_TYPE_ITEM_REQUIRED_TARGET and use CONDITION_SOURCE_TYPE_SPELL instead. 2012-02-16 12:09:09 +01:00
Subv
86537a1a52 Fixed proc of Misery. Thanks errodia. closes #3565 2012-02-15 20:25:51 -05:00
Nay
268fe961fb DB/SAI: Fix Ogre Pinata 
Closes #4862
 2012-02-15 22:22:21 +00:00
Nay
ef61476235 SQL: Fix an issue with creature guids. Please, re-apply these SQLs (2012_02_15_07_xx) 
Thanks to Aokromes for spotting the issue (as always)
 2012-02-15 15:04:06 +00:00
Nay
07b5bbe56f DB/Quests: Quest ender for quest Something is in the Air (and it Ain't Love) (A) 
Closes #5246
 2012-02-15 14:30:39 +00:00
Nay
030f78a223 DB/Misc: Many LiiA fixes 
- Alliance quest chain
- GO loot
- Various spawns
Original fix by resh-u
Closes #5099
 2012-02-15 14:19:31 +00:00
Vincent-Michael
1c59ac6fad DB/Quests: PrevQuestId for Love is in the Air quests 
Ref #5099
 2012-02-15 12:45:32 +00:00
Albis
095eae1d65 DB/Quests: Completion and Progress texts for Love is in the Air quests 
Ref #5099
 2012-02-15 12:41:44 +00:00
Nay
37a5dc580a DB/Items: Add item_template for item Crown Chemical Co. Supplies 
4.2.2 data
 2012-02-15 12:36:46 +00:00
Nay
9cd4b3a75e DB/Inns: Add missing areatrigger_tavern 
Data from UDB, thanks Aokromes for gathering them.
Closes #4770
 2012-02-15 12:19:43 +00:00
Nay
a58c44bc89 DB/Quests: Completion and Progress texts for the quest The Power to Destroy... 
Source: http://www.wowwiki.com/Quest:The_Power_to_Destroy...
Closes #5247
 2012-02-15 12:15:06 +00:00