Subv
f6f3680995
Core/BuildSystem: Added some more headers to the collisions project PCH
2012-12-24 10:34:36 -05:00
Subv
6e7734c318
Core/Spells: Fixed interrupting of some bosses spells
2012-12-24 10:13:15 -05:00
Subv
1d45bc0413
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-24 09:00:07 -05:00
Subv
bba1571099
Core/Chat: Corrected SMSG_MESSAGECHAT in a few more places
2012-12-24 08:59:18 -05:00
Vincent_Michael
ec6f7541b7
Core: Fix merge fail
2012-12-24 14:38:31 +01:00
MrSmite
a06006abb0
Update src/server/game/Entities/Unit/Unit.cpp
...
Fix crash on "tame pet"
2012-12-24 03:35:13 -05:00
Warpten
8a52e6b1e3
Core/Battlegrounds: Corrected one typo in SMSG_BATTLEFIELD_STATUS_ACTIVE.
2012-12-24 01:52:29 +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
Subv
181b8fca51
Core/Chat: CHAT_MSG_RAID_BOSS_WHISPER also sends extra data
...
Note: SMSG_MESSAGECHAT is bloated all around the core, a complete mess.
2012-12-23 18:31:30 -05:00
Subv
497dcc5974
Core/Chat: Fixed raid boss emotes.
2012-12-23 18:15:15 -05: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
Subv
64775fba3e
Fixed a merge fail
2012-12-23 13:51:17 -05:00
Subv
7a2c81bfd0
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
2012-12-23 13:24:59 -05:00
Subv
c33a1724ae
Core/Spells: Spells that are usable while stunned should no longer have problems with stun auras that don't apply any mechanic.
2012-12-23 13:21:00 -05:00
stfx
51fadb57e0
Allow setting afk/dnd message in afk/dnd state
...
Also use the same variable to store the message for AFK and DND
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-12-23 17:49:47 +00:00
stfx
01ef119703
Fix receiving whispers while being dnd
...
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-12-23 17:49:46 +00:00
Subv
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
Subv
a0ad8f7a46
Core/Entities: Also send MSG_MOVE_TELEPORT to the player
2012-12-23 12:39:51 -05: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
Subv
522d5c4f3c
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-23 09:33:57 -05:00
Subv
24466d721c
Core/Entities: Missing change from previous commit
...
Calling UpdateObjectVisibility() will make sure that the semi-far teleports (those where the destination position is not in direct sight) will work correctly.
2012-12-23 09:33:29 -05:00
Subv
f4bd89ba03
Build/Core: Fixed build.
2012-12-23 09:07:32 -05:00
Subv
eff2a994b1
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-23 08:34:10 -05:00
Subv
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
Subv
143340b38c
Core/Movement: Fixed near teleports, big thanks to @Trista who basically figured this out on his own.
2012-12-23 08:09:56 -05: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
MrSmite
8ce003700c
Fix pets lagging behind and despawning by slightly adjusting speed
...
if too far from owner.
Closes #8740
2012-12-23 00:13:05 -05:00
Warpten
8c53f042ad
Core/StatsSystem: Typos, typos everywhere. Thanks @Wayt for noticing.
2012-12-22 23:46:46 +01:00
QT
92374d203d
Core/Leveling: Prevent blue text spam 'Your skill in Axes increased to 30'
...
closes #8484
2012-12-22 22:22:18 +01:00
Subv
3f4c6a9d45
Merge pull request #8739 from MrSmite/PetAI_CanAttack_bugfix
...
Fix a minor PetAI behavioral issue
2012-12-22 09:23:55 -08:00
Warpten
d40cbe0113
Core/Battlegrounds: Another typo when building battleground log data.
2012-12-22 18:10:50 +01:00
MrSmite
09204f1534
Update src/server/game/Entities/Unit/Unit.h
2012-12-22 12:04:10 -05:00
MrSmite
9a5b17d536
Update src/server/game/AI/CoreAI/PetAI.cpp
2012-12-22 12:01:51 -05: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
Gacko
8cbb3763dd
Core/Spell: Shadows Fate crash fix
2012-12-22 16:42:46 +01:00
Trista
aabfa3afae
Core/Spell: Properly rewrite previous change: 80dcf879de
...
* thx to @joschiwald for noticing problem and helping, see rest info in comment or previous fix
2012-12-22 06:32:45 +02:00
Trista
80dcf879de
Core/Spells: TARGET_UNIT_MASTER passenger support
...
* what happened before was spells casted from vehicle to passenger getting blocked by general check exceptions that state passengers to be not implicitly spell hit, however they should be ignored when caster is vehicle to master passenger
* fix a lot of quests that award kill credit that was blocked before
* precisely closes : #8643 and makes #5254 awardable
2012-12-22 04:28:31 +02:00
MrSmite
4c9451d54c
Fix pet stopping approach when attacked by another creature
...
Fix pet placed on stay after "attack" not attacking new attackers
Closes #8735
2012-12-21 20:57:22 -05:00
kaelima
a0239c2210
Fix last merge
2012-12-22 02:22:44 +01:00
joschiwald
c19f78c363
Core/Conditions: implement CONDITION_SOURCE_TYPE_SPELL_PROC and use it in old and new proc system
...
Usage:
SourceTypeOrReferenceId: 24
- SourceGroup: always 0
- SourceEntry: spell id of aura which triggers the proc
- ConditionTarget:
* 0 - Actor
* 1 - ActionTarget
2012-12-22 01:37:54 +01:00
Vincent_Michael
a3b34e2894
Core: Fix more some codestyle
2012-12-22 01:13:56 +01:00
Vincent_Michael
63ea4b1056
Core: Fix some codestyle in 957571e18c
2012-12-21 22:22:36 +01:00
Warpten
b5a3947a80
Core/StatsSystem: Fixing up "fucked up logic".
...
Nayd's Seal of Approval.
2012-12-21 20:12:11 +01:00
Warpten
cf99043c1e
Core/StatsSystem: Fixed resilience being considered in non-PvP situations.
...
Also fixed build.
2012-12-21 19:37:50 +01:00
Mislav Blažević
36ba35285b
Fix
2012-12-21 18:24:21 +01:00
Mislav Blažević
8b34792887
Update
2012-12-21 14:59:40 +01:00
Gacko
a8b145348a
Core/Spell: Add missing break.
2012-12-21 14:14:58 +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
Gacko
410586cf43
Core/Spell: Shadow's Fate conditions
...
Some of the quests only can be done in 25man mode
2012-12-20 23:56:09 +01:00