tomrus88
335b32dbc3
Merge commit 'origin/master' into 310
2009-05-02 19:56:19 +04:00
tomrus88
b980e9ac59
Updated to 3.1.2.9855 client build, fixed quests, some work on monster movement. Not tested.
2009-05-02 19:41:00 +04:00
ApoC
434cbc2150
[7743] Coding style fix.
...
Signed-off-by: ApoC <apoc@nymfe.net>
2009-05-02 00:38:14 +02:00
tomrus88
21a38a42d8
Merge commit 'origin/master' into 310
2009-04-30 13:55:38 +04:00
AlexDereka
6192fcbd0c
[7733] Fixed compile error on VC2005ee.
2009-04-29 15:30:19 +04:00
tomrus88
d4323e0071
Merge commit 'origin/master' into 310
...
Conflicts:
src/game/CharacterHandler.cpp
src/game/Player.cpp
2009-04-29 11:51:15 +04:00
zhenya
8144f30199
[7730] Some optimizantion and code style.
...
Signed-off-by: AlexDereka <dereka.alex@gmail.com>
2009-04-29 01:05:21 +04:00
tomrus88
950a4bf13f
Merge commit 'origin/master' into 310
...
Conflicts:
src/game/Player.cpp
2009-04-28 19:08:53 +04:00
VladimirMangos
73db1cbe01
[7723] New AI call EnterCombat called at enter creature to combat (and re-enter if leave by some reason).
2009-04-27 03:40:50 +04:00
AlexDereka
c9d51a6dc7
[7716] Fixed some typos and possible crashes.
2009-04-26 18:49:07 +04:00
tomrus88
55d6fbe3cb
Merge commit 'origin/master' into 310
2009-04-25 17:24:05 +04:00
VladimirMangos
5d9516354e
[7709] Cleanups in AI()->AttackedBy use.
...
* Remove redundent AI()->AttackedBy call at melee cast in state update (called in cast)
* Move attacks state update call after first attack instead after all extra attack state updates.
2009-04-24 18:54:18 +04:00
Trazom
eedc10d46f
[7703] Implement heal/damage total counters and related BG achievments.
...
* ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE
* ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-23 23:56:15 +04:00
Trazom
9136354e7f
[7702] Implement some damage/healing achievement statistics.
...
* ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT
* ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED
* ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED
* ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED
* ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED
* ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-23 22:04:08 +04:00
Trazom
7c0201f834
[7701] Move explicit healing repeating code to DealHeal functions.
...
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-23 04:54:57 +04:00
VladimirMangos
d910610600
[7697] Interrupt casting at enter to evade mode.
2009-04-22 18:05:59 +04:00
AlexDereka
cc83cac0aa
[7696] Fixed compile warnings
2009-04-22 17:03:34 +04:00
NoFantasy
4fd4cc31d1
[7695] Fixed typo & -> &&
...
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-22 15:35:46 +04:00
tomrus88
a9e148edac
Merge commit 'origin/master' into 310
...
Conflicts:
src/game/AchievementMgr.cpp
src/game/BattleGroundHandler.cpp
src/game/CreatureEventAIMgr.cpp
src/game/DBCStructure.h
src/game/Player.cpp
src/game/Spell.cpp
src/shared/revision_nr.h
2009-04-21 15:20:45 +04:00
VladimirMangos
fc0e1ecdf1
[7690] Move GetCreature/GetGameobject to class Map.
...
* This let get objects at map without reference to player or another object.
* Simplify future implementation for per-map storage for like objects
2009-04-20 19:08:13 +04:00
Lightguard
f97735f519
[7686] Implement aura SPELL_AURA_ADD_CASTER_HIT_TRIGGER (111).
...
Fixed bug with triggering SPELL_AURA_SPELL_MAGNET at non-magic casts (special weapon attacks).
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-19 00:42:16 +04:00
tomrus88
d6f6272f8c
Merge branch 'master' into 310
2009-04-14 15:54:43 +04:00
Lightguard
c62543fa52
[7670] Revert "Not apply/remove passive auras on aura state change (not need)"
...
This reverts commit d5f6eefd1bb3c64797e54d19cc58ccc8c4cf8a4f.
Some 3.0.x talents not work without this like 44441
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-14 14:57:57 +04:00
VladimirMangos
d85e95295d
[7668] Cleanup In CreatureAI function descriptions and AttackStart/AttackedBy use.
...
* Use AI::AttackStart calls only in case explicit request creature attack from core or AI code "attack it if can".
Like taunt, pet handler attack command.
* Use AI::AttackedBy for reaction at hostile action "do something at hostile action"
Like non-dot damage, swing, negative spell landing, or fade fear/etc.
And provided by default call AttackStart if no current target.
This fix some problems, like:
* Civilian will react propertly at attack by another creature (not pet or player).
* Will not cases (at least triggred by core) when attack target start run to attacker before any real hostile action apply.
2009-04-14 10:14:10 +04:00
VladimirMangos
56350b32ed
[7663] Fixed crash at interrupting channeled spell. Cleanup spell interrupt code.
2009-04-13 10:48:26 +04:00
VladimirMangos
0e1997f746
[7657] Implement function for access to gameobject owned by unit and created by some spell.
2009-04-13 01:07:21 +04:00
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