tomrus88
71b1065c8b
Merge branch 'master' into 303
...
Conflicts:
src/game/CharacterHandler.cpp
src/game/Chat.h
src/game/Player.h
src/game/World.h
src/game/debugcmds.cpp
2008-12-16 07:30:23 +03:00
ApoC
a5331ab517
[6910] Implemented rewritten arenas. Original author w12x@getmangos.com
...
Many thanks also to:
Balrok@github.com for long time updating.
Triply@github.com for great work in rewriting process.
All who I forget to name.
Signed-off-by: ApoC <apoc@nymfe.net>
2008-12-16 00:17:24 +01:00
VladimirMangos
09e8ea2ae6
Update effect 155 name -> SPELL_EFFECT_TITAN_GRIP
2008-12-14 22:18:00 +03:00
TERRANZ
558909614a
Implement one hand wielding two-hand weapon ability (warrior talent 46917)
...
Signed-off-by: TERRANZ <TERRANZ@mangos.ru>
Small slot checking fixes and make dual wielding dependent from related ability.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2008-12-14 19:29:31 +03:00
DiSlord
6c02f00a93
Merge branch 'master' of git@github.com:mangos/mangos.git into procflag
2008-12-12 01:34:09 +03:00
VladimirMangos
3da9f3f4cc
[6889] Backport some not client version specific changes and fixes from 303 branch.
2008-12-09 14:08:29 +03:00
DasBlub
26d1574eb1
[6880] fixed spell 26275 for game object 180797
...
Signed-off-by: arrai <array.of.intellect@gmail.com>
2008-12-09 00:28:29 +03:00
thenecromancer
fdd4fcd48f
Set correct base damage for spell 37674
...
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2008-12-09 00:28:28 +03:00
megamage
ca5278ba6e
[6877] Fix Prayer of Mending. Use original caster's healing bonus.
2008-12-09 00:28:27 +03:00
DiSlord
9b842b6fdc
Work under spell mods
...
* Add support > 64 bit spellFamily mask
* Remove not used fields in SpellModifier
* Remove not used (and not correct work vs charges) GetTotalFlatMods, GetTotalPctMods
* Use DBC based data for spell_affect
* More better work SPELL_AURA_ADD_TARGET_TRIGGER aura
Signed-off-by: DiSlord <dislord@nomail.com>
2008-12-08 23:22:39 +03:00
DasBlub
3f90b66125
[6880] fixed spell 26275 for game object 180797
...
Signed-off-by: arrai <array.of.intellect@gmail.com>
2008-12-06 14:29:20 +01:00
thenecromancer
aef1542792
Set correct base damage for spell 37674
...
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2008-12-06 08:03:42 +03:00
megamage
3c67ea6f67
[6877] Fix Prayer of Mending. Use original caster's healing bonus.
2008-12-06 04:50:44 +03:00
tomrus88
af1e1d7794
Merge branch 'master' into 303
...
Conflicts:
src/game/Corpse.cpp
src/game/DynamicObject.cpp
src/game/GameObject.cpp
src/game/Object.h
src/game/Unit.cpp
src/game/Unit.h
2008-12-05 18:16:31 +03:00
Neo2003
9254ca19e6
[6873] make gameobjects scriptable. Patch provided by NoFantasy.
...
Signed-off-by: Neo2003 <neo.2003@hotmail.fr>
2008-12-04 21:53:43 +01:00
tomrus88
e556b67ddc
Fixed compile errors
2008-11-30 17:04:36 +03:00
tomrus88
0e0d721292
AuraConvertRune, EffectActivateRune, dunno if it's correct way to do that...
2008-11-30 16:16:00 +03:00
tomrus88
700d3cf609
Some work on Runic Power and Milling Spell Effect
2008-11-30 13:53:33 +03:00
tomrus88
93cf13acec
Merge branch 'master' into 303
...
Conflicts:
src/shared/Database/DBCStores.cpp
src/shared/Database/DBCfmt.cpp
2008-11-28 07:20:02 +03:00
Blaymoira
a0f45f295e
SpellEffect Fix for 40802, 43723
...
(cherry picked from commit 90ec5bed9a29a06190c72851a6bd6e57c3b9bdbc)
Signed-off-by: Blaymoira <handras@emitelnet.hu>
40802: use exiting function instead code duplication.
43723: added in commented state (impossible propertly fix without hacks until targeting mode 7 implementation)
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2008-11-28 00:17:35 +03:00
DiSlord
4a07c0c6c2
Apply procPatch
2008-11-26 22:23:10 +03:00
tomrus88
af6acab8f8
Merge branch 'master' into 303
...
Conflicts:
src/game/Creature.cpp
2008-11-26 19:44:03 +03:00
VladimirMangos
4ccfa1e71e
[6848] Implement possibility creating gm log per account files using new option in mangosd.conf. Releated cleanups.
2008-11-24 22:44:29 +03:00
tomrus88
5fae2418ab
Misc fixes
2008-11-23 16:18:14 +03:00
tomrus88
8e32c8ca76
Speedup map checks
2008-11-19 21:55:19 +03:00
tomrus88
c0c0c9c776
barber shop race/gender checks, fly check for map 571
2008-11-19 01:00:41 +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
efdb8e01dd
Removed direct use of some updatefields
2008-11-15 22:04:00 +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
hunuza
90828fa699
Cache highest arena team/guild ids. Some code clean up.
2008-11-05 16:58:57 +01: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
tomrus88
cffc766fb6
Merge commit 'origin/master' into 303
...
Conflicts:
src/game/SpellEffects.cpp
src/game/World.cpp
2008-11-01 08:10:24 +03:00
VladimirMangos
41b876b395
[2008_10_31_01_mangos_creature_template.sql] Creature related code and DB cleanups.
...
* Rename 2 creature_template fields to more clean names and related code update also.
* Use enum values instead raw values for type_flags, use halper functions instead code repeating.
* Move tamed pet creating code to new function.
2008-10-31 20:45:22 +03:00
tomrus88
8d733e8f8a
Merge branch 'master' into 303
2008-10-28 23:04:02 +03:00
VladimirMangos
74ddd38af3
Prevent crash at access to deleted social data for player.
...
Remove social data at logout instead ~Player that called also for temporary Player object for Player::MinimalLoadFromDB call.
2008-10-27 18:47:13 +03:00
tomrus88
233e5eac6f
Merge branch 'master' into 303
...
Conflicts:
src/game/ObjectMgr.h
2008-10-27 01:27:48 +03:00
ApoC
4482593653
Fixed posible crash in my prev. commit
...
thx. to Hanuza who point it out.
Signed-off-by: ApoC <apoc@nymfe.net>
2008-10-26 21:07:02 +01:00
ApoC
6f6a1a7608
Default behaviour of pets for creatures changed to REACT_DEFENSIVE
...
Fixed typo: changed m_ReactSate to m_reactState
Signed-off-by: ApoC <apoc@nymfe.net>
2008-10-26 18:24:45 +01:00
tomrus88
629da9de32
Updated spells stuff
2008-10-26 10:15:52 +03:00
TheLuda
adc46ef907
Applied new coding standard, see http://github.com/mangos/mangos/wikis/codingstandards for more.
2008-10-15 18:26:08 +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