Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,062 Commits 4 Branches 146 Tags
86afccc8ff7f54d8ebf28473bc2799dc7e039083
Commit Graph

5485 Commits

Author SHA1 Message Date
Spp
1b6fb2b695 Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review) 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Movement/Spline/MovementTypedefs.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-05-21 09:41:13 +02:00
Nay
9b84c8fb98 DB/Characters: Remove guildId from characters table (characters_database.sql only) 
This field was dropped long ago in 1a290f17f5

Thanks to Aokromes for spotting the issue
 2013-05-16 23:28:57 +02:00
Vlad
78195b3c54 Allow use effectIndex in spell_target_position. 2013-05-13 11:30:48 +03:00
Shauren
64f0e99958 Core/StatSystem: Implemented mastery. 2013-05-12 17:56:37 +02:00
Pitcrawler
16074667c0 DB/Quests: Fix: The Focus on the Beach, Atop the Woodlands, The End of the Line 
Closes #367 #1848
 2013-05-12 14:08:42 +02:00
Warpten
1c91680f9c DB/Spells: Fixed server startup after 492c695021. 2013-05-11 23:09:37 +02:00
Shauren
e2f8abd48d Core/Spells 
* Removed area MiscValue check for spells with SPELL_EFFECT_BIND, it's purpose is only to be sent in packets, not determine real area player will be bound to.
* Corrected guid sent in SMSG_PLAYERBOUND, it should be caster's guid, not player's
* Also updated position for Teach: Death Gate

Closes #9661
 2013-05-11 12:16:36 +02:00
Mihapro
492c695021 Reimplement spell_dbc (with spelleffect_dbc) 2013-05-09 01:36:56 +02:00
joschiwald
80769a4366 DB/Creatures: update creature_text for Forgemaster Garfrost and add visual aura 
Closes #9720
 2013-05-04 10:43:26 +02:00
razer025
ef19606212 DB/Creatures: set immunities for some Raidbosses 
Closes #4947
Closes #9674
Closes #9675
 2013-05-04 10:41:44 +02:00
xjose93
f2b6b2f95e Core/Commands: Improve .character rename [name], now can force rename .character rename [name] [newName] 2013-04-29 11:26:54 +02:00
Vincent_Michael
52a86950e1 SQL: Add missing renames for merge 2013-04-28 00:07:59 +02:00
Vincent_Michael
7bead2d151 SQL: Fix file format and rename for merge 2013-04-27 23:46:29 +02:00
Aokromes
1087e5f5c9 Merge pull request #9710 from xjose93/Autobroadcast 
Core/World: Improvements in Autobroadcast system (dropped from world database and moved to auth database, added realmid and weight columns)
 2013-04-27 05:02:48 -07:00
Aokromes
e486cd7623 Merge pull request #9662 from xjose93/GuildRename 
Guild rename
 2013-04-27 05:02:07 -07:00
Bezo
619d975012 Update auth_database.sql due the added ip2nation tables. 2013-04-26 12:50:14 +03:00
xjose93
d7e9d1bafb Core/World: Improvements in Autobroadcast system (dropped from world database and moved to auth database, added realmid and weight columns) 2013-04-25 22:54:20 +02:00
Shauren
bd69c9ad49 Merge branch 'pr/n9655_Bezo' 2013-04-22 15:54:46 +02:00
Bezo
7542049eba [Ip2nationLock] Implement the ip2nation lock country. 2013-04-22 15:53:48 +02:00
Kirkhammett
00a3023314 DB/SAI: fix runtime errors and some other stuff. see issue #9667 2013-04-21 12:51:47 +02:00
Foldor
f692d368f5 DB/Gameobject: Add missing template for Silver Covenant Banner (202193) 
Closes # 9080
 2013-04-21 12:32:59 +02:00
