Shauren
b50cda4a1a
Core/Loot: Cleanup in LootMgr.
...
* Removed a lot of loot template copying
* Improved grouped loot selection when using loot modes
* Removed code doing nothing
2013-02-03 01:18:06 +01:00
Vincent_Michael
0f53f69e52
Core: Fix build
2013-02-03 01:12:07 +01:00
Vincent_Michael
847cafc121
Scripts/Misc: Some code optimisations
2013-02-03 00:38:34 +01:00
Vincent_Michael
2c2fe7d464
Core/Misc: Small code optimisations
2013-02-02 19:06:47 +01:00
Vincent_Michael
9d7d68395c
Core/SmartAI: Implement SMART_ACTION_SET_ROOT (103)
2013-02-02 18:18:27 +01:00
Shauren
73d2f315af
Scripts/Icecrown Citadel
...
* Fixed rare weird coldflame positioning
* Fixed Bone Slice
* Changed Bone Spike Graveyard timing (first has to happen after Lord Marrowgar starts using Bone Slice)
2013-02-02 16:48:09 +01:00
Shauren
f410bf9755
Core/World: Fixed a warning
2013-02-02 16:46:14 +01:00
Shauren
b47cb65b03
Core/Scripts: Allow persistent area auras to use DoCheckAreaTarget hook.
2013-02-02 16:45:57 +01:00
Kinzcool
2976f94003
DB/WDB: Fixed some wrong WDBVerified; those templates IDs are way too high to have been took from retail
2013-02-01 21:35:37 -05:00
Vincent_Michael
6161f69b7e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Spells/SpellMgr.cpp
2013-02-02 00:16:11 +01:00
Warpten
0b72a91e76
Core/Hunters: Fixed focus power for pets.
...
Closes #8553 .
2013-02-01 19:56:02 +01:00
Shauren
817f5b3648
Scripts/Icecrown Citadel:
...
* Fixed Coldflame dealing double damage
* Targets hit by Bone Slice will now be immune to Bone Spike Graveyard
* Fixed healing players on Bone Spike
Closes #1091
Closes #4473
Closes #5854
Closes #7060
2013-02-01 18:06:51 +01:00
Shauren
957375c7ff
Core/Misc: Fixed a few warning found by static analysis tools.
2013-02-01 11:40:39 +01:00
Shauren
0bf29d45d1
Core/Players: Prevent trading, taking gold from mail and withdrawing from guild bank if it would put the player over gold cap.
...
Closes #4015
2013-02-01 11:38:55 +01:00
Zaphod
dc5e9c80fc
DB/Loot: Fix Prismatic Black Diamond
2013-02-01 05:08:11 +00:00
Nay
0e945613d0
Core/Spells: Correct a check in IsLootCrafting, allows Prismatic Black Diamond to be fixed (a very peculiar spell...)
...
The following conversation led to this fix: http://paste2.org/p/2816385 (for reference)
2013-02-01 04:52:06 +00:00
Vincent_Michael
b539a9717b
DB/Gameobject: Removed gameobject with bad wdb data
2013-02-01 00:46:32 +01:00
Gacko
f5264e3fbb
Script/ICC: Fix phase check and warning
2013-01-31 22:00:32 +01:00
Vincent_Michael
8350c088c7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-01-31 21:53:29 +01:00
Vincent_Michael
8e7806379d
Core/Spells: Fix Gas Cloud Tracking stacking with other tracking spells
2013-01-31 19:59:44 +01:00
Spp
67d46ae1ae
Scripts/Commands: Show correct guild Rank when using .pinfo command
...
(Corrections to 1b551cc1 )
2013-01-31 09:18:42 +01:00
Gacko
0a9fbc6588
Script/ICC: Fix phase check in Saurfang script
...
... typos - typos everywhere. me->request(glasses);
2013-01-31 08:45:47 +01:00
Vincent_Michael
9a0525757a
Core: Fix some warnings
2013-01-31 00:35:33 +01:00
Warpten
454ee822ae
Dang, one more typo.
2013-01-31 00:26:53 +01:00
Warpten
900f3e8d6a
Spells/Warlock: Fixed a small mistake in my previous commit's SQL.
2013-01-31 00:24:52 +01:00
Warpten
a4b1f1c45f
Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate.
2013-01-31 00:21:28 +01:00
Vincent_Michael
71a0cc1706
Core/Spells: Add missing break in f5fd7bad69
...
Thx Nayd
2013-01-31 00:18:27 +01:00
Vincent_Michael
f5fd7bad69
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
2013-01-31 00:10:17 +01:00
Bezo
83e3bf6d6d
Remove \ No newline at end of file
2013-01-31 00:30:29 +02:00
Shauren
15e42ac797
Core/Players: Improvements to currency handling.
2013-01-30 20:40:02 +01:00
Gacko
754418a8de
Script/ICC: Fix phase check in Saurfang script
...
Related to changes in dbecf05e39
2013-01-30 19:34:59 +01:00
Vincent_Michael
716c2db403
Core: Fix warnings
2013-01-30 19:09:09 +01:00
Gacko
2ba477c367
Merge pull request #7873 from Gacko/eventphases
...
Core: Logical fixes in EventMap
2013-01-30 09:49:54 -08:00
Gacko
dbecf05e39
Core: Logical fixes and improvements in EventMap
2013-01-30 18:39:34 +01:00
Vincent_Michael
5a74336c5e
Core: Fix non pch build
2013-01-30 18:24:29 +01:00
Vincent_Michael
8814d8c136
Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup
2013-01-30 18:06:19 +01:00
Nay
261e482a66
Merge pull request #9103 from Norfik/authdb
...
DB/Auth: Fix typo in sql/base/auth_database.sql
2013-01-30 06:05:17 -08:00
Emo
2ffeaec443
DB/Auth: Fix typo in sql/base/auth_database.sql
...
ERROR 1136 (21S01) at line 216: Column count doesn't match value count at row 1
2013-01-30 14:51:40 +01:00
Bezo
760d62e934
Add Mute reason and mute by to the db so you can get this info from the db with the pinfo command when player get muted.
...
old LOGIN_UPD_MUTE_TIME change to LOGIN_UPD_MUTE_TIME_LOGIN due the use of it when character login to world.
2013-01-30 13:09:41 +02:00
Spp
709129f222
Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
...
Conflicts:
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Miscellaneous/Formulas.h
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Waypoints/WaypointManager.cpp
src/server/game/Skills/SkillDiscovery.cpp
src/server/game/Skills/SkillExtraItems.cpp
src/server/game/Warden/WardenCheckMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
2013-01-30 11:57:02 +01:00
Spp
8cd408ae6c
Core/Misc: Some changes to minimize differences with 4.3.4 branch
2013-01-30 10:34:18 +01:00
Spp
c4e4cb1b5c
Core/Misc: Remove using directive from header files (It will eventually lead to name collisions)
2013-01-30 09:06:19 +01:00
Spp
2c32393a39
Core/Misc: Always state what columns are affected by MySQL statements
2013-01-30 08:42:01 +01:00
Spp
fa5dd4bd4e
Core/Misc: Remove some calls to const_cast
2013-01-30 08:39:06 +01:00
Shocker
b427068c39
Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless and Cataclysmic Gladiator).
...
Also remove some unused outdated defines
WARNING! Run the SQL query before you start your emulator because it will reset all titles on login otherwise
2013-01-30 07:05:19 +02:00
Nay
5151c57b18
Merge remote-tracking branch 'origin/master' into 4.3.4
2013-01-30 01:33:46 +00:00
Nay
92d92df809
Core/Object: Re-add a line that somehow got removed in a merge
...
Thanks Warpten for noticing
2013-01-30 01:33:12 +00:00
Nay
0281497573
DB/Loot: Fix 9 drop chance in gameobject_template (7 quests should be fixed by this)
...
If a GO with flags 4 drops a quest item, ChanceOrQuestChance for that items needs to be negative
Query used to find the issue:
```
SELECT * FROM `gameobject_loot_template`
WHERE (`item` IN (SELECT `questItem1` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
`item` IN (SELECT `questItem2` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
`item` IN (SELECT `questItem3` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
`item` IN (SELECT `questItem4` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
`item` IN (SELECT `questItem5` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
`item` IN (SELECT `questItem6` FROM `gameobject_template` WHERE (`flags` & 4) != 0)) AND
`ChanceOrQuestChance` > 0;
```
2013-01-29 23:48:39 +00:00
click
ea9c6524dd
Buildsystem/CMake: Revoke commit 7b49da48f9 - it creates unwanted results when used with PCh on *nix platforms.
2013-01-29 23:18:25 +01:00
Souler
d92347bc22
Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new one
...
Closes #8433
2013-01-29 15:10:47 +00:00