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
Pitcrawler
bdd625fda3
DB/SAI: Fixes quest: Hell Hath a Fury
2012-12-23 19:02:08 +01:00
Nay
368e7113ce
DB/Players: Fix message sent when DND is enabled
...
Closes #8428
Also update some sql file names
2012-12-23 17:54:19 +00: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
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
Kinzcool
bb8a4c40ba
DB/Creature Text: Added sound & updated some texts with sniffed data for Millhouse Manastorm
2012-12-23 02:08:45 -05:00
Kinzcool
b0c7b01b8e
DB/Creature Text: Added sounds for Warden Mellichar
2012-12-23 01:18:13 -05:00
Warpten
8c53f042ad
Core/StatsSystem: Typos, typos everywhere. Thanks @Wayt for noticing.
2012-12-22 23:46:46 +01:00
Gacko
f1d960a589
DB: The Crusaders Pinnacle chain. Thx @Exodius
2012-12-22 23:07:49 +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
Warpten
05b3cf57b7
DB: Fixed importing 2012_12_08_00_character_worldstate.sql
2012-12-22 19:01:11 +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
Vincent_Michael
a3b34e2894
Core: Fix more some codestyle
2012-12-22 01:13:56 +01:00
Trista
95a201352d
DB/SAI: Finish off converting quest_end_scripts
...
* http://www.trinitycore.org/f/topic/7556-looking-for-people-to-convert-quest-end-scripts/
* fixup some timing errors I made on previous
* someone has to kill table + core linking to it
2012-12-22 01:43:18 +02:00
Vincent_Michael
63ea4b1056
Core: Fix some codestyle in 957571e18c
2012-12-21 22:22:36 +01:00
Vincent_Michael
10d957e3ad
SQL: Fix "No newline at end of file" in af4f42383f
2012-12-21 20:32:41 +01:00
Vincent_Michael
af4f42383f
DB/Conditions: Add conditions for Sigil of the Ebon Blade for only Lithe Stalker
2012-12-21 20:26:50 +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
Vincent_Michael
3e5e3aa2e1
DB/Conditions: Add some conditions for spell targets
2012-12-21 19:34:11 +01:00
Gacko
a8b145348a
Core/Spell: Add missing break.
2012-12-21 14:14:58 +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
joschiwald
4116ba75e3
DB/Conditions: Fix typo in f4e7cde1b5 (argh .... i've failed)
2012-12-20 23:19:29 +01:00
Warpten
a06a57a6c1
Core/StatsSystem: Missing changes to previous commit.
2012-12-20 20:09:29 +01:00
Warpten
9b2d744847
Core/StatsSystem: Resilience updates.
...
* No longer reduces mana draining effects.
* No longer reduces crit chances.
* No longer reduces hit chances.
2012-12-20 19:23:22 +01:00
Vincent_Michael
852d65f7ca
SQL: Rename SQL merged in PR
2012-12-20 16:48:24 +01:00
Subv
957571e18c
Merge pull request #8662 from MrSmite/ItemContainer_1.1
...
Item Loot Saving
2012-12-20 07:00:29 -08:00
Gacko
04a3939a23
Core/Spell: Reimplement Shadow's Fate check
2012-12-20 14:44:26 +01:00
Gacko
699354d8ef
Core/Spell: Shadow's Fate should hit every unit
...
See #8723 for further information
2012-12-20 10:01:07 +01:00
Kaelima
05c38b20ea
Merge pull request #8668 from joschiwald/random_changes
...
Core/Misc:
2012-12-19 23:48:00 -08:00
Vincent_Michael
13c8869c78
SQL: Fix typo in 2a5fcdddd7 (need sleep :/)
2012-12-20 01:53:45 +01:00