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
18,918 Commits 4 Branches 146 Tags
7540cfedfc74b2c5e91ded052182fd3b02ca7b66
Commit Graph

2448 Commits

Author SHA1 Message Date
Vincent_Michael
66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2013-01-11 19:10:10 +01:00
krofna
dc30c63533 Script/AQ Implement Ayamiss the Hunter and fix screwup in my Ossirian 
Closes #8862

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-11 12:52:19 +00:00
Malcrom
0b50520df7 Core/scripting: Updating Scholomance scripts 2013-01-10 20:08:30 -03:30
Nay
9da1ff45b7 DB/Addon: Delete 1026 creature_addon rows and overwrite 98 creature_template_addon (phase 2.1) 
Conversion done with https://gist.github.com/4505135 (C#)
Thanks to Aokromes for the idea
 2013-01-10 19:42:24 +00:00
Nay
0ee5170552 DB/Addon: Delete 4012 redundant creature_addon rows (phase 2) 
Conversion done with https://gist.github.com/4504839 (C#)
Thanks to Aokromes for the idea
 2013-01-10 19:13:22 +00:00
Nay
fd4767bcd0 DB/Addon: Convert 43637 creature_addon rows to 2429 creature_template_addon rows 
Conversion done with https://gist.github.com/4504302 (C#)
Thanks to Aokromes for the idea
 2013-01-10 18:11:29 +00:00
Nay
fff86b7729 DB/SAI: Remove some redundant creature_texts using SMART_ACTION_CALL_FOR_HELP 2013-01-10 15:41:10 +00:00
Nay
8274e42e3d Core/SAI: Add 2nd parameter to SMART_ACTION_CALL_FOR_HELP to say "%s calls for help!" if enabled 
Similar to SMART_ACTION_FLEE_FOR_ASSIST "%s attempts to run away in fear!"
 2013-01-10 15:09:12 +00:00
Vincent_Michael
f9c193d27d DB/Spells: Add missing sql in 669e2ed20f 2013-01-09 17:29:27 +01:00
ZxBiohazardZx
d9339cea60 DB/SAI: Fix startup DB errors 2013-01-09 15:59:15 +00:00
Spp
25d35bacf9 Fix incorrect sql name 2013-01-09 16:39:57 +01:00
Pitcrawler
ecfb762346 DB/SAI: You Reap What You Sow, closes #8827 2013-01-09 13:17:31 +01:00
Gacko
e102629601 DB/Quest: Raise the Barricades 
Thanks to @Nevadas. Solves #8877
 2013-01-08 21:33:28 +01:00
Vincent_Michael
db330750b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-01-08 16:32:54 +01:00
Malcrom
2a9fc5198b Core/Scripting: Move Nightbane text to creature text 2013-01-07 22:44:09 -03:30
Malcrom
0226048686 Core/Scripting: Update Script for Postmaster Malown 2013-01-07 22:13:04 -03:30
ZxBiohazardZx
c3134bc6cd DB/Creature: Remove ALOT of auras and creature_addon definitions, all these entries should be handled by SAI already, if not then SAI should be fixed 2013-01-08 00:45:44 +01:00
Malcrom
1c77eee917 Core/Scripting: Move Text for Shirrak the Dead Watcher to creature text 2013-01-07 19:50:31 -03:30
Malcrom
5ce88118ee Core/Scripting: Move Text for Timmy the Cruel to creature text 2013-01-07 19:27:35 -03:30
Vincent_Michael
8f36383d39 Core: Fix build 2013-01-07 23:28:03 +01:00
w1sht0l1v3
de3d507cc1 DB/SAI: Proper script for Snowfall Glade Pup SAI. 2013-01-08 00:24:24 +02:00
Vincent_Michael
05e03e7634 SQL: Rename SQL merged in PR 2013-01-07 23:09:34 +01:00
blub
be5d3e5fd8 Merge pull request #8755 from krofna/crofixes 
Script/AQ: Implement Buru the Gorger
 2013-01-07 14:04:53 -08:00
