91136ea55f
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/DataStores/DBCEnums.h
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/Commands/cs_reload.cpp
2012-12-27 17:52:11 +00:00
b19563fb6a
Scripts/Trial of the Crusader: Fix Icehowl Script closes #8539
2012-12-27 12:12:27 +01:00
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
7b9b67a3b3
Core/Quest: Drop table quest_end_scripts
2012-12-26 23:20:05 +01:00
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
05a7b3aaea
Scripts/HoO: Implemented the weather effect while on Earthrager Ptah's sandstorm.
2012-12-26 12:48:10 -05:00
e873a22a37
Core: fix build and typo after 0622cf8b64
2012-12-26 18:30:37 +01:00
0622cf8b64
Scripts/Spells: Fixed Mage's Improved Flamestrike, Ice
...
Shards, Shatter, Shattered Barrier, Incanter's Absorption,
Improved Mana Gem, Improved Freeze
2012-12-26 18:03:41 +01:00
30e2ab8e0f
DB/SCRIPTS: Fix text for High Botanist Freywinn and remove creature_ai_texts.
2012-12-26 11:52:05 -03:30
e65da39f23
Core: Fix non pch build
2012-12-26 02:50:19 +01:00
3742205866
Copyright: Added missing license information.
2012-12-25 19:40:57 -05:00
587710feb5
Scripts/HallsOfOrigination: Added script for Earthrager Ptah.
...
ToDo: Fix spell Sand Vortex on Heroic difficulty.
Note: Feedback needed.
2012-12-25 19:36:01 -05:00
6e921feebd
Core: Fix some codestyle
2012-12-25 02:56:19 +01:00
f9e592e9c7
Scripts/HallsOfOrigination: Some work on Halls of Origination.
...
Temple Guardian Anhuur's script added.
ToDo: Make the triggers invisible.
Merry Christmas folks!
2012-12-24 18:25:57 -05:00
d3d9dfd734
Core/Script: Add some talks for Zul'Gurub
2012-12-24 21:38:28 +01:00
b4996c90ff
Core: Fix some codestyle
2012-12-24 17:26:42 +01:00
7b534774b6
Core/Spells: Remove spell script "spell_gen_damage_reduction_aura"
2012-12-24 17:22:33 +01:00
accc83a76d
Core/Scripts: Fix typo
2012-12-24 17:22:33 +01:00
73d1ef7271
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-24 10:35:37 -05:00
ec6f7541b7
Core: Fix merge fail
2012-12-24 14:38:31 +01:00
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
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
6ff69a10b3
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2012-12-23 12:44:22 -05:00
006cc1797a
Core: Fix warning
...
boss_sindragosa.cpp:235: warning: unused parameter killer
2012-12-23 18:04:42 +01:00
79b1895223
Merge remote-tracking branch 'origin/master' into mmaps
2012-12-23 16:02:26 +00:00
3869bb7b3a
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
2012-12-23 08:33:13 -05:00
621a249188
Scripts/Icecrown Citadel: Fixed a possible crash in Blood Nova spell script
...
Closes #7046
2012-12-23 12:42:28 +01:00
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
a3b34e2894
Core: Fix more some codestyle
2012-12-22 01:13:56 +01:00
36ba35285b
Fix
2012-12-21 18:24:21 +01:00
8b34792887
Update
2012-12-21 14:59:40 +01:00
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
d38dfa82e0
Script/AQ: Rewrite Skeram
...
Add spell_target_position for Skeram
Viscidus cosmetic fix
Cosmetic fix
Cosmetic fix .sql
2012-12-20 17:00:00 +01:00
05c38b20ea
Merge pull request #8668 from joschiwald/random_changes
...
Core/Misc:
2012-12-19 23:48:00 -08:00
200968c2dd
Script/AQ: Add Creature Text for Viscidus and fix model scaling
2012-12-19 13:29:55 +01:00
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
80b1b6c494
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/moonglade.cpp
2012-12-19 08:23:34 +01:00
7dd019e7bb
Misc/Script: Convert winter veil mistletoe event in sai
2012-12-18 22:27:48 +01:00
bcff526d28
Core/Script: Add missing changes in c364c367b1
2012-12-18 19:31:41 +01:00
c364c367b1
Core/Script: Fix some codestyle and warnings
2012-12-18 19:16:00 +01:00
3e318686b0
Core: Fix non pch build
2012-12-18 15:33:15 +01:00
40292d9a19
Core/DB: Assign texts to correct creatures
...
Also convert some never used script texts to creature text for future use.
Some scripts or Talk() calls need to be implemented first.
Solves #8659
2012-12-18 15:19:13 +01:00
9991f4ae2d
Implement Viscidus AQ40
...
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-12-18 14:09:27 +00:00
5d77b10c35
Core/Account: Add logs for password change and fail change password
2012-12-18 01:58:12 +01:00
3f82ac9ea7
Core: Fix non pch build
2012-12-18 01:49:08 +01:00
8c286f2b61
Server/Quest: Convert quest_end_script and drop of some c++
...
* drop off c++ script of Clintan Dreamwalker ID: 22834
* convert quest_end_script of 10964 to SAI
* rewrite and add bigger event support
* add a checker to his summon so the spirit script can trigger event alone (I didn't try to rewrite next quest...)
Closes : #8689
2012-12-18 02:03:30 +02:00
323989cc47
Core/Spells: Fix a typo in Bombing Run quests
...
* no idea how this number left like this for so long unseen, good it filters 1 target
2012-12-18 02:03:29 +02:00
e90ec5608e
DB/Scripts: Implemented creature_text for Infinite Corruptor
2012-12-18 00:23:46 +01:00
a227a34947
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/PetAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
2012-12-17 12:13:51 +01:00
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...
* https://github.com/TrinityCore/TrinityCore/commit/48141bbfa6887095f5b4a687ca3bde516c751771
2012-12-17 10:39:54 +02:00
Nay