Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,989 Commits 4 Branches 146 Tags
736093e91b2efee9cb7df37d32fd6705018a6eb5
Commit Graph

6492 Commits

Author SHA1 Message Date
Vincent_Michael
736093e91b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
 2013-12-20 17:26:27 +01:00
Malcrom
06d42afba0 DB/Misc: Update Wintergrasp Battle-Mages 2013-12-20 01:14:14 -03:30
Malcrom
0b7a9a4559 DB/Misc: Three more creature moved to SAI only. 2013-12-19 22:14:24 -03:30
Malcrom
d89a3b2fb2 DB/Gossip: Moved Highlord Demitrian gossip to db. 
npc had SmartAI and cpp script.
 2013-12-19 21:23:51 -03:30
Malcrom
cc79f279fd DB/SAI: Fix a few more dup aura errors 2013-12-19 17:32:48 -03:30
Malcrom
57332e1d3e DB/SAI: Scripted all ogres in Blades Edge Mountains. 
Sorry I had to remove the awesome cpp script.
 2013-12-19 16:28:08 -03:30
Malcrom
527219e3a9 DB/Misc: Fix a couple capitalization errors 2013-12-19 12:29:04 -03:30
Malcrom
7b5d5ab265 DB/Misc: Two missing paths and two missing Combat AI. 2013-12-19 12:16:15 -03:30
Vincent_Michael
2ded11354d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-18 23:48:20 +01:00
Malcrom
18cc075839 DB/Misc: Fixups for Toshley's Station, Blades Edge. 2013-12-18 19:02:22 -03:30
Malcrom
cb3825266a DB/SAI: Some SAI updates to remove dup aura errors and some additions. 2013-12-18 18:20:40 -03:30
Malcrom
676baa890f Scripting/Dragonblight: Commander Eligor Dawnbringer now scripted. 
Purely cosmetic but it was a fun thing to script :)
 2013-12-18 18:06:30 -03:30
Discover-
b5e333255b DB/SAI: Fix two wrong action_types that would make the creature cast the Death Touch spell on no target (SMART_TARGET_NONE) instead of move to given target_x/y/z/o co-ordinates. 
The person who wrote this script accidently used action_type 11 (SMART_ACTION_CAST) instead of 69 (SMART_ACTION_MOVE_TO_POS), and since the action_param1 field of SMART_ACTION_MOVE_TO_POS is the motion id (point id given back to SMART_EVENT_MOVEMENTINFORM), it was set to 5. Ironically, the first parameter of SMART_ACTION_CAST is the spell id and it was spell id 5 is Death Touch.
However this script would do nothing because I changed it so that SMART_TARGET_NONE no longer functioned as SMART_TARGET_ACTION_INVOKER in this commit: 9653576cb4. Before this commit, though, it WOULD cast Death Touch. Fun fun fun.
 2013-12-17 10:23:31 +01:00
Malcrom
1339d38d4c DB/SAI: Fix some duplicate aura errors and clean up the SAI. 2013-12-16 20:23:29 -03:30
Malcrom
9dd30ac5ff DB/Creature: Misc template updates 2013-12-15 14:35:15 -03:30
Malcrom
a2e7191b26 Core/Unit: prevent COMMAND_ATTACK being added for Trained Rock Falcon. 
Also added spells for Trained Rock Falcon to db.
 2013-12-15 13:43:18 -03:30
Vincent_Michael
f7aedaef33 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/game/World/World.cpp
 2013-12-15 03:47:21 +01:00
joschiwald
f5c2dca1d5 Scripts: fix crash in spell_jokkum_scriptcast 
Closes #11313
 2013-12-14 19:43:29 +01:00
Malcrom
9d9d1fb6c6 DB/SAI: Fix an error in Bladespire Mystic SAI 2013-12-14 09:35:36 -03:30
Vincent_Michael
506ddbbf40 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-12 19:36:48 +01:00
Lartza
d9dac7b9ca Fix typo 2013-12-12 13:46:22 +02:00
Malcrom
385e2dba37 DB/SAI: Fix one linking error and updated a few to use CMC "Combat Movement Control" 2013-12-11 17:07:59 -03:30
Vincent_Michael
07024d3ea8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCEnums.h
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
 2013-12-11 20:34:44 +01:00
