Nay
e3add09fb7
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2012-09-17 00:03:12 +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
Northstrider
f139243de5
Core/Units: pakcet guid change for recent function
2012-09-12 20:39:36 +02:00
Northstrider
058789e866
Core/Units: implement function to play animkit.dbc entrys by using smsg play one shot anim kit.
...
*handle emote command is deprecated for cataclysm; on sniffs i've seen that every npc use the animkit.dbc for playing special emotes.
2012-09-12 07:10:49 +02:00
Nay
64cadf9470
Merge pull request #7733 from CrYser/4.3.4
...
[4.3.4]Core/Spells: Glyph of might
2012-09-11 14:38:01 -07:00
CrYser
9483653c1e
[4.3.4]Core/Spells: Remove useless code
...
Fixes Glyph of Might
2012-09-11 22:34:23 +01:00
Tuxity
045682006a
Core/Stats:
...
- Defense skill doesn't exist since 4.0.X
- Weapon skill doesn't increase during player's level anymore, it's set to the max value for level on each levelup.
2012-09-11 23:14:41 +02:00
Nay
6a1f4f1da0
Resolve merge issues and cleanup whitespace
2012-09-11 01:19:11 +01:00
Nay
68e0ef8039
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/DataStores/DBCEnums.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.h
src/server/game/Instances/InstanceScript.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/OutdoorPvP/OutdoorPvP.h
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Spell.h
src/server/game/Spells/SpellInfo.h
2012-09-11 01:11:14 +01:00
Subv
7bfd36ae80
Core/Spells: Fixed SPELL_AURA_CAST_WHILE_WALKING
2012-09-10 18:20:26 -05:00
Subv
5d57bd646b
Core/Spells: Add parenthesis to some bitwise AND comparisons
2012-09-10 15:54:28 -05:00
Vincent-Michael
06eff1644d
Core/Vehicles: Fix warnings
2012-09-10 15:44:12 +02:00
Spp
358c6a26d6
Core: Warning fixes (Also some -pedantic under game folder)
2012-09-10 13:04:31 +02:00
Warpten
917ffc030e
Core/Guilds: Implemented GuildFinder.
2012-09-10 12:41:42 +02:00
Nay
d6743c7c95
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
sql/updates/world/2012_09_09_02_world_spell_script_names.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
2012-09-10 00:52:35 +01:00
Shauren
83817afd99
Core/Vehicles: Improved vehicle passenger position calculation (still not complete)
2012-09-09 19:56:00 +02:00
Vincent-Michael
2317af8dd3
Core/Spells: Convert Gift of the Naaru in spell script
...
Closes #6545
2012-09-09 04:02:47 +02:00
Nay
7c4e7a9ebc
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
sql/base/characters_database.sql
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/CharacterHandler.cpp
2012-09-09 02:18:58 +01:00
Nay
d04f155b65
Corrections to previous merged in PR
2012-09-09 00:10:23 +01:00
Subv
f9fdf03ec2
Core/Spells: Corrected Glyph of Blessing of Might and Glyph of Blessing of Wisdom.
...
They should not affect Greater Blessing of Might and Greater Blessing of Wisdom.
2012-09-08 07:59:21 -05:00
Nay
242a2fdbc1
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/SkillHandler.cpp
2012-09-08 01:34:24 +01:00
Vincent-Michael
9fc30476ed
Core/Spells: Fix Flash of Light proc only for Infusion of Light
...
Closes : #6274
2012-09-08 02:01:34 +02:00
Subv
20ca59fbc7
Core/Spells: Allow more aura types to use spell_group_stack_rules data.
2012-09-07 17:04:13 -05:00
Nay
19b400761d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Entities/Unit/Unit.cpp
2012-09-07 03:36:47 +01: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
Shauren
82efe7e505
Core/Stats: Fixed spellpower display and implemented gaining spellpower from intellect.
2012-09-06 22:45:21 +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
15086e92f1
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-09-06 17:55:37 +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
Nay
cc28161670
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Commands/cs_reload.cpp
2012-09-05 20:09:48 +01:00
kaelima
7c971be3c5
Core/Misc: Fix some warnings and logic mistakes found by static code analysis
2012-09-05 17:18:05 +02:00
Shauren
8fe7fd4bd5
Core/Units: Updated mana regen and removed 5 second rule
2012-09-05 16:40:42 +02:00
Nay
459454cbe4
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Handlers/BattleGroundHandler.cpp
2012-09-04 23:01:06 +01: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
Nay
b4bc78e24b
Corrections to previous merged in PR
2012-09-04 19:48:29 +01:00
Nay
5ee22a8006
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Commands/cs_misc.cpp
2012-09-04 19:08:22 +01: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
Kandera
a1e3758484
Core/Reputation: fix forced reputation auras with neutral. closes #5790
2012-09-04 11:11:15 -04:00
Nay
2e1de60593
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
2012-09-01 22:19:13 +01:00
kaelima
859b706079
Core/PacketIO: Refix SMSG_TRAINER_BUY_SUCCEEDED and actually activate SMSG_PLAY_SPELL_VISUAL_KIT
...
ref commit c0602889b5
2012-09-01 05:39:19 +02:00
kaelima
c0602889b5
Core/PacketIO:
...
- Rename and fix: CMSG_INSPECT_HONOR_STATS and SMSG_INSPECT_HONOR_STATS.
- Replaced SMSG_TRAINER_BUY_SUCCEEDED with new SMSG_TRAINER_SERVICE.
- Fix sending SMSG_PLAY_SPELL_VISUAL_KIT and removed obsolate SMSG_PLAY_SPELL_IMPACT.
Thanks to mangos
2012-09-01 05:03:15 +02:00
Myran2
4bc983d7b7
Core/Commands: Fix .cheat kill and add instakill immunity to it
...
Closes #7586
2012-09-01 00:36:26 +01:00
Nay
d61f3131fb
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
src/server/scripts/Kalimdor/silithus.cpp
src/server/shared/DataStores/DBCFileLoader.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/tools/map_extractor/System.cpp
src/tools/map_extractor/dbcfile.cpp
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/dbcfile.cpp
src/tools/vmap4_extractor/wdtfile.cpp
2012-08-30 23:06:19 +01:00
Nay
e3d9768a50
Core: Fix many "errors"/warnings and coding style (3)
...
Game
Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 22:44:33 +01:00
Nay
354e46d9e0
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
2012-08-20 22:04:57 +01:00
Kandera
b9f60fe56c
Core/Wintergrasp: finish implementation for battlefields. this is highly experimental enable at you're own risk. will almost definatly cause issues with the wintergrasp patch floating around
2012-08-20 16:23:24 -04:00