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

1440 Commits

Author SHA1 Message Date
kaelima
fc673fce92 Core/Protocol: Missing changes from ac81411db4 2012-03-30 15:13:54 +02:00
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
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
Nay
bbfceafed6 Actually remove searing_gorge.cpp from CMakeLists, sorry. 2012-02-22 20:12:45 +00:00
Nay
a7e5c3c7c4 Misc: Delete searing_gorge.cpp and fix a typo in worldserver config 2012-02-22 19:56:23 +00:00
Malcrom
0fba6e70f6 scripts: Searing Gorge wasn't cleaned up properly. 2012-02-22 14:06:50 -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
Machiavelli
a3f3058499 Core/Vehicles: Remove some wrong/redundant calls to Unit::ExitVehicle. The aura system already handles it in most places. 
Also add some documentation on upcoming work on making passenger exit positions work.
 2012-02-22 12:26:05 +01:00
Spp
1e246cb66c Fix build (gcc) and fix warnings 2012-02-22 09:15:57 +01:00
Malcrom
74fc13596c DB/Scripts: Remove 2 cpp scripts in Searing Gorge and replace with SAI. 2012-02-21 20:03:12 -03:30
frozenarmor
d35356a7ae Scripts/PoS: Fix error in Forgemaster Garfrost text. 
Signed-off-by: frozenarmor <venom.victorios@gmail.com>
 2012-02-22 03:14:34 +05: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
Malcrom
35bc842fde Scripts/npc_sergeant_bly: Talk text was placholders. Replaced with Creature text. 2012-02-19 21:30:43 -03:30
Subv
c6f4ab10e1 Core/Scripts: Fixed Thrall's weapon and shield models in Old Hillsbrad Foothills. 
closes #3904

Signed-off-by: Subv <s.v.h21@hotmail.com>
 2012-02-19 19:01:03 -05:00
click
5cd6165ab1 Core/Scripts: Add a forgotten header after stash/reapply sequence from last commit 2012-02-19 17:30:41 +01:00
click
dce3bc01ac Core: Fix non-PCH building 2012-02-19 16:57:07 +01:00
Nay
3b1cd7caea Scripts/Spells: Remove debug leftover from spell_dru_starfall_dummy 2012-02-19 15:36:38 +00:00
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
mweinelt
e48290d2cc Scripts/EoE: Fix achievement You Don't Have An Eternity (10+25) 
Closes #5273
 2012-02-18 23:54:46 +00:00
Nay
0a0233b215 Core/Packets: Use a single method to send SMSG_ACTIVATETAXIREPLY 
Also fix a typo introduced in 703ad4889
 2012-02-18 23:03:41 +00:00
Nay
703ad48890 Scripts/Spells: Revert a little part of spell_dru_starfall_dummy (original code) 
Thanks to Drago for testing
Closes #5305
 2012-02-18 21:26:24 +00:00
vincent-michael
34a41d0152 Scripts/Spells: Use correct spell and fix crash in spell_item_impale_leviroth 2012-02-18 21:18:02 +00:00
Malcrom
f87da6d664 DB/Gossip: Fix gossip for Fallen Hero of the Horde and remove cpp script. 2012-02-18 15:38:51 -03:30
click
5411e1ce52 Core: Clean up whitespace and tabs in the base sourcetree 2012-02-18 16:52:08 +01:00
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
Kandera
c517806a23 Scripts/Spells: Convert code from Spell::EffectDummy to spell scripts. 2012-02-18 12:12:49 +01:00
Shauren
41d99a474c Scripts/Icecrown Citadel: Remove obsolete code since spline movement implementation 2012-02-16 21:47:33 +01:00
leak
88905ae70f Scripts/Spells: Missing break; and trailing whitespace (tss...) 2012-02-16 16:13:00 +01:00
Spp
03c34ee507 Fix a lot of warnings 2012-02-16 13:56:28 +01:00
Anubisss
ccb80da1e1 Fixed crash in the Twin Valkyrs encounter in ToC. closes #4915 2012-02-15 19:57:57 -05:00
QAston
210fa7743d Scripts/Auras: fix spell_trash_mob_glacial_strike script, original patch by cemak. 
Closes #5196.
 2012-02-15 23:48:43 +01:00