blub
669e2ed20f Merge pull request #8725 from krofna/krefixes 
Script/AQ: Rewrite Skeram
 2013-01-07 14:03:28 -08:00
Malcrom
55d3e8adaa Core/Scripting: Move Text for Zul'jin to creature text 2013-01-07 18:14:30 -03:30
Malcrom
61fa397117 Core/Scripting: Move Text for Baron Rivendare to creature text. 2013-01-07 17:22:14 -03:30
Malcrom
3d1f61b278 Core/Scripting: Move Text for Ayamiss the Hunter to creature text 2013-01-07 16:29:20 -03:30
Malcrom
609232dfbe Core/Scripting: Move Text for Archavon the Stone Watcher to creature text 2013-01-07 16:12:49 -03:30
Malcrom
74b4dbec3f Core: Scripting: Convert Text for boss Archaedas to creature text 2013-01-07 15:54:11 -03:30
Malcrom
9d1ad8ab3a Core/Scripts: Move text for Boss Akil'zon to db. 2013-01-07 15:31:38 -03:30
Malcrom
601f118f29 Core/Scripting: Move some text to creature text. 2013-01-07 14:20:52 -03:30
ZxBiohazardZx
4d14c58dd4 DB/Creature: Remove creature_addon aura for Frost Armor for the NPCs that have SAI defined: if the creature requires Frost Armor then SAI should cast it. this should reduce some runtime errors for duplicate auras 2013-01-07 17:37:39 +01:00
Malcrom
c70b21437b DB/SAI: Sai for gong event 2013-01-07 12:46:12 -03:30
Vincent_Michael
ecedb798aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Conditions/ConditionMgr.h
 2013-01-07 16:39:01 +01:00
Malcrom
832cd198ca Core/scripting: More updates for gong event. Almost complete. 2013-01-06 22:39:41 -03:30
ZxBiohazardZx
5fe399195f DB/Cleanup: Remove duplicate aura definitions in creature_addon and creature_template addon 2013-01-06 23:36:53 +01:00
Malcrom
6f19129a4a DB/SAI: Some event flag fixes 2013-01-06 13:16:08 -03:30
Malcrom
5ee23ad3b0 DB/Misc: Some fixes required to complete Gong scripting. 2013-01-06 12:21:04 -03:30
Malcrom
8361931b37 Core/Scripting: Move Kirtonos pathing to db looks smoother. 2013-01-06 12:04:02 -03:30
Malcrom
f9892f9a30 Core/scripting: Add scriptname to creature_template for Harrison Jones 2013-01-06 11:52:40 -03:30
Malcrom
289ae9a810 DB/waypoints: Update Harrison Jones waypoints. 2013-01-05 20:18:19 -03:30
Gacko
c86230208f Script: Novos rewrite 2013-01-05 18:03:11 +01:00
Vincent_Michael
d5163d846f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.cpp
 2013-01-05 17:01:46 +01:00
Warpten
ea23d32820 DB/SAI: Fixed some runtime errors. 2013-01-05 04:35:36 -08:00
Malcrom
c11dcb0dbd DB/Gossip/Waypoints/Creature_text: Db data for Harrison Jones Gong Event. 2013-01-04 21:25:39 -03:30
Shauren
7e29e0d2b2 Scripts/Firelands: Implemented Alysrazor's trash event 2013-01-05 00:59:33 +01:00
Subv
bb1c955c8b Scripts/HallsOfOrigination: Added script for Anraphet and the Vault of Lights. 
Some bugs might still remain.
Crumbling Ruin spell has a problem with radius handling.
 2013-01-04 18:07:56 -05:00
Vincent_Michael
ff48ea8a52 DB/SAI: Fix crash with quest "Thirst Unending" 
Closes #8856
 2013-01-04 21:02:05 +01:00
ZxBiohazardZx
facea9f158 db/commit: fix sql error 2013-01-04 20:27:05 +01:00
Gacko
355b051419 DB: Re-add creature text for SAI conversion 2013-01-04 14:22:45 +01:00