Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,966 Commits 4 Branches 146 Tags
fa0aaa5fa4ed93992e54cce411944e41d1fd831d
Commit Graph

20966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
fa0aaa5fa4 Core/Spells: Some cleanup and missing stuff in a6eee516bd 2013-08-11 01:46:29 +02:00
Vincent-Michael
2e9547b4ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
 2013-08-11 00:27:54 +02:00
Vincent-Michael
a6eee516bd Core/Spells: Fix typo in 51a7f3408f (thx to Sar777) 2013-08-11 00:26:44 +02:00
Vincent-Michael
c5ff184ebd Core/Scripts: Add missing stuff in 0161012c69 2013-08-10 23:16:36 +02:00
Nay
8b08fba98d Merge pull request #10501 from Discover-/SmartAI-Action-Set-Power 
Core/SmartAI: Implement MART_ACTION_SET_POWER, SMART_ACTION_ADD_POWER and SMART_ACTION_REMOVE_POWER (param1 = powertype, para...
 2013-08-10 12:39:32 -07:00
Kirkhammett
0161012c69 Scripts/ZulFarrak: Convert Witch Doctor Zum'rah from SAI to Cpp 
Closes #10508
 2013-08-10 20:36:45 +01:00
Vincent-Michael
bd4155bd5c DB: Rename sql file for only 335 2013-08-10 20:51:02 +02:00
Vincent-Michael
c2ae39685b DB/Misc: Fix logic fail in f23069e324 2013-08-10 20:13:24 +02:00
Vincent-Michael
f23069e324 DB/Misc: Fix startup error 2013-08-10 20:07:47 +02:00
Nay
181a3cad00 Merge pull request #10511 from MitchesD/Mobs 
DB/SAI: Draktharon Keep mobs
 2013-08-10 11:05:48 -07:00
MitchesD
e90d18af31 DB/SAI: Draktharon Keep mobs 2013-08-10 20:04:23 +02:00
Nay
1c35bad513 Core/Chat: Fix a compile warning, locale is no longer used 2013-08-10 17:59:47 +01:00
Nay
482720da50 Core/BattlegroundAV: Fix team variable type, "if (team == ALLIANCE)" would always return false 
Ref 33f8c3ead4da07ff024a94b5e8cf0d05c2ebc23a#L4R1626
 2013-08-10 17:35:23 +01:00
Vincent-Michael
bb9614d00d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
 2013-08-10 17:58:53 +02:00
Vincent-Michael
8acefbff8c Scripted: Use now override for instance scripts 2013-08-10 17:42:12 +02:00
Discover-
488128bada DB/EAI: Fix unit_field changes, outdated since initial 3.x versions 2013-08-10 16:31:52 +01:00
Nay
b33f80aa18 Scripts/Pet: Fix non pch compile 2013-08-10 16:00:58 +01:00
Vincent-Michael
16b8bce334 Scripted: Fix more fail in ba6e62fd6e -.- 2013-08-10 16:55:59 +02:00
Vincent-Michael
dfd0575111 Scripted: Fix typo in ba6e62fd6e (thx to Shauren) 2013-08-10 16:49:38 +02:00
Vincent-Michael
ba6e62fd6e Scripted/BaradinHold: Implemented Pit Lord Argaloth 
Note: Need some update with sniff
 2013-08-10 16:35:06 +02:00
Discover-
75ca3573c8 Core/SmartAI: Implement SMART_ACTION_SET_POWER, SMART_ACTION_ADD_POWER and SMART_ACTION_REMOVE_POWER (param1 = powertype, param2 = newPower). Required for upcoming EAI to SAI conversion (for ACTION_T_SET_UNIT_FIELD) (only SMART_ACTION_SET_POWER is required for the conversion but might as well do it right when on it). 2013-08-10 14:13:17 +02:00
Shauren
0e75857702 Core/PacketIO: Fixed object update failures 
Closes #8105
 2013-08-10 13:44:08 +02:00
Vincent-Michael
2c6f5e1b61 Scripted: Remove Whitespace/Tabs 2013-08-09 20:37:09 +02:00
Vincent-Michael
a6d2faf163 Core: Fix build 
(cherry picked from commit 81daef8b22)
 2013-08-09 19:28:47 +01:00
Vincent-Michael
81daef8b22 Core: Fix build 2013-08-09 20:23:49 +02:00
Vincent-Michael
99aa4649d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/CMakeLists.txt
 2013-08-09 20:02:21 +02:00
Vincent-Michael
8aff3945f2 Scripted: Fix non pch build 2013-08-09 20:00:18 +02:00
joschiwald
8c7db6cc8d DB/Spells: Rename LoS for spell Rod of Purification 
Ref #1972
 2013-08-09 18:38:15 +01:00
sonic3000
0a7fa02525 DB/SAI: Script NPC Arch Mage Xintor 
Closes #1743
 2013-08-09 18:35:17 +01:00
malcrom
f62a7f7523 DB/SAI: Fix quest "Where in the World is Hemet Nesingwary?" 
Script NPC Archmage Pentarus

Closes #921
 2013-08-09 18:35:16 +01:00
nelegalno
13f68e100c DB/GO: Increase radius of Mystery of the Infinity gameobject spellfocus 
Closes #920

(Quest is still broken; being worked on)
 2013-08-09 18:35:16 +01:00
Vincent-Michael
dbb40dd4fe Scripted/Pets: Move some player pets in pet_xxx.cpp 2013-08-09 19:22:16 +02:00
Nay
b7d88a3c46 Merge pull request #9817 from drskull/master 
Core/Spell add another condition in AnyGroupedUnitInObjectRangeCheck
 2013-08-09 08:46:19 -07:00
Nay
eba8c2d345 Merge pull request #10464 from Discover-/SmartAI-Set-Active 
Core/SmartAI: Allow SMART_ACTION_SET_ACTIVE to take a parameter for on/o...
 2013-08-09 08:44:56 -07:00
Nay
edf77a4cf6 Merge pull request #10493 from Discover-/SmartAI-Action-Sound-Update 
Core/SmartAI: Rename SMART_ACTION_SOUND's parameters and get rid of an e...
 2013-08-09 08:38:09 -07:00
Kirkhammett
15696e29dd DB/SAI: Scripts for Onslaught NPCs 
Closes #10500
Closes #4741
 2013-08-09 15:43:30 +01:00
Nay
32c8555e1e DB/NPCs: Remove AIName from npcs that do not have EAI or SAI scripts 
Closes #10483
 2013-08-09 14:21:34 +01:00
untaught
92fdb7aed1 DB/SAI: Fix quest Jormuttar is Soo Fat... 
Scripts/Spells: Script spell Bear Flank Master

Closes #10484
 2013-08-09 12:55:26 +01:00
dr-j
d39d9f8328 DB/SAI: Fix quest "Tokens of the Descendants" 
Closes #10437
 2013-08-09 12:44:04 +01:00
untaught
011c7d465b DB/SAI: Fix quest "Blood in the Water" 
Closes #10398
 2013-08-09 12:42:35 +01:00
dr-j
d520a4e994 DB/Cond: Fix taking of 8280 Securing the Supply Lines for horde players 
Closes #10371
 2013-08-09 12:38:49 +01:00
dr-j
879725ed89 DB/SAI: Fix infinite spawn in quest "You Are Rakh'Likh, Demon" 
Closes #10361
 2013-08-09 12:32:19 +01:00
Nevadas
6c51deab80 DB/SAI: Fix quest The Conquest Pit 
Original fix by @shlomi1515

Closes #10332
Ref #3913
 2013-08-09 12:30:14 +01:00
Discover-
bd2120593d Core/SmartAI: Rename SMART_ACTION_SOUND's parameters and get rid of an error that shouldn't be there. The method it calls doesn't take CreatureTextRange (enum) in consideration, but a boolean called onlySelf. 2013-08-09 01:05:56 +02:00
Vincent-Michael
80d7c093eb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-08 20:56:27 +02:00
Vincent_Michael
27a433d277 DB: Fix a db startup error 2013-08-08 00:43:57 +01:00
Vincent_Michael
85fd2bd7d0 DB/SAI: Fix a typo in a SAI script, fixes quest Bring Me The Egg! 
Closes #10415
 2013-08-08 00:37:45 +01:00
Nay
9f05cf7548 DB/NPCs: Because of some silly reason there are NPCs with AIName 0 2013-08-08 00:35:33 +01:00
dr-j
2e898b1ebc DB/SAI: Script Itharius 
Closes #10401
 2013-08-08 00:29:07 +01:00
Crysicle
1534ef264c DB/NPCs: Correct faction of Seeping Ooze 
Closes #10375
 2013-08-08 00:26:37 +01:00