QAston
de706b3211 Core/Db/Conditions: Add new condition targets for: 
- CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE ConditionTarget = 1 - check vehicle
- CONDITION_SOURCE_TYPE_VEHICLE_SPELL ConditionTarget = 1 - check vehicle
- CONDITION_SOURCE_TYPE_GOSSIP_MENU = 1 - check gossip provider
- CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION = 1 - check gossip provider
 2012-02-15 22:13:27 +01:00
Nay
a1aa36cae3 Merge pull request #5244 from w1sht0l1v3/toc 
Scripts/Trial of the Crusader: Removed "Touch of Jaraxxus" ability from Lord Jaraxxus's Script.
 2012-02-15 08:28:38 -08:00
w1sht0l1v3
9ead33ff02 Scripts/Trial of the Crusader: Removed "Touch of Jaraxxus" ability from Lord Jaraxxus's Script. 2012-02-14 21:57:20 +02:00
Go6o
c8d9e30d6e Volunteer's Work - fix by Vincent-Michael 2012-02-14 21:51:54 +02:00
Subv
8a72aede16 Codestyle: Renamed some variables to fit codestyle, corrected order in structure/class fields to match alignment (they use slightly less memory now) 
Signed-off-by: Subv <s.v.h21@hotmail.com>
 2012-02-14 12:46:26 -05:00
Pitcrawler
6bb7f15092 DB/NPCs: Remaining Grizzly Hills gossips 
Scripts|SAI: Convert npc_kingdom_of_dalaran_quests to SAI
Closes #4845
 2012-02-11 20:01:06 +00:00
Shauren
05b18ca9ba Scripts/Icecrown Citadel: Attempt to fix Sindragosa spawning 2012-02-10 16:44:02 +01:00
Shauren
9155d21b64 Scripts/Icecrown Citadel: Fixed crash in spell_frostwarden_handler_order_whelp 
Closes #5129
 2012-02-10 16:40:02 +01:00
QAston
5365bd25fa Core/Spells: remove some workarounds about transform spells in corpse explosion script. 2012-02-09 23:27:59 +01:00
Subv
9791bb599a Merge pull request #5160 from TrinityCore/dynamic_vmaps 
Added Dynamic Vmaps, RE-EXTRACT YOUR VMAPS
 2012-02-09 11:17:05 -08:00
Subv2112
93d199f043 Core/Collision: Ported dynamic line of sight patch by Silverice from MaNGOS and 
added lots of improvements
Please re-extract vmaps
 2012-02-09 13:58:22 -05:00
glkrlos
201af95af3 From beginning of Sartharion encounter if Tenebron, Shadron and/or Vesperon are alive the Spell Power of Tenebron, Shadron and/or Vesperon must be casted on all players, this occurs like retail. 2012-02-08 18:25:58 -06:00
zwerg
cd7b0c2635 Scripts/Noblegarden: Fix Spring Fling achievements 
Closes #1070
 2012-02-08 22:49:40 +00:00
kaelima
b194070cd5 Script/Holiday: Cleanup and fix possible crash from 32b2fccf33 2012-02-08 16:06:37 +01:00
QAston
a27758207f Merge pull request #5096 from devilcoredev/fix_005 
Core/AI: Fix a bug on some pets introdouced in commit 14bc551862
 2012-02-07 23:30:41 -08:00
Nay
32b2fccf33 Scripts/Misc: Script Romantic Picnic Basket 
- Fix achievement "Lonely?"
- Added spell_holiday.cpp for spells related with holidays scripts
- Closes #5116
❤️
 2012-02-08 03:07:21 +00:00
Aokromes
d1bb8afadd Scripts/Commands Send Global GM message when reloading waypoint_data table like other reloads 2012-02-07 17:53:42 +01:00
Nay
9e3b81c0ef Scripts&DB: Scripts and spawns for quest The Lifewarden's Wrath 
Closes #5120
 2012-02-07 16:39:08 +00:00
Jorge
f2281f43c6 Merge pull request #5061 from Souler/fix_tournament_quests 
Argent Tournament Quests: Mastery of...
 2012-02-07 01:56:42 -08:00