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

478 Commits

Author SHA1 Message Date
Nay
e6a07076c3 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-01-14 13:58:34 +00:00
Spp
802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Vincent_Michael
b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-01-07 16:57:39 +01:00
Nay
d0e4e20265 Merge pull request #8825 from joschiwald/vmapspelligno 
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
 2013-01-07 07:36:40 -08:00
Vincent_Michael
5bbf7829b2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 17:42:22 +01:00
Spp
601fcc5612 Core/Misc: Removed odd code from CreatureAIImpl.h, it does not belong here 
- Also some minor corrections from previous commit
 2013-01-02 14:20:20 +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
5280a77fe1 Core/Misc: Some minor changes here and there 2013-01-02 11:00:16 +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
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
joschiwald
18bfa14b74 Core/DisableMgr: readd possibility to disable los check for spells 2012-12-31 01:48:51 +01:00
joschiwald
22896bd7a4 Core/VMaps: drop "vmap.ignoreSpellIds" in config, this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS 2012-12-30 18:52:32 +01:00
Nay
7e196e8e58 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-27 17:53:34 +00: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
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
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
joschiwald
5c33c54054 Core/Player: correct SetHomebind and cleanup Spell::EffectBind 2012-12-08 23:46:16 +01:00
Warpten
ff1ca5522e Core/Spells: 
* Bryntroll's Drain Life should not crit.
* Bestial Wrath can be used while under CC since patch 3.3.2

Patch 3.2.2 (2009-09-22): "Bestial Wrath and The Beast Within Changed to function like PvP Trinkets, removing any movement impairing effects, and giving immunity to these effects for 10 seconds.", also the tooltip doesn't say this, but it now breaks all forms of CC that a PvP trinket would break (including Cyclone,Sap, etc.).
 2012-12-01 14:21:44 +01:00
Spp
2251d1bfae Core/Misc: Set mode 0644 for files 2012-11-27 13:03:12 +01:00
Shauren
ba18fe1e56 Core/Spells: Fixed combat log for spells that affect item durability 2012-11-25 11:13:39 +01:00
joschiwald
e83c5d1a0f Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails 2012-11-24 02:45:48 +01:00
Nay
24cd72c8e1 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Maps/Map.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/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.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/Spells/SpellEffects.cpp
 2012-11-23 23:39:03 +00:00
Nay
4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00:00
Subv
6325060804 Core/Spells: Enslave Demon shouldn't be usable on player pets. 
Closes #7133
 2012-11-14 10:33:56 -05:00
kaelima
3c13454ad7 Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-11-05 12:02:08 +01:00
Spp
013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +02:00
Spp
663db1cee3 Core/Misc: Add default count param to HasItemCount 2012-10-23 13:11:57 +02:00
Subv
9dc2b7ecd5 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-10-19 17:57:30 -05:00
kaelima
ca276292dc Core/BG: 
- Force removal of stealth and invisible auras when using gameobjects with type GAMEOBJECT_TYPE_FLAGSTAND and GAMEOBJECT_TYPE_FLAGDROP
- Do not allow players to use unfriendly battleground objects (prevents flag cap with Nitro Boosts active for example)
 2012-10-17 16:56:35 +02:00
kandera
104b86f3d4 Merge pull request #8042 from Retriman/SpellBarkskin 
Core/Spell:
 2012-10-11 05:41:24 -07:00
Retriman
d02298509f Core/Spell: 
*Barkskin can be used to stun and sleep.
 2012-10-11 01:32:28 -04:00
Subv
f7d3600e7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-10-04 19:39:09 -05:00
Spp
7831ecdb18 Core: "Initial support for C++11 compilers" 2012-10-02 15:06:19 +02:00
Spp
380db44583 Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct 2012-10-02 12:17:42 +02:00
Nay
863229afbe Merge remote-tracking branch 'origin/master' into mmaps 2012-09-19 00:02:25 +01:00
Spp
8c5f011e79 Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr) 
Note: No real use in 3.3.5 but will be used in 4.3.4
 2012-09-18 14:29:53 +02:00
Nay
2431895a54 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
 2012-09-17 00:04:07 +01:00
Shauren
bc912af806 Core/Spells: Defined and implemented SPELL_ATTR5_DONT_TURN_DURING_CAST. 
This attribute controls whether unit can turn during casting spells (fixes Ingvar's Dark Smash)
 2012-09-16 23:34:30 +02:00
Nay
b1c4118a33 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 01:13:41 +01:00
Spp
358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
Nay
4896a1775e Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-09-10 00:54:29 +01:00
Shauren
97a92036d1 Core/Spells: Fixed typo in previous commit 2012-09-09 19:22:30 +02:00
Shauren
53002dfe03 Core/Spells: Set UNIT_FIELD_CHANNEL_OBJECT also for spells that don't have explicit target unit but use NEARBY selection, fixes #7246 2012-09-09 17:52:27 +02:00
Nay
50327363ca Merge remote-tracking branch 'origin/master' into mmaps 2012-09-09 02:26:31 +01:00
Subv
be181b2ccd Core/Spells: Use the UNIT_FIELD_CHANNEL_OBJECT field instead of Spell::m_targets to select the channel targets of a triggered spell. 
Closes #7246
 2012-09-08 07:51:57 -05:00
kaelima
a2d533752c Core/MMaps: Add several safety checks to confirm a valid path generation. 
- Address some issues in TargetMovementGenerator. Thanks Chevron
 2012-09-07 04:21:11 +02:00
Nay
0522e50c86 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Spells/Spell.cpp
 2012-09-06 18:01:51 +01:00
tobmaps
fb3a360575 Core/Spells: fix intervening dead targets Closes #2090 2012-09-06 11:05:45 -04:00
Venugh
e7c0d8bef0 Core/MMaps: Applied Trinity Codestyle to PathGenerator. 2012-09-05 23:47:02 +02:00
kaelima
7c971be3c5 Core/Misc: Fix some warnings and logic mistakes found by static code analysis 2012-09-05 17:18:05 +02:00