ZxBiohazardZx
62ecc11cfb DB/Loot: 
Update loot for Scarab Coffers in AQ (related to issue #9638)
Update loot for Axtroz (related to issue #9610)
 2013-04-21 12:27:52 +02:00
kirkhammett
d1964f6ee1 DB/Conditions: add correct conditions to Lokhtos Darkbargainer's shop 
Closes #9594
 2013-04-20 09:57:21 +02:00
wintergreen77
888f8f7a8a DB/Loot: Insert Frozen Orb into The Prophet Tharon'ja's loot template 
Closes #9605
 2013-04-20 09:50:13 +02:00
xjose93
678cade116 Core/Commands: rename guilds (.guild rename "old guildname" "new guildname") 2013-04-19 23:21:23 +02:00
Kirkhammett
353b82c48b DB/SAI: Missing event flags now added 
Closes #9668
 2013-04-19 18:07:19 +02:00
Gacko
e9d7b53e6d Fix some creature text runtime errors 2013-04-16 20:29:24 +02:00
Shauren
1c59bbd130 Merge pull request #9647 from xjose93/GameEventAnnounce 
Core/Events: announce event system improvement.
 2013-04-16 02:43:31 -07:00
Gacko
2a96e1919d Script/SAI: Fix runtime error. Thanks @Kirkhammett 
Closes #9653

(Can not commit for other authors using the web interface...)
 2013-04-16 08:52:01 +03:00
Pitcrawler
03be44f499 DB/Quests Fix Mission: Eternal Flame, closes #6852 2013-04-16 07:41:35 +02:00
xjose93
19b47e452f Core/Events: announce event system improvement. 2013-04-15 09:32:35 +02:00
Pitcrawler
5c2203f185 DB/Quests: Fix The Leaders at Jin'Alai, closes #902 
Remove some double spawns
Add some missing spawns
Convert some EAI to SAI
Add some visual effects for quest Breaking Through Jin'Alai
 2013-04-14 14:55:24 +02:00
Gacko
bf10860a1c Rename sql files from previous commit and add new line at eof 2013-04-13 20:41:08 +02:00
Gacko
35f03185f2 Script/SAI: Fix runtime errors 2013-04-13 20:37:40 +02:00
Gacko
40904ef0c1 Script/SAI: Convert Arzeth the Merciless to SAI 2013-04-13 20:33:53 +02:00
Kirkhammett
a1049abba0 DB/Misc: Doing this out of the kindness of my heart, not because @Aokromes forced me into slavery. 
Closes #9624
 2013-04-13 20:20:12 +02:00
Kirkhammett
37c02196ae DB/Misc: 2 updates to fix non working SAI scripts 
Closes #9460
 2013-04-13 19:15:39 +02:00
Kirkhammett
51f6db7915 Script/SAI: Remove Shadow's Edge on completing 'Shadowmourne...' 
Closes: #9600
 2013-04-12 22:11:52 +02:00
Shauren
efaa29dac7 Merge pull request #9632 from joschiwald/scriptfix 
Scripts/Quest: Fix "Massacre At Light's" after recent vehicle changes an...
 2013-04-12 12:49:11 -07:00
joschiwald
c0303c82bf Scripts/Quest: Fix "Massacre At Light's" after recent vehicle changes and drop some silly code 
Closes #9448
 2013-04-12 21:21:30 +02:00
Gacko
e3feabefec Remove BOM 2013-04-12 17:46:17 +02:00
LeGuybrush
b8586e1c9b Remove BOM 2013-04-11 16:30:11 -03:00
Pitcrawler
0d85538fab DB/Quests: Fix Bringing Down Heb'Jin, closes #376 2013-04-11 15:32:43 +02:00
Pitcrawler
6521b1aad6 DB/SAI: Convert a core script to SAI. Fixes issues when abandoning the quest. 
Thanks @dr-j for the initial work.
 2013-04-11 02:14:49 +02:00
Pitcrawler
faf7ddc2fc DB/Quests: Fix Ursoc, the Bear God, closes #3165 #9535 2013-04-11 01:26:51 +02:00
Kinzcool
81908c7d7b DB/Triggers: Added some missing trigger teleportation in the Ebon Hold. 2013-04-08 15:47:32 -04:00
Souler
895a4dd352 Spells/Mage: Ring of Frost 2013-04-08 21:37:57 +02:00
Kinzcool
6e6ed50ab3 DB/Triggers: Implemented arenas triggers teleport to stop people that go outside the walls. 2013-04-07 02:23:06 -04:00
Pitcrawler
1ceb779b09 DB/Quests: Fix Pa'Troll and Lab Work, closes #5910 and really closes #2382 2013-04-06 16:59:21 +02:00
Gacko
d4e5ea5db9 Fix imports 2013-04-06 14:17:00 +02:00