Commit Graph

7107 Commits

Author SHA1 Message Date
Vincent_Michael
b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
2013-01-07 16:57:39 +01:00
blub
9ad1857e59 Merge pull request #8826 from joschiwald/mmaps_disable
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
2013-01-07 07:52:35 -08:00
Nay
d0e4e20265 Merge pull request #8825 from joschiwald/vmapspelligno
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
2013-01-07 07:36:40 -08:00
Nay
5f28502c0a Merge pull request #8738 from joschiwald/spell_proc_conditions
Core/Conditions: implement CONDITION_SOURCE_TYPE_SPELL_PROC and use it i...
2013-01-06 18:29:55 -08:00
Valcorb
8743e9d368 Fix a small typo 2013-01-07 00:55:11 +01:00
Valcorb
8d9476fd9c Make sure that "guardians" also gain the owner's speed 2013-01-06 22:35:25 +01:00
Vincent_Michael
24e0eb1812 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-05 16:55:17 +01:00
Vincent_Michael
7dd0cd4403 Core: Fix non pch build 2013-01-05 16:33:28 +01:00
Machiavelli
b52346522e Core/Vehicles: Add some internal checks in vehicle code to prevent crashable behaviour caused by scripts or other areas of the core. 2013-01-05 15:40:36 +01:00
Shauren
32fa3f6018 Merge pull request #8848 from NightQuest/save_hook
Core/Scripts: Created a hook for when a player is about to be saved.
2013-01-05 05:16:30 -08:00
Nay
82555a444c Core/Spline: Fix typo, I blame not enough Ctrl+S 2013-01-04 23:44:25 +00:00
Nay
a509aea659 Core/Misc: Fix a couple of warnings, some of them performance related
Errors were found using Cppcheck, open-source static analysis tool
2013-01-04 23:14:14 +00:00
Nay
8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +00:00
Machiavelli
9f32cd44e4 Update src/server/game/Achievements/AchievementMgr.cpp
Prevent achievement completion log spam.
2013-01-04 18:37:15 +01:00
Malcrom
e8ca1d5cd1 Core/Scripting: Add Kirtonos The Herald to c++ scripting. Combat still not finished. 2013-01-04 01:00:51 -03:30
Subv
ef9f2aca0d Merge pull request #8753 from MrSmite/Pet_SpeedFix
Fix pets lagging behind and despawning
2013-01-03 17:04:50 -08:00
Vincent_Michael
8db66bfefd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-04 01:27:51 +01:00
Nay
9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Shauren
59e4f6eb05 Core/SmartScripts: Fixed SAI targets 10 & 14 (SMART_TARGET_CREATURE_GUID, SMART_TARGET_GAMEOBJECT_GUID)
Note: If you used these targets to perform actions across maps, it will not work anymore, this functionality is deprecated as it was not safe.
2013-01-03 19:22:12 +01:00
Vincent_Michael
fe6dc5c3cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-03 18:05:45 +01:00
Vincent_Michael
6a29a957dd Core/Spells: Rename SPELL_EFFECT_PLAYER_NOTIFICATION to SPELL_EFFECT_PLAY_SOUND 2013-01-03 18:00:26 +01:00
Machiavelli
0782e0b851 Update src/server/game/Achievements/AchievementMgr.cpp
Core/Achievements: Add player name and guid to CompletedAchievement log
2013-01-03 14:55:49 +01:00
Ellie
0daa5f97ea Grammar/Spelling fix. 2013-01-03 04:37:03 -08:00
Spp
27b1e457e6 Core/Misc: More corrections to guid handling change (2292025) 2013-01-03 08:06:53 +01:00
Ellie
c2e610cde7 Core/Scripting: Created a hook for when a player is about to be saved. 2013-01-02 17:03:57 -08:00
Vincent_Michael
ee2e776fea Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 22:03:35 +01:00
Vincent_Michael
57c275f3e1 Core: Fix warning 2013-01-02 21:42:50 +01:00
Spp
786f27b74c Core/Misc: Missing changes from 8968dbc (Partial revert of 2292025)
Closes #8843
2013-01-02 21:23:54 +01:00
Vincent_Michael
5bbf7829b2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 17:42:22 +01:00
Spp
8968dbc5a9 Core/Misc: Partial revert of 2292025 (Core/Misc: Replaced some macro definitions with inline functions)
- That code is 4.3.4 and wasn't supposed to be pushed to master
2013-01-02 15:20:38 +01:00
Spp
601fcc5612 Core/Misc: Removed odd code from CreatureAIImpl.h, it does not belong here
- Also some minor corrections from previous commit
2013-01-02 14:20:20 +01:00
Vincent_Michael
b873156c3c Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.h
2013-01-02 14:12:48 +01:00
Spp
ebd14b4f01 Core/Mysql: Multiple changes
- added support for setting NULL column values to MySQL wrapper in core
- replaced nonstandard strdup function and manual memory management with std::string
- fixed bug in MySQLPreparedStatement::getQueryString method, it failed when string parameter contained embedded '?' symbols
- fixed memory leak in MySQLPreparedStatement::setString method
2013-01-02 12:22:50 +01:00
Spp
5280a77fe1 Core/Misc: Some minor changes here and there 2013-01-02 11:00:16 +01:00
Spp
d36c4a91ba Core/Misc: Use equal_range instead of lower_bound/upper_bound calls where possible. 2013-01-02 09:53:43 +01:00
Spp
2292025bf9 Core/Misc: Replaced some macro definitions with inline functions 2013-01-02 09:07:52 +01:00
Spp
c85dc26584 Core/Misc: EventMap will no longer inherit from std::map 2013-01-02 08:34:11 +01:00
Trista
423fb04270 Script/EoE: Some fixes here and there
* Add db support for Power Sparks, Teleports and Drakes
* Fix Power Sparks animations and texts and add support for giving buff to players + warning
* Fix Power Spark way of stacking - should be MultiSlot aura, didn't stack before either way
* Teleporters mechanic is fixed and will summon only 1 spark per 30-35 sec
* Fixed players getting mounted on 3rd phase
* Cleanned some wrong aggro handling, but whole aggro/attack system should be rewritten to get it working blizz
That is for today, this doesn't fix the whole instance by any means!
2013-01-02 06:35:28 +02:00
Vincent_Michael
336752a409 Core: Add missing changes in f7e7f5fe26 2013-01-02 03:25:08 +01:00
Malcrom
f7e7f5fe26 CORE/Scripting: Move Commander Sarannis & Thorngrin the Tender to cpp scripting. Add instance script.
Thanks to Vincent Micheal for the help :)
2013-01-01 21:36:21 -03:30
Vincent_Michael
62adbdab99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
2013-01-01 23:12:21 +01:00
Vincent_Michael
234f097120 Core: Fix build 2013-01-01 23:06:37 +01:00
Gacko
01b705c844 Core/Player: Fix armor calculation - 2nd try
Base armor value from WDB data includes the ArmorDamageModifier. Items of
same item level, required level, armor type and equiptment slot should
have (nearly) the same armor values.

See following links for further proofs:
http://pastebin.com/fqNJLYj4
http://www.wowhead.com/item=50466#comments:id=889035:reply=444786

The shown item should have a base armor value of 177 as similar items and
a bonus armor value of 560 which equals 737 - like in DB atm.
2013-01-01 21:43:17 +01:00
Gacko
431b807275 Core/Player: Fix armor calculation
Base armor value from WDB data includes the ArmorDamageModifier. Items of
same item level, required level, armor type and equiptment slot should
have (nearly) the same armor values.

See following links for further proofs:
http://pastebin.com/fqNJLYj4
http://www.wowhead.com/item=50466#comments:id=889035:reply=444786

The shown item should have a base armor value of 177 as similar items and
a bonus armor value of 560 which equals 737 - like in DB atm.
2013-01-01 20:47:05 +01:00
Vincent_Michael
7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Vincent_Michael
eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013.
Happy new year.
2013-01-01 00:41:01 +01:00
Shauren
47ac83ec3a Core/Units: Check aura presence before casting liquid spell to avoid resetting periodic tick timers 2012-12-31 21:12:33 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Shauren
b229f72bf4 Core/Units: Cleaned up DealDamage log message and moved it to debug level 2012-12-31 18:53:44 +01:00