Commit graph

613 commits

Author SHA1 Message Date
tomrus88
9b20869a32 Merge branch 'master' into 310
Conflicts:
	src/game/Player.cpp
2009-04-12 14:37:33 +04:00
VladimirMangos
eb198f8239 [7645] Fixed problems wit temporary unsummoned pets and cleanup code.
* Save temporary unsummoned pet to current slot (instead non_in_slot mode) and
  prevent save as current pet summoned while temporay unsummon (arena)
* Prevent overwrite temporary summoned pet data
* At player loading set temporary unsummoned pet data instead pet loading
  if pet expected to be temporary unsummoned in current player state (loading in taxi flight/etc)
* Restore proper pet at arena leave and unsummon in arena summoned.
2009-04-11 08:46:48 +04:00
tomrus88
769a24252b Merge branch 'master' into 310
Conflicts:
	src/game/BattleGroundHandler.cpp
	src/game/Unit.cpp
2009-04-08 15:01:06 +04:00
tomrus88
412a8029ea Removed some outdated comments 2009-04-08 14:54:45 +04:00
Tassader
45438a602f [7635] Spell hit chance cap change to 100% in 3.0.x
(cherry picked from commit cd17dac8d43312751123ee689c314d510b05c6e8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-08 06:06:44 +04:00
tomrus88
14e9afa46f Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
2009-04-07 13:22:10 +04:00
tomrus88
75f4cc6375 Removed some outdated comments 2009-04-07 13:14:11 +04:00
Lightguard
ca5a3d95ca [7629] Update paladin talent 25988 work to 3.0.x
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-07 06:07:42 +04:00
tomrus88
2a8776e567 Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
2009-04-04 23:25:57 +04:00
tomrus88
a9dbe0f661 Removed some outdated comments 2009-04-04 23:24:24 +04:00
False.Genesis
e4daaaedb1 [7610] Fixed problems with Aura::HandleMosPossess for players 2009-04-04 01:21:59 +04:00
tomrus88
3ad6044f72 Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
2009-04-03 21:21:40 +04:00
tomrus88
031e83baa3 Removed some outdated comments 2009-04-03 21:20:06 +04:00
freghar
0fc68c5e1e [7609] Trailing whitespace cleaning
Here we are again! "git diff --check" !!

Signed-off-by: freghar <compmancz@gmail.com>
2009-04-03 16:46:39 +02:00
tomrus88
17d86309fa Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
2009-04-03 11:28:51 +04:00
tomrus88
c0764cdf18 Removed some outdated comments 2009-04-03 11:23:19 +04:00
arrai
1ec8e1f24d [7597] Fixed crash at stealing single target auras (54648 for example) 2009-04-01 23:11:25 +02:00
tomrus88
abae3cac91 Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
	src/shared/Database/SQLStorage.cpp
2009-03-30 15:01:04 +04:00
tomrus88
8871f281bf Removed some outdated comments 2009-03-30 14:52:46 +04:00
VladimirMangos
f38283eba6 [7583] Use instead BasePoints+1 hardcoded formula more correct BasePoint+BaseDice hide in special helper function. 2009-03-29 22:46:32 +04:00
arrai
5dd3ce31bc [7576] Fixed spell range check for spells with minimal distances 2009-03-28 22:27:39 +01:00
pasdVn
910d4c8155 [7569] Fix typo in spell damage/healing default bonus for staked spell
Signed-off-by: pasdVn <pasdVn@getmangos.com>
2009-03-28 15:16:51 +03:00
pasdVn
fa63fc96f8 Fix typo in spell block chance calc
Signed-off-by: pasdVn <pasdVn@getmangos.com>
2009-03-28 13:33:01 +03:00
tomrus88
963aed5e0b Merge branch 'master' into 310
Conflicts:
	src/game/Player.cpp
	src/game/Player.h
	src/game/Unit.cpp
2009-03-26 14:28:37 +03:00
tomrus88
9bc487953e Removed some outdated comments 2009-03-26 14:14:47 +03:00
VladimirMangos
c33eff13f4 [7540] Move most reputation/force faction reaction code to new ReputationMgr. 2009-03-26 11:28:56 +03:00
VladimirMangos
df9caf58cd [7538] Hide some implementation details for reputation/forced faction reaction. 2009-03-25 21:28:04 +03:00
VladimirMangos
fa098236af [7526] Use NULL for pointers instead 0 2009-03-23 17:37:23 +03:00
`win
0f6b2ab9ae [7523] Fixed: players will now drop flag in battleground if they cast immunity buff on themselves.
TODO: players who carry flag in bg are imune to immunity buffs casted by friendly players. (todo added to code).
Bug: if paladin casts Hand of protection on flag carrier - flag will be dropped, but he should get "target is immune" message.
Fixed: Do not call Battleground::Update for battleground template objects.
Fixed: Do not allow immune player to click on object in battleground (not sure if this is correct in all cases).

Signed-off-by: Triply <triply@getmangos.com>
2009-03-23 10:16:44 +01:00
tomrus88
e5bde711ea Merge branch 'master' into 310
Conflicts:
	src/game/Chat.cpp
	src/game/Chat.h
	src/game/GameObject.cpp
	src/game/Level2.cpp
2009-03-21 15:48:51 +03:00
AlexDereka
8a5e4706bc [7506] Remove dual ERROR in logs 2009-03-21 11:47:57 +03:00
Lightguard
0bb15c0593 [7504] Implement glyph item 42397 bonus work.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-21 01:25:43 +03:00
Lightguard
610a040240 [7500] Not allow stacking some auras at target from different casters.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-20 00:14:59 +03:00
VladimirMangos
4bc5bf3877 [7497] Remove auras from GO owner at remove connected owned th this spell GO. 2009-03-19 21:58:31 +03:00
tomrus88
9d2acc22b4 Merge branch 'master' into 310
Conflicts:
	src/game/GameObject.cpp
2009-03-18 07:45:29 +03:00
VladimirMangos
c99a849eb9 [7475] Move Player::IsInFeralForm to Unit::IsInFeralForm 2009-03-16 23:22:52 +03:00
VladimirMangos
5d6cb5fe80 [7468] Convert pet cast check code to use SpellCastResult and finaly fix SPELL_CAST_OK value (255 custom value now) 2009-03-16 15:40:43 +03:00
VladimirMangos
0e987bf59e [7467] Use SpellCastResult and replace CanCast by CheckCast.
Note: proper way to check: if(spell->CheckCast(...)==SPELL_CAST_OK)
2009-03-16 13:17:44 +03:00
=Neo2003
9b1216f21c [7458] Not reset/set some data at attack target switch that expected do at any target lost.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-14 23:40:57 +03:00
VladimirMangos
3a5d59c0c7 [7450] Fixes and improvements in TARGET_BEHIND_VICTIM, SPELL_EFFECT_JUMP2, SPELL_EFFECT_TELEPORT_UNITS work.
* Move near teleport code for player/creature in Unit::NearTeleportTo
* Allow correctly seelct target and end point orientation for script casted spells with TARGET_BEHIND_VICTIM
* Replace use BuildTeleportAckMsg by BuildHeartBeatMsg for creature teleports. BuildTeleportAckMsg
  set active mover for targeted player to affected creature and "freeze" player.
2009-03-13 17:08:10 +03:00
tomrus88
31b3ee95ad Merge branch 'master' into 310
Conflicts:
	src/game/Level2.cpp
	src/game/PetHandler.cpp
	src/game/Player.cpp
	src/game/Player.h
	src/game/SkillHandler.cpp
2009-03-11 12:22:58 +03:00
DiSlord
2240fc49aa [7430] Fix warror ability heal amount
Signed-off-by: DiSlord <DiSlord@nomail.ru>
2009-03-09 23:01:28 +03:00
balrok
0babfec043 [7424] Codestyle: removed not needed \n in log output.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-09 14:20:10 +03:00
VladimirMangos
4dad8f40d0 [7419] Fixed some type convertion warnings. 2009-03-09 08:23:25 +03:00
VladimirMangos
44f3c15710 Revert "Flat Modifier for Glyph of Spiritual Attunement"
This reverts commit 332371c284a6513693786ab6c3fa933570953159.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

unexpectadly cpushed, sorry.
2009-03-09 06:43:46 +03:00
multiplexer
ba1cfbf121 Flat Modifier for Glyph of Spiritual Attunement 2009-03-09 03:39:54 +03:00
tomrus88
8f9849969b Updated to 9658 client build, SMSG_ADDON_INFO temporary disabled 2009-03-08 01:51:23 +03:00
tomrus88
6aadc16d7d Merge branch 'master' into 310
Conflicts:
	src/game/Player.cpp
	src/game/QueryHandler.cpp
2009-03-06 08:03:34 +03:00
VladimirMangos
c18d20782b Implement some death related achievements
* ACHIEVEMENT_CRITERIA_TYPE_DEATH (normal and arena types counting)
* ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON (instance types by man limit counting)
  Note: need fixed for cases when max allowed players different from recommended count.
* ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM (environment damage sources by types)

Fixed:
* ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER
   - self-kill counting as death from players
   - same team player kill in opposition kills counter.

Also cleanup in Player::EnvironmentalDamage use DBCStructure.h comment.
2009-03-06 04:26:48 +03:00
pasdVn
0d96837d48 [7375] Typos in dynamic object registering and deleting for owner.
This let have more then one persistent aura in same time.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-03 23:53:28 +03:00