Commit Graph

1164 Commits

Author SHA1 Message Date
Vincent_Michael
899ffde1f9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-09 21:15:41 +01:00
Vincent_Michael
9f9f797d5d Scripts/TOCR: Fix some faction champions crash
Closes #8393
2013-01-08 23:01:26 +01:00
Vincent_Michael
d36d2eac76 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-08 16:28:37 +01:00
Malcrom
0105bc849f Core/Scripting: Misc clean up and a warning fix 2013-01-07 21:47:38 -03:30
Malcrom
70977f3097 Core/Scripting: Misc fixes 2013-01-07 20:18:47 -03:30
Malcrom
609232dfbe Core/Scripting: Move Text for Archavon the Stone Watcher to creature text 2013-01-07 16:12:49 -03:30
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
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
Nay
8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +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
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
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
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
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
Nay
7e196e8e58 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-27 17:53:34 +00:00
AliveShiro
b19563fb6a Scripts/Trial of the Crusader: Fix Icehowl Script closes #8539 2012-12-27 12:12:27 +01:00
Trista
452e585f7b Core/Vehicles: Fixed seat id for auras with SPELL_AURA_CONTROL_VEHICLE. Also always allow npc passengers to cast spells and remove TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE hacks.
* Author: Horn. Please give feedback, I tested a lot stuff, but it will be appreciated.
* One of the fixes allow all creatures to cast when being passangers, researched, this doesn't involve players.
* This basically rewrittes vehicle seat formula calculated, so it fix quite stuff that will not be visible and some eye candies: #3831 and #1984 Heart part ;) (which magically fix a lot more of it and some quests), also Yog-Sarron mechanics
2012-12-27 01:35:38 +02:00
Subv
81d53f8a87 Scripts/Ick&Krick: Krick should only say his KilledUnit text when the victim is a player. 2012-12-26 13:36:07 -05:00
Vincent_Michael
6e921feebd Core: Fix some codestyle 2012-12-25 02:56:19 +01:00
Trista
fb3245d125 Scripts/Quest: Gambling Debt and Words of Power
* Quest support for Gambling Debt. Closes: #3122
* Fix bugging script for Words of Power: Closes: #7349
* Fix codestyle that vs broke from: 8c82c075cc
2012-12-24 01:35:55 +02:00
Trista
8c82c075cc Scripts/Quest: Defending Wyrmrest Temple
* insert complete db sniff support, appart from missing spawns
* remove achievement from disables (supported by core - timed one)
* insert core support for spells and the defender itself, since SAI makes it act weird (maybe in future when SAI get integrated someone will convert it)

Closes #1861 on 90% (except spawns (there are enough, but a lot more needed and minnor stuff that are core side connected with vehicles spellcastresults)
2012-12-24 00:51:39 +02:00
Gacko
006cc1797a Core: Fix warning
boss_sindragosa.cpp:235: warning: unused parameter ‘killer’
2012-12-23 18:04:42 +01:00
Nay
79b1895223 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-23 16:02:26 +00:00
Shauren
621a249188 Scripts/Icecrown Citadel: Fixed a possible crash in Blood Nova spell script
Closes #7046
2012-12-23 12:42:28 +01:00
Gacko
2302b04a06 Core/Spell: Last work on Shadows Fate
- Shadows Fate can now be applied by more than just one player at the same
   time. So on everyone who hits the unit the credit spell with the visual
   will be casted on death.
- The AOE credit spells for the three infusion quests will be casted by
  the boss once. If this would be done on proc, these AOE spells could be
  casted up to 25 times.
  -> 25 AOE credit spells plus 25 Soul Feast credit spells equals Sh**
2012-12-22 17:49:51 +01:00
kaelima
0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h
2012-12-21 00:00:16 +01:00
Kaelima
05c38b20ea Merge pull request #8668 from joschiwald/random_changes
Core/Misc:
2012-12-19 23:48:00 -08:00
joschiwald
f4e7cde1b5 Core/Misc:
- some simplifications in reputation calculation
- removed aura in SPELL_AURA_LINKED should depends on SpellDifficulty
- remove some unneeded variable declarations when it's already declared
- remove some hacks
- fix some warnings in Lfg stuff
- some codestyle changes
2012-12-19 12:55:51 +01:00
Trista
5a52acbe40 Core/Quest: Optimize and clean more last commit
* thx to @Gacko and @click for pointing out problems and give suggestiosn
* Sorry for the mess, forgot I can make more changes after initial change, this should be final...
* 48141bbfa6
2012-12-17 10:39:54 +02:00
click
aa3980c744 Core: Remove tabs, fix whitespace and fix nonPCH properly (5am, too late for this stuff...) 2012-12-17 05:39:04 +01:00
click
1f88f81c5a Core: Fix non-PCH build again 2012-12-17 04:53:32 +01:00
Trista
48141bbfa6 Core/Quest: Song of Wind and Water
* cleanned a bit and edited old @Treak fix, credits go to him, the quest will* work 100% blizzlike when target_unit_master #8643 gets a fix for vehicle. What concerns the quest is done. I've already fixed the core kill_credit issue, but needs to be discussed.
* leaving the vehicle_AI until they get integrated correctly to SAI, this can be easily converted after. Currently need to make some hacks to make it work close to good if using SAI. (specificly terrain acts weird at that place)

Closes: #5424
2012-12-17 04:37:27 +02:00
Nay
377d6c7862 Merge pull request #8131 from flippy84/master
Core/Script: Heigan phase 2
2012-12-16 17:03:26 -08:00
Vincent_Michael
f96295f6ca DB/Scripts: Implemented creature_text for Trial of the Champion 2012-12-16 21:05:05 +01:00
Vincent_Michael
db6195789d Core: Fix non pch build 2012-12-14 23:31:08 +01:00
Vincent_Michael
d2cc278283 Core/Spells: Rename spell script scripts in correct script name 2012-12-14 23:19:03 +01:00
CeIa
b87cc31106 Scripts/Events/Achievement: fix 'Out With It'
Credits to @darkman1983

Closes #8211
Closes #8126

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-14 01:23:53 +00:00
Gacko
d34a9df70a Core/DB: Last fixes for creaturetext conversion 2012-12-09 20:03:17 +01:00
Vincent_Michael
1e22367ca4 Core/Scripts: Add missing creature_text for eregos 2012-12-08 01:18:26 +01:00
Vincent_Michael
d96f80cc5d Core/Scripts: Fix crash (need convert in sai) 2012-12-07 17:37:30 +01:00
Vincent-Michael
6ed36342a2 Core: Fix non pch build 2012-12-06 19:03:15 +01:00