Malcrom
e7e708eb0a DB/Misc: fixed comment in one SAI script. 2013-12-11 15:34:57 -03:30
Malcrom
a20c89feee DB/Misc: Some Combat AI, Remove spawns, and aura fixes. 2013-12-11 15:32:59 -03:30
Malcrom
551e51bcb9 DB/Waypoints: Some Outlands waypoints. Mostly Blade's Edge. 2013-12-11 15:10:05 -03:30
Malcrom
74facef60d Scripting/Storm Peaks: Renamed npc_brann_bronzebeard script because name has already been used. 2013-12-10 00:11:33 -03:30
Malcrom
6af40a28b1 DB/Misc: Mostly cosmetic for Storm Peaks with a few SAI updates. 
"It's like eye liner for your TC server"
 2013-12-09 23:35:37 -03:30
Vincent_Michael
ee5c47f1af Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-09 23:48:41 +01:00
Malcrom
bdcbcc5987 DB/Waypoints: Fix error in previous sql. 2013-12-09 18:56:30 -03:30
Malcrom
1b7f41a531 DB/Waypoints: All pathing for Stormforged War Golem. 2013-12-09 17:22:45 -03:30
Malcrom
b6f4ab491f DB/Waypoints: Add missing waypoints for Stormforged Taskmaster and 3 missing spawns 2013-12-09 15:08:13 -03:30
Malcrom
a3ff7eaae9 Scripting/Storm Peaks: Tested all my sql but not the title :P 2013-12-09 03:32:19 -03:30
Malcrom
755283ac8d Scripting/Storm Peaks: Quest 13285 "Forging the Keystone" now scripted. 
Closes #6921
 2013-12-09 03:28:40 -03:30
Malcrom
f33023b853 DB/Misc: Darkspeaker R'khem now has chains. 
Closes #7316
 2013-12-08 22:24:42 -03:30
Malcrom
dd4aee2c10 Scripting/Howling Fjord: Fix Quest 11310 Warning: Some Assembly Required 
Quest is doable and completeable with the following Issues:
Aura not being removed from player after Abomination explodes.
Camera angle should not changes after Abomination explodes.
Can't check if Abomination leaves Halgrind. GetAreaId returns players area id.
 2013-12-08 18:46:06 -03:30
Vincent_Michael
89f381b1ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-08 20:28:12 +01:00
Vincent_Michael
e8be55aa8b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.h
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2013-12-08 20:27:46 +01:00
Malcrom
0e37faf202 Scripting/Razorfen Downs: That emote shouldn't have slipped in there. 2013-12-08 15:10:28 -03:30
Malcrom
ae597c3594 Scripting/Razorfen Downs: Discovered some missing text for boss Glutton. 2013-12-08 15:07:49 -03:30
Malcrom
0447806812 DB/SAI: Grimscale Murloc shouldn't fear Closes #11259 2013-12-08 00:12:01 -03:30
Malcrom
a05b7b430e DB/SAI: Aokromes likes to inform me of one typo at a time :) 2013-12-07 23:30:37 -03:30
Malcrom
1fa8c6e3bf DB/Misc: Fix typo 2013-12-07 23:21:27 -03:30
Malcrom
877ad17f19 DB/SAI: Fix my stupid mistake 2013-12-07 23:11:41 -03:30
Malcrom
997dcf0ea4 DB/SAI: Remove bad unneeded Springpaw Stalker & Elder Springpaw SAI 2013-12-07 23:09:09 -03:30
Malcrom
89de7e7419 Scripting/Razorfen Downs: Additions and fixes for instance. 
Moved bosses Glutton, Mordresh Fire Eye, Tuten Kash to cpp.
Cleaned up code for boss Amnennar The Coldbringer.
Fixed up gong event for gong to have sound and proper spawning.
Scripted quest 3525 "Extinguishing the Idol" so you can now fight Plagmaw the Rotting.
 2013-12-07 21:19:46 -03:30
Malcrom
2b8fb0d8f6 DB/SAI: Fix for QUEST 12512 "Leave no one behind" by Pitcrawler 
Closes #6583
 2013-12-05 16:57:16 -03:30
Malcrom
067f0f9331 DB/SAI: Add SAI for Val'kyr Guardian & Val'kyr Protector 
Closes #3280
 2013-12-05 13:37:10 -03:30
Malcrom
621ba87917 Grizzly Hills/Scripting: Fix Quest 12244 "Shredder Repair" and 12270 "Shred the Alliance" 
Closes #1942 #3754
 2013-12-05 13:04:11 -03:30
Malcrom
c546dcbfd9 DB/SAI: Spawn Baron Aquanis when Fathom Stone is used Closes #3118 2013-12-04 22:31:19 -03:30