Commit Graph

2227 Commits

Author SHA1 Message Date
Vincent_Michael
b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
2013-01-07 16:57:39 +01:00
blub
9ad1857e59 Merge pull request #8826 from joschiwald/mmaps_disable
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
2013-01-07 07:52:35 -08:00
Malcrom
c3166b8608 Core/scripting: Fix zulaman.cpp 2013-01-06 23:16:06 -03:30
Malcrom
14feb316e1 Core/scripting: Update zulaman script 2013-01-06 22:58:58 -03:30
Malcrom
832cd198ca Core/scripting: More updates for gong event. Almost complete. 2013-01-06 22:39:41 -03:30
Malcrom
3710ca5faf Core/Scripting: Small fix to Zul'Aman script Thanks joschiwald. 2013-01-06 12:38:26 -03:30
Malcrom
8361931b37 Core/Scripting: Move Kirtonos pathing to db looks smoother. 2013-01-06 12:04:02 -03:30
Malcrom
90c182dce4 Core/Scripting: Fix silly error 2013-01-06 01:08:25 -03:30
Malcrom
82d4559507 Core/Script: Update Gong Event 2013-01-06 01:05:25 -03:30
Malcrom
ed83397a67 Core/Scripts: Some cleanup of Zul'aman Instance script. Gong event in progress and will allow doors to open. 2013-01-05 20:15:46 -03:30
Malcrom
385940aeea Core/Scripting: Fix typo 2013-01-05 18:10:14 -03:30
Vincent_Michael
ff3928ca6d Core: Fix warnings 2013-01-05 20:30:57 +01:00
Gacko
ea72933608 Fix non PCH build 2013-01-05 19:10:18 +01:00
Gacko
c86230208f Script: Novos rewrite 2013-01-05 18:03:11 +01:00
Vincent_Michael
24e0eb1812 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-05 16:55:17 +01:00
Malcrom
3661353e12 Core/Scripting: Fix Typo. 2013-01-04 19:58:16 -03:30
Malcrom
e0a5aabaf7 Core/Scripting: Update Kirtonos script. 2013-01-04 19:41:57 -03:30
Nay
8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +00:00
Malcrom
bf19adec0f Core/Scripts: Some cleanup for boss_kirtonos_the_herald script 2013-01-04 12:34:35 -03:30
Malcrom
306d59cb51 Core/Scripting: Add a few includes to boss_kirtonos_the_herald. 2013-01-04 07:25:32 -03:30
Malcrom
e8ca1d5cd1 Core/Scripting: Add Kirtonos The Herald to c++ scripting. Combat still not finished. 2013-01-04 01:00:51 -03:30
Vincent_Michael
8db66bfefd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-04 01:27:51 +01:00
Nay
9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Vincent_Michael
ee2e776fea Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 22:03:35 +01:00
Malcrom
dbfc4b83aa Core/Scripting: Some file name updates. 2013-01-02 15:08:13 -03:30
Malcrom
38c55a15ad Core/Scripting: Rename zone scripts. 2013-01-02 14:52:13 -03:30
Malcrom
2fd10b5d15 Core/Scripting: Properly name boss_thorngrin_the_tender file. 2013-01-02 14:11:39 -03:30
Vincent_Michael
5bbf7829b2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 17:42:22 +01:00
Vincent_Michael
cc99c739c6 Core/MT: Fix model for "Pure Energy"
Closes #8838
2013-01-02 16:58:23 +01:00
Vincent_Michael
b873156c3c Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.h
2013-01-02 14:12:48 +01:00
Spp
2292025bf9 Core/Misc: Replaced some macro definitions with inline functions 2013-01-02 09:07:52 +01:00
Trista
423fb04270 Script/EoE: Some fixes here and there
* Add db support for Power Sparks, Teleports and Drakes
* Fix Power Sparks animations and texts and add support for giving buff to players + warning
* Fix Power Spark way of stacking - should be MultiSlot aura, didn't stack before either way
* Teleporters mechanic is fixed and will summon only 1 spark per 30-35 sec
* Fixed players getting mounted on 3rd phase
* Cleanned some wrong aggro handling, but whole aggro/attack system should be rewritten to get it working blizz
That is for today, this doesn't fix the whole instance by any means!
2013-01-02 06:35:28 +02:00
Vincent_Michael
e0db317530 SQL: Fix sql import problem 2013-01-02 03:06:55 +01:00
Malcrom
1062a0b40f Core/Scripts: Added spell scripting for Commander Sarannis. Added Instance Template for The Botanica.
Thanks to Vincent Michael
2013-01-01 22:28:29 -03:30
Vincent_Michael
56096b7704 DB/Creatures: Some fix for Wyrmrest Skytalon
Closes #8733
2013-01-02 02:43:41 +01:00
Vincent_Michael
88e6071ff6 Core: Fix build 2013-01-02 02:28:00 +01:00
Malcrom
596ef0efd7 CORE/Scripting: Forgot new lines at end of file. 2013-01-01 21:41:37 -03:30
Malcrom
f7e7f5fe26 CORE/Scripting: Move Commander Sarannis & Thorngrin the Tender to cpp scripting. Add instance script.
Thanks to Vincent Micheal for the help :)
2013-01-01 21:36:21 -03:30
Vincent_Michael
62adbdab99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
2013-01-01 23:12:21 +01:00
Vincent_Michael
7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Vincent_Michael
eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael
11e1227784 Update more copyright note for 2013. (alcohol sucks) 2013-01-01 12:57:23 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013.
Happy new year.
2013-01-01 00:41:01 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Vincent_Michael
6317878b6f Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-31 15:26:57 +01:00
Gacko
edb90f957b Core/DB: Haaleshi Altar
- Prevent crash due to spamming GossipHello
- Convert core script to SAI
- Solves #8220
2012-12-31 15:03:19 +01:00
joschiwald
08f62d8313 Core/MMaps: use DisableMgr to disable pathfinding on a specific map 2012-12-30 21:09:21 +01:00
Subv
ff5b0a14a4 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-12-28 11:45:46 -05:00
Nay
7ccef51c8c Merge pull request #8518 from ille/goreset
scripts/gameobject: correct reset of gameobjects (cages/prisons), move command out of if statement
2012-12-27 18:50:35 -08:00
secharles
8272affe92 Script/Commands: New command: lookup spell id #spellid
Command to allow to know spell names based on id

Example:
 lookup spell id 686:
 686 - [Shadow Bolt rank 1 esES] [know]

Closes #8800

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-28 01:05:56 +00:00