Vincent-Michael
910f32d48d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
2014-06-19 22:57:44 +02:00
jackpoz
57069b393d
Core/Dependencies: Upgrade to jemalloc-3.6.0
2014-06-19 22:20:55 +02:00
Vincent-Michael
dc96fb1cee
Core: Fix typo in 316d9a5ce8
2014-06-19 18:51:47 +02:00
Vincent-Michael
316d9a5ce8
Core/Misc: Fix coverity analysis issues
2014-06-19 15:58:33 +02:00
Shauren
fccdba3842
Core/Players: Fixed trainers still displaying profession skills after learning
...
Closes #8103
2014-06-19 15:30:07 +02:00
Aokromes
1962b68ac3
DB/Creature: Spawn Thalorien Dawnseeker's remains
...
Closes #11017
2014-06-19 06:54:05 +02:00
Kinzcool
34572492dd
Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2014-06-18 23:25:57 -04:00
Vincent-Michael
05d17b700d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-18 17:13:18 +02:00
Shauren
6dfc6b145c
Added missing changes for previous commit
2014-06-18 16:31:30 +02:00
Shauren
41daea5b4e
Core/Mail: Implemented sending battle.net account bound items
2014-06-18 00:19:00 +02:00
Shauren
232eaae69c
Scripts/Icecrown Citadel: Fixed a possibility to start the encounter again if Tirion evades during outro RP
...
Closes #10060
2014-06-18 00:00:41 +02:00
Subv
6e35288d5c
Core/Packets: Named some unks and implemented some stuff in SMSG_TRADE_STATUS
2014-06-17 15:22:30 -05:00
Vincent-Michael
fe8e904dea
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2014-06-17 21:22:45 +02:00
Shauren
0f0cea104d
Scripts/Misc: Fixed training dummies not entering combat
2014-06-17 21:13:40 +02:00
Sebastian Valle Herrera
e0bf4d7e7d
Core/Packets: Corrected SMSG_INSPECT_TALENT a bit
...
Send the guild experience in SMSG_INSPECT_TALENT.
2014-06-17 12:41:39 -05:00
Shauren
646fa3cb99
Merge pull request #12301 from Unholychick/patch-3
...
Core/Spells fix 0442ff5c99
2014-06-17 17:24:52 +02:00
Shauren
d60f959fce
Core/Pets: Fixed pet power regeneration
...
Closes #12292
2014-06-17 17:23:30 +02:00
yesitsme
77d70fbc0c
Core/Spells fix 0442ff5c99
...
Let it apply only to players
2014-06-17 16:44:24 +02:00
Trisjdc
83ebab72ac
Merge pull request #12299 from SeTM/patch-1
...
Update SpellAuraEffects.cpp
2014-06-17 15:21:55 +01:00
Alex
16feef9e33
Update SpellAuraEffects.cpp
...
Cleanup. Already in spell scripts.
2014-06-17 16:36:39 +03:00
Trisjdc
4191ad4cb2
DB/SpellGroups: Fix a couple of runtime DB errors from f27821486b
2014-06-17 00:29:29 +01:00
joschiwald
a986e328b0
Merge pull request #12291 from Unholychick/patch-lotp
...
Core/Spells: Fix Leader of the Pack
2014-06-17 01:05:22 +02:00
Unholychick
bd0dd6443f
Core/Spells: Fix Leader of the Pack
...
Broken with 6b430db910 because we used the wrong spell...
2014-06-16 23:07:38 +02:00
Shauren
9c6b541776
Core/Transports: Fixed crashes caused by invalid leftover transport references
...
Closes #12282
2014-06-16 22:50:47 +02:00
Vincent-Michael
97ccfdb625
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Spells/Auras/SpellAuraEffects.cpp
2014-06-16 22:17:27 +02:00
Trisjdc
24d834af17
Fixup
2014-06-16 14:03:21 +01:00
Trisjdc
ddaafdb720
DB/SpellGroups: Fix Poison Stacking
2014-06-16 13:45:03 +01:00
Shauren
85e37db96a
Core/PacketIO: Updated and enabled MSG_LIST_STABLED_PETS
2014-06-16 12:02:18 +02:00
Trisjdc
e8df8ff4df
Core/Auras: Implement stacking interaction between SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE and SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT. Allows BoK/BoS to stack while maintaining the strongest buff
2014-06-16 02:48:48 +01:00
Trisjdc
e9bc7edeff
DB/SpellGroups: Quick fixes in latest SQL
2014-06-16 02:45:26 +01:00
Trisjdc
0442ff5c99
Merge pull request #12284 from Unholychick/patch-mana
...
Core/Spells: Implement SPELL_ATTR7_CAN_RESTORE_SECONDARY_POWER
2014-06-16 01:32:19 +01:00
Unholychick
6b430db910
Core/Spells: Implement SPELL_ATTR7_CAN_RESTORE_SECONDARY_POWER
...
spells without this attribute will no longer energize secondary power.
Druids in cat form will no longer be able to replenish mana from every kind of spell
2014-06-16 01:38:46 +02:00
Trisjdc
f27821486b
DB/SpellGroups: Completely review of WotLK Stack Rules
...
Closes https://github.com/TrinityCore/TrinityCore/issues/4313 , https://github.com/TrinityCore/TrinityCore/issues/1626 , https://github.com/TrinityCore/TrinityCore/issues/5173 , https://github.com/TrinityCore/TrinityCore/issues/5822 , https://github.com/TrinityCore/TrinityCore/issues/12212 , https://github.com/TrinityCore/TrinityCore/issues/3814 , and probably others
2014-06-15 23:22:53 +01:00
Vincent-Michael
6332eaee9f
Core: Kill again whitespace :/
2014-06-15 19:43:10 +02:00
Vincent-Michael
99404900af
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-15 19:38:40 +02:00
Vincent-Michael
26dd770b8e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/shared/Utilities/Util.cpp
2014-06-15 19:36:30 +02:00
jackpoz
4688676f3e
Shared/Misc: Improve Windows crash report
...
Improve WheatyExceptionReport Windows crash report to write a cleaner and more readable crash report, in particular:
- Fix missing variable Type in some cases
- Fix missing variable Name in some cases
- Properly format each member to avoid confusion when reading the log
- Add support for double pointers, e.g. Type**
- Add initial support for arrays, logging the number of elements and the first 10 elements for now. UDT members of array elements are not supported yet
- Skip static members, SymTagVTable and other not needed types
- Skip SymTagUDT with no children
- Fix possible stack overflows when logging strings/char*/char[] values.
- Fix "punting on symbol" error happening when trying to dereference bad pointers.
- Fix <user defined> type being logged instead of the correct type when reaching WER_MAX_NESTING_LEVEL or with pointer types with invalid addresses.
2014-06-15 18:46:20 +02:00
Trisjdc
6098a5e43a
Core/Auras: Add a new stack rule to handle cases where the aura that is 'stronger' prevails (SPELL_GROUP_STACK_RULE_EXCLUSIVE_HIGHEST)
2014-06-15 17:27:57 +01:00
joschiwald
e55835a6a9
Core/Creature: load correct vehicleid of difficulty mode npcs if set otherwise inherit from normal mode entry
...
Closes #8783
2014-06-15 17:49:17 +02:00
joschiwald
7b3141bfde
Scripts/Gurtogg:
...
* fixed bloodboil targeting
* fel rage should only hit players
Closes #12193
2014-06-15 17:41:42 +02:00
Trisjdc
aca3795fa7
Core/Spells: Skip adding CAST_FLAG_RUNE_LIST to rune spells if it's a triggered cast. Solves some of the occasional Death Knight rune visual issues
2014-06-15 15:00:56 +01:00
Trisjdc
4e81e3c194
Core/Vehicles: Define and implement VEHICLE_SEAT_FLAG_B_KEEP_PET
2014-06-15 14:57:04 +01:00
Trisjdc
4615aa60a5
Core/Spells: Define and implement CAST_FLAG_NO_GCD
2014-06-15 14:49:03 +01:00
Shauren
3899d451f9
SQL: Restored file that was not supposed to be renamed
2014-06-15 00:00:31 +02:00
Vincent-Michael
1c80e441a0
Core: Fix non pch build
2014-06-14 23:33:20 +02:00
Discover-
dbc97c0fd3
Merge pull request #12280 from MitchesD/commands
...
Scripts/Commands: added option to show flags_extra (.npc info)
2014-06-14 23:17:39 +02:00
MitchesD
3a8b5179fa
Scripts/Commands: added option to show flags_extra (.npc info)
2014-06-14 22:11:50 +02:00
Vincent-Michael
b64d1e180e
DB/SAI: Fix sai linked error
2014-06-14 22:08:30 +02:00
Vincent-Michael
b7e0c2251e
Core: Fix fail
2014-06-14 22:04:24 +02:00
Vincent-Michael
53caf7959e
Core/Ulduar: Added IsInCombat check for ulduar teleporter
2014-06-14 22:01:50 +02:00