Nay
407286fe81
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
2012-09-07 03:34:23 +01:00
Nay
21d43781ac
Tabs to spaces...
2012-09-07 03:33:16 +01: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
kaelima
f685e9fb2a
Core/Vehicle: Correction to 5eb22e5b64. Thanks joschiwald (and slap some others) for noticing
2012-09-07 03:31:46 +02:00
kaelima
5eb22e5b64
Core/Vehicles:
...
- Send proper triggering flag when casting spellclick spells on vehicles (should not be fully triggered)
- Only compute non-transport positions when not finalized. (Fixes changing seat on vehicles, or changing vehicle from vehicle)
2012-09-07 03:17:04 +02:00
Vincent-Michael
6f38fb1011
Core: Fix some code style
2012-09-07 02:21:38 +02:00
cyberbrest
aed0ecd2e4
Core/Conditions: Allow multiple condition for spellclick source type
...
Currently unused in 335 but required for some 434 spellclicks
2012-09-06 20:03:21 +01:00
Nay
340dc33b52
Fix some code style issues in previous PR merge
2012-09-06 19:59:27 +01:00
Nay
334c078184
Core/SmartAI: Tiny tiny optimization in an if
2012-09-06 19:58:43 +01:00
Nay
c66d254a39
Merge pull request #7658 from e000/creature-interrupt
...
[Core, Creature] Implement Creature/Pet Interrupts
2012-09-06 11:58:27 -07: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
Vincent-Michael
9f09713b3e
Core/Spells: fix extra damage from crits for talents and equipment effects Closes #6647
2012-09-06 11:14:37 -04:00
tobmaps
fb3a360575
Core/Spells: fix intervening dead targets Closes #2090
2012-09-06 11:05:45 -04:00
Vincent-Michael
5954011a90
Core/Spells: clean up some code and move to spell script. Closes #7195
2012-09-06 11:00:37 -04:00
Aokromes
5617921a55
compile fix
2012-09-06 05:27:14 +03:00
Venugh
c9eb42f246
Core/Commands: Implemented mmaps commands.
2012-09-06 00:36:24 +02:00
Venugh
e7c0d8bef0
Core/MMaps: Applied Trinity Codestyle to PathGenerator.
2012-09-05 23:47:02 +02:00
Subv
ccdca77740
Core/Mmaps: Fixed unloading mmap tiles, the x and y were swapped. thanks to MaNGOS for original implementation, and thanks to @Chevron for noticing.
2012-09-05 16:05:26 -05:00
Subv
593f08609f
Core/Mmaps: Fixed a mistake in BuildPolyPath which could cause swimming creatures to bug in the navmesh generation.
2012-09-05 15:32:35 -05:00
kaelima
bf84a0a97a
Core/Misc: Fix typo from 7c971be3c5. Thanks Shauren
2012-09-05 17:34:25 +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
kaelima
c2f446ded9
Core/MMaps: Minor warning fix
2012-09-05 17:07:47 +02:00
w1sht0l1v3
68a54e6d91
Core/SAI: Add condition to run SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL code
2012-09-05 14:04:09 +03:00
e
89d6900f4b
[CombatAI::SpellInterrupted] Fix Typo
2012-09-05 01:48:25 -04:00
e
98f5d4ef4a
[Core, Creature] Implement Creature/Pet Interrupts
2012-09-04 23:04:59 -04:00
e
f9a1fabc7b
[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
2012-09-04 22:38:59 -04:00
w1sht0l1v3
50cea6638b
Core/SAI: Fix SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL
...
Proper usage of params:
-param1: flat hp value
-param2: percent hp value
Note: only one of these params should be used(in case you set values in both,the script will chose percent)
2012-09-05 04:53:06 +03:00
kaelima
b8d55cc019
Core/BG: Refix cf711ffbe5 Thanks Kiddie
2012-09-05 00:08:22 +02:00
kaelima
69602df833
Core/MMaps: Fix some uninitialized variable complaints in PathGenerator
2012-09-04 23:33:11 +02:00
Shocker
ed6b58b17d
Core/Spells: Avoid unnecessary code execution for SPELL_ATTR3_NO_DONE_BONUS
2012-09-05 00:13:43 +03:00
Vincent-Michael
de15f70501
Core: Fix build
2012-09-04 22:39:04 +02:00
kaelima
cf711ffbe5
Core/BG: Prevent players from using macro to exploit leaving BG queues when they already have entered.
...
- Cleanup and add some comments to MSG_BATTLEGROUND_PLAYER_POSITIONS
Closes #7633
2012-09-04 22:37:27 +02:00
Nay
306e4c173c
Fix a merge failure
2012-09-04 19:58:39 +01:00
Nay
b4bc78e24b
Corrections to previous merged in PR
2012-09-04 19:48:29 +01:00
Nay
0ba06342dc
Merge pull request #7644 from e000/master
...
[Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug.
2012-09-04 11:46:11 -07:00
Nay
36b3e06a7e
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
2012-09-04 19:11:04 +01:00
Kandera
8afecc6572
Core/Gameobject: fix collision for gameobjects
2012-09-04 14:04:47 -04:00
e
1695f78c9f
Fix codestyle per Vincent-Michael
2012-09-04 13:04:30 -04:00
e
1e2ee2d680
[Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug.
2012-09-04 13:00:08 -04:00
Vincent-Michael
a4c115a494
Core: Fix build
2012-09-04 18:21:00 +02:00
Kandera
26af8ac65a
Core/Gameobject: another attempt at fixing collision. chest gameobject initial collision provided by vincent-michael
2012-09-04 12:08:12 -04:00
Nay
73172c67f0
Misc: Convert from CRLF to LF in cs_misc.cpp
...
Also cleanedup whitespace
2012-09-04 16:14:15 +01:00
Kandera
a1e3758484
Core/Reputation: fix forced reputation auras with neutral. closes #5790
2012-09-04 11:11:15 -04:00
Kandera
6d57bf7a75
Core/Battleground: fix unneeded log message
2012-09-04 11:11:14 -04:00
kaelima
a3f9eee4e5
Core/Spells: Fix memory leak when Load() fails from spell/aura-scripts
2012-09-04 17:03:30 +02:00
Shauren
1e9fc84a12
Core: Warning fixes
...
C4100: 'x' : unreferenced formal parameter
C4310: cast truncates constant value
C4389: '==' : signed/unsigned mismatch
C4668: 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
C4701: potentially uninitialized local variable 'x' used
C4826: Conversion from 'HMODULE' to 'DWORD64' is sign-extended. This may cause unexpected runtime behavior.
C6067: Parameter '3' in call to 'sprintf' must be the address of the string
C6387: 'argument 1' might be '0': this does not adhere to the specification for the function 'CloseHandle'
2012-09-04 14:40:41 +02:00
Mik43l
a47ad2f5e1
Core/Auras: Added minimal delay before Rapture cooldown takes effect to allow all bubbles broken by a single damage source proc mana return
...
Closes #7443
Signed-off-by: Shauren <shauren.trinity@gmail.com >
2012-09-04 00:51:26 +02:00
kaelima
76be70a4dc
Core/Battlefield: Fix some memory leaks
2012-09-04 00:37:40 +02:00
kaelima
a9e672ab1d
Core/MMaps: Prevent path generation when falling or exiting vehicle
2012-09-03 20:34:07 +02:00
kaelima
d7eeebe0f3
Core/MMaps: Implement pathed charge effect
2012-09-03 20:30:47 +02:00
