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
9fc30476ed
Core/Spells: Fix Flash of Light proc only for Infusion of Light
...
Closes : #6274
2012-09-08 02:01:34 +02:00
20ca59fbc7
Core/Spells: Allow more aura types to use spell_group_stack_rules data.
2012-09-07 17:04:13 -05:00
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
f685e9fb2a
Core/Vehicle: Correction to 5eb22e5b64. Thanks joschiwald (and slap some others) for noticing
2012-09-07 03:31:46 +02:00
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
6f38fb1011
Core: Fix some code style
2012-09-07 02:21:38 +02:00
82efe7e505
Core/Stats: Fixed spellpower display and implemented gaining spellpower from intellect.
2012-09-06 22:45:21 +02:00
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
15086e92f1
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-09-06 17:55:37 +01:00
9f09713b3e
Core/Spells: fix extra damage from crits for talents and equipment effects Closes #6647
2012-09-06 11:14:37 -04:00
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
7c971be3c5
Core/Misc: Fix some warnings and logic mistakes found by static code analysis
2012-09-05 17:18:05 +02:00
8fe7fd4bd5
Core/Units: Updated mana regen and removed 5 second rule
2012-09-05 16:40:42 +02:00
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
ed6b58b17d
Core/Spells: Avoid unnecessary code execution for SPELL_ATTR3_NO_DONE_BONUS
2012-09-05 00:13:43 +03:00
de15f70501
Core: Fix build
2012-09-04 22:39:04 +02:00
b4bc78e24b
Corrections to previous merged in PR
2012-09-04 19:48:29 +01:00
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
1695f78c9f
Fix codestyle per Vincent-Michael
2012-09-04 13:04:30 -04:00
1e2ee2d680
[Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug.
2012-09-04 13:00:08 -04:00
a1e3758484
Core/Reputation: fix forced reputation auras with neutral. closes #5790
2012-09-04 11:11:15 -04:00
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
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
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
4bc983d7b7
Core/Commands: Fix .cheat kill and add instakill immunity to it
...
Closes #7586
2012-09-01 00:36:26 +01:00
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
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
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
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
d7a7a9800b
Battlefield: Make sBattlefieldMgr a pointer. By Subv.
2012-08-20 13:48:47 -04:00
6cea446f22
Core/Objects: Encapsulated Postion::m_orientation field to ensure it is always normalized to 0-2pi range
...
Closes #7400 .
2012-08-20 10:44:14 +02:00
56495da72e
Merge pull request #7446 from Tuxity/druid_models
...
[434] Add new druid forms for trolls and worgens.
2012-08-19 06:28:28 -07:00
1f22bafe6e
Core/Players: Add new druid forms for trolls and worgens.
2012-08-19 15:21:42 +02:00
3c2598d6cf
Core/Players: Dire Bear Form was removed in 4.0.1
2012-08-19 15:19:20 +02:00
38dbff8c38
Core/Spells: Add totem models for goblin
2012-08-19 04:46:04 +02:00
05aab73dfd
Core/Auras: Removed unused aura types
2012-08-18 13:12:12 -05:00
c43bba98a3
Core: Fix build and cleanup whitespace and double semicolon
2012-08-18 17:56:09 +01:00
c5929fa091
Core/Spells: Removed more deprecated spells code
2012-08-18 09:17:49 -05:00
b55537e510
Core/Spells: Cleanup some old code
2012-08-17 21:12:10 -05:00
7e2c8f5ed9
Core/Spells: Fixed some auras
2012-08-17 20:57:39 -05:00
40cfb0fa85
Core/Spells: Implemented the haste modifying auras.
2012-08-17 18:06:29 -05:00
9749fe55f8
Better way to fix some of the warnings of the previous commit
2012-08-17 14:30:10 +02:00
8da0bbdbb3
Core: Fix compile (Thanks to Sovak for reporting). Remove many warnings and Fix possible out of bounds access to Void storage
2012-08-17 10:25:29 +02:00
0499123f20
Core/Spells: Removed more deprecated spells code
2012-08-16 20:51:27 -05:00
9f989dbcda
Core/Spells: More cleanup of deprecated spells code
2012-08-16 20:09:15 -05:00
759e73c78f
Core/Spells:
...
* Implemented aura 328 SPELL_AURA_PROC_ON_POWER_AMOUNT.
* Added eclipse power energize handling.
Closes #7417
2012-08-16 19:55:01 +01:00
eb3ecac70f
Core/Spells: Cleaned up more deprecated spells code
2012-08-15 17:22:58 -05:00
9fc75cffc9
Core/Stats:
...
- Update dodge base, parry cap and dodge cap values to cataclysm.
- Remove useless function since defense skill was remove in 4.0.1
2012-08-15 01:19:48 +02:00
c0adf370e5
Core/Vendors: Add currencies to vendors
...
npc_vendor table gets a new field, type (1 is item, 2 is currency)
for type 1 fields still mean the same, for type 2 maxcount is buycount (without any "precision")
changed structure of SMSG_UPDATE_CURRENCY(_WEEK_LIMIT) but not enabled, wrong values are being wrongly calculated
2012-08-14 18:11:06 +01:00
Nay