Commit graph

180 commits

Author SHA1 Message Date
tomrus88
5b5e266c17 Misc fixes 2008-11-22 09:04:10 +03:00
tomrus88
397efd4fac Merge branch 'master' into 303
Conflicts:
	src/game/SpellEffects.cpp
2008-11-18 18:08:58 +03:00
hunuza
ac00eee418 Replace some MapManager::Instance().GetMap() calls with WorldObject::GetMap() 2008-11-17 17:24:53 +01:00
tomrus88
52b0ab1f89 Merge branch 'master' into 303 2008-11-17 01:50:37 +03:00
VladimirMangos
0ae2133254 [6833] More correct aura cancel for channeled spells.
Remove auras at channeled target.
Cancel channeled spell at spell aura cancel.
Also move battleground resurection spell code to more appropriate place.
2008-11-16 23:33:22 +03:00
tomrus88
dcb39d1512 Cleanup 2008-11-16 21:17:56 +03:00
tomrus88
4e76f1ac98 crash fix 2008-11-16 17:07:11 +03:00
tomrus88
efdb8e01dd Removed direct use of some updatefields 2008-11-15 22:04:00 +03:00
tomrus88
6fae544fbe Merge branch 'master' into 303
Conflicts:
	src/game/WorldSocket.cpp
	src/shared/Database/DBCStructure.h
	src/shared/Database/DBCfmt.cpp
2008-11-10 01:10:52 +03:00
tomrus88
2c1671ef5c Positive auras can be cancelled once again :) 2008-11-09 19:53:24 +03:00
tomrus88
1d3667e765 Some work on visible auras 2008-11-09 18:47:26 +03:00
Megamage
ace2d4815e Prevent proc spell from HOT and DOT ticks.
Signed-off-by: ApoC <apoc@nymfe.net>
2008-11-09 13:32:07 +01:00
tomrus88
50e538c32f Merge branch 'master' into 303 2008-11-09 11:37:52 +03:00
Arthorius
397d855569 [6809] Not reset display model at shapeshift aura remove if it not set at apply.
This must resolve problems with model reset at warrior stance switch.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2008-11-09 09:44:12 +03:00
tomrus88
f6ff7b5a45 Updated some enums 2008-11-09 01:43:22 +03:00
tomrus88
7974d1cb94 Merge branch 'master' into 303
Conflicts:
	src/game/Player.cpp
	src/game/Spell.cpp
2008-11-08 16:52:28 +03:00
tomrus88
7c73afbd22 Raid wide auras, untested 2008-11-08 16:44:10 +03:00
VladimirMangos
4476d483d4 Fixed comment text and code indentifiers spelling.
GetFieldNames part provided by Paradox.
2008-11-06 19:22:23 +03:00
tomrus88
78ec66babc Merge branch 'master' into 303
Conflicts:
	contrib/extractor/System.cpp
	contrib/extractor/ad.exe
	src/game/WorldSocket.cpp
2008-11-06 15:50:47 +03:00
VladimirMangos
88b1974df6 Fixed warnings, unused code and typos.
Including fix  _SCallback for 3 params, triggred mode correct call for .cast back and .cast target.
Remove outdated code for support old 19421 (and ranks) implementation in client data.
2008-11-05 05:06:35 +03:00
tomrus88
9cc6f1f3ec Merge branch 'master' into 303
Conflicts:
	src/game/Level2.cpp
	src/game/Pet.cpp
	src/game/Player.cpp
2008-11-03 14:44:58 +03:00
tomrus88
8d54103456 Fixed spell.dbc structure 2008-11-03 14:22:55 +03:00
VladimirMangos
166007525e More fixes for wrong format arg/value pairs. 2008-11-03 01:48:16 +03:00
VladimirMangos
ed7390dede Instead mark spell as delatable mark it as executed and referenced from Unit current spells array and not deleted spell in like cases.
This is solve crashs if spell deleted at caster die in result triggered spells casting chain from currently executed spell.
2008-11-03 01:48:14 +03:00
tomrus88
97bf2e7d68 Fixed windows build, account data should be saved server side now 2008-10-27 20:00:56 +03:00
tomrus88
ff7318e348 Updated auras enum 2008-10-26 12:14:56 +03:00
tomrus88
629da9de32 Updated spells stuff 2008-10-26 10:15:52 +03:00
arrai
406ac0abe5 * [sql/updates/2008_10_22_01_mangos_quest_template.sql] Implemented honor rewards from quests 2008-10-22 01:20:18 +02:00
arrai
aba291bded * Implemented dummy aura of spell 43873 2008-10-20 00:11:05 +02:00
TheLuda
800ee76535 Imported MaNGOS revision 6767 from http://mangos.svn.sourceforge.net/svnroot/mangos/trunk/ 2008-10-14 00:29:20 +02:00