Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,756 Commits 4 Branches 146 Tags
ee2e776fea38313669fba1f5cb008be648daf7fc
Commit Graph

1996 Commits

Author SHA1 Message Date
Vincent_Michael
ee2e776fea Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 22:03:35 +01:00
Spp
786f27b74c Core/Misc: Missing changes from 8968dbc (Partial revert of 2292025) 
Closes #8843
 2013-01-02 21:23:54 +01:00
Vincent_Michael
5bbf7829b2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 17:42:22 +01:00
Spp
8968dbc5a9 Core/Misc: Partial revert of 2292025 (Core/Misc: Replaced some macro definitions with inline functions) 
- That code is 4.3.4 and wasn't supposed to be pushed to master
 2013-01-02 15:20:38 +01:00
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
d36c4a91ba Core/Misc: Use equal_range instead of lower_bound/upper_bound calls where possible. 2013-01-02 09:53:43 +01:00
Spp
2292025bf9 Core/Misc: Replaced some macro definitions with inline functions 2013-01-02 09:07:52 +01: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
Gacko
01b705c844 Core/Player: Fix armor calculation - 2nd try 
Base armor value from WDB data includes the ArmorDamageModifier. Items of
same item level, required level, armor type and equiptment slot should
have (nearly) the same armor values.

See following links for further proofs:
http://pastebin.com/fqNJLYj4
http://www.wowhead.com/item=50466#comments:id=889035:reply=444786

The shown item should have a base armor value of 177 as similar items and
a bonus armor value of 560 which equals 737 - like in DB atm.
 2013-01-01 21:43:17 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Shauren
47ac83ec3a Core/Units: Check aura presence before casting liquid spell to avoid resetting periodic tick timers 2012-12-31 21:12:33 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Shauren
b229f72bf4 Core/Units: Cleaned up DealDamage log message and moved it to debug level 2012-12-31 18:53:44 +01:00
Shauren
c021bff594 Core/Vehicles: Fixed basepoints used when ride vehicle aura is created for !IsInMap case 2012-12-31 17:58:21 +01:00
Vincent_Michael
6317878b6f Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-31 15:26:57 +01:00
Trista
6edffb036d Core/Vehicles: revert 95152d5753 and 95152d5753 
Sorry about troubles caused, hed reason to think formula was wrong, but it wasn't. However there is part of the code that needs to be improved I describbed in this commit as TO DO: Connected with: #8195
 2012-12-30 01:06:55 +02:00
Subv
9bc339cd89 Core/Movement: MSG_MOVE_TELEPORT is not supposed to be sent to the player being teleported. 
Thanks @vlad852
Closes #8798
Closes #8774
 2012-12-29 15:25:48 -05:00
Subv
3d3a8107e0 Core/Entities: Account for creatures that are spawned below ground level when adding flying flags. (Triggers, mostly) 2012-12-29 14:23:23 -05:00
therzok
5c8c458d60 *Fixing a typo. 2012-12-29 21:14:12 +02:00
Vincent_Michael
871f8c8003 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-29 15:35:10 +01:00
Subv
3ad9dafdb6 Core/Entities: Update movement flags for flying/swimming creatures on Creature::Update 2012-12-29 04:01:55 +01:00
Subv
8f589dcdd0 Core/Entities: Add a delta to the ground level difference for removing the flying movementflags when landing. 2012-12-28 13:53:44 -05:00
Vincent_Michael
06d44ad32d Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-27 19:53:45 +01:00
Subv
873aa5f2a7 Core/Movement: Do not set movement flags for creatures based only on their InhabitType, check if they are actually on air/water. newline. Should allow us to fix some problems on ICC and the mmaps branch. 2012-12-27 19:31:34 +01:00
Nay
7e196e8e58 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-27 17:53:34 +00:00
Vincent_Michael
e48bbac93f Core: Fix warning in 7b9b67a3b3 2012-12-27 01:42:25 +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
Vincent_Michael
7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00
MidnaAT
30936fd1c4 Core/Totem: Have Lightwell use Totem logic 
ref www.trinitycore.org/f/topic/7599-propper-lightwell-handling/
 2012-12-26 04:34:40 +01:00
kaelima
a8cd34c4a4 Core/Battleground: Rename and correct usage of opcode 1223 and increase the timer before arena/bg invitation window is removed to its proper value. Closes #6725 2012-12-26 04:02:42 +01:00
Vincent_Michael
6e921feebd Core: Fix some codestyle 2012-12-25 02:56:19 +01:00
Trista
6189eeb8e6 Core/Movement: Fix codestyle -7092e9350bbb8123de688be0bf5dd87d8196d34f 2012-12-24 23:59:25 +02:00
Shauren
75e7cf7eb5 Core/Quests: Added support for 10/25 man only raid quests 2012-12-24 19:53:28 +01:00
Trista
7092e9350b Core/Movement: Final fix for MSG_MOVE_TELEPORT 
* Creator Subv, (thx to Shauren also who stated that this packed should be used when researchs were started)
- You all should'be thankful, that bug was a real bitch
* Fix creatures using NearTeleportTo (example Urom in Oculus, Skeram/Viscidus in AQ and Heigan in Naxxramas)
 2012-12-24 18:04:58 +02: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
a0ad8f7a46 Core/Entities: Also send MSG_MOVE_TELEPORT to the player 2012-12-23 12:39:51 -05:00
Nay
79b1895223 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-23 16:02:26 +00: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
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
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
MrSmite
09204f1534 Update src/server/game/Entities/Unit/Unit.h 2012-12-22 12:04:10 -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
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
Vincent_Michael
63ea4b1056 Core: Fix some codestyle in 957571e18c 2012-12-21 22:22:36 +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