Commit Graph

14404 Commits

Author SHA1 Message Date
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
Malcrom
dbfc4b83aa Core/Scripting: Some file name updates. 2013-01-02 15:08:13 -03:30
Malcrom
38c55a15ad Core/Scripting: Rename zone scripts. 2013-01-02 14:52:13 -03:30
Malcrom
2fd10b5d15 Core/Scripting: Properly name boss_thorngrin_the_tender file. 2013-01-02 14:11:39 -03:30
Vincent_Michael
5bbf7829b2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-02 17:42:22 +01:00
Vincent_Michael
cc99c739c6 Core/MT: Fix model for "Pure Energy"
Closes #8838
2013-01-02 16:58:23 +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
Vincent_Michael
05efdaf393 Core: Fix non pch build 2013-01-02 13:58:36 +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
Vincent_Michael
e0db317530 SQL: Fix sql import problem 2013-01-02 03:06:55 +01:00
Malcrom
1062a0b40f Core/Scripts: Added spell scripting for Commander Sarannis. Added Instance Template for The Botanica.
Thanks to Vincent Michael
2013-01-01 22:28:29 -03:30
Vincent_Michael
56096b7704 DB/Creatures: Some fix for Wyrmrest Skytalon
Closes #8733
2013-01-02 02:43:41 +01:00
Vincent_Michael
88e6071ff6 Core: Fix build 2013-01-02 02:28:00 +01:00
Malcrom
596ef0efd7 CORE/Scripting: Forgot new lines at end of file. 2013-01-01 21:41:37 -03:30
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
11e1227784 Update more copyright note for 2013. (alcohol sucks) 2013-01-01 12:57:23 +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
Shauren
c021bff594 Core/Vehicles: Fixed basepoints used when ride vehicle aura is created for !IsInMap case 2012-12-31 17:58:21 +01:00
click
7ef2c1e062 Core: Change a rather badly phrased warning regarding "bad" DBC datastructures 2012-12-31 16:36:58 +01:00
Vincent_Michael
6317878b6f Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-31 15:26:57 +01:00
Gacko
edb90f957b Core/DB: Haaleshi Altar
- Prevent crash due to spamming GossipHello
- Convert core script to SAI
- Solves #8220
2012-12-31 15:03:19 +01:00
Subv
b4be02c8a0 Core/Conditions: Rename CONDITION_INSTANCE_DATA to CONDITION_INSTANCE_INFO.
And allow it to be used with GetData, GetData64 and GetBossState.
2012-12-30 16:03:25 -05:00
Trista
0aef9419b6 Core/Vehicles: Missed change 2012-12-30 01:34:53 +02:00
Trista
6edffb036d Core/Vehicles: revert 95152d5753 and 95152d5753
Sorry about troubles caused, hed reason to think formula was wrong, but it wasn't. However there is part of the code that needs to be improved I describbed in this commit as TO DO: Connected with: #8195
2012-12-30 01:06:55 +02:00
Warpten
63b9a7579c Core/SAI: Fixed build, i need new glasses. 2012-12-29 22:30:29 +01:00
Warpten
609c5700d6 Core/SAI: SMART_ACTION_NONE is not a valid action. Also accept SMART_ACTION_SET_RANGED_MOVEMENT as a valid action. 2012-12-29 22:27:32 +01:00
Subv
2002bc785e Core/SAI: Fixed SMART_ACTION_SET_RANGED_MOVEMENT 2012-12-29 15:35:56 -05:00
Subv
9bc339cd89 Core/Movement: MSG_MOVE_TELEPORT is not supposed to be sent to the player being teleported.
Thanks @vlad852
Closes #8798
Closes #8774
2012-12-29 15:25:48 -05:00
Subv
3d3a8107e0 Core/Entities: Account for creatures that are spawned below ground level when adding flying flags. (Triggers, mostly) 2012-12-29 14:23:23 -05:00
therzok
5c8c458d60 *Fixing a typo. 2012-12-29 21:14:12 +02:00
Vincent_Michael
871f8c8003 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2012-12-29 15:35:10 +01:00