Daniel M. Weeks
71ba35a6cd
Fix indentation in unix cmake settings
2015-04-15 19:20:26 +02:00
Daniel M. Weeks
27923b8d8f
Remove unnecessary semicolons
2015-04-15 19:20:13 +02:00
Daniel M. Weeks
62ff887236
Fix documentation
2015-04-15 19:20:04 +02:00
Daniel M. Weeks
6484885600
Prevent collisions in GCC attribute definitions
2015-04-15 19:19:54 +02:00
Shauren
ca1f42d409
Tools/Map extractor: Warning fixes
2015-04-15 12:58:38 +02:00
Shauren
7b0c4792ce
Core: Warning fixes
2015-04-15 12:47:17 +02:00
Shauren
48578e10fb
Core/Items: Implemented ItemSpec.dbc
2015-04-15 00:36:03 +02:00
Carbenium
b273c5f1bf
Merge pull request #14508 from et65/6.x
...
Core/Guilds: Fix crash on kicking offline player of a guild.
2015-04-14 22:12:41 +02:00
Vincent-Michael
6a27d813ce
Core/PacketIO: Update SMSG_STAND_STATE_UPDATE for 6.1.2
2015-04-14 06:19:18 +02:00
Vincent-Michael
55f4bc8743
DB/Hotfixes: Added all current blizz hotfixes - 04/14/2015 04:20:09
2015-04-14 04:29:15 +02:00
DDuarte
86168ff142
Misc: SQL and small code changes for the 71 last cherry-picks
2015-04-14 01:03:57 +01:00
Duarte Duarte
b086339199
Merge pull request #14540 from tkrokli/npc_mootoo_the_younger
...
Fix $n bug in NPC text for quest 11664 Escaping the Mist
(cherry picked from commit c9e699961e37678b4da5ed6a8b396d72d90af883)
2015-04-14 01:02:24 +01:00
Kittnz
f13d449b91
DB/Quest: Fixing War is Hell and Monitoring the Rift: Cleftcliff Anomaly
...
by @Killyana
(cherry picked from commit 294383fec09646ecf534b3fa84d685d26d4cd6f9)
Conflicts:
sql/updates/world/2015_04_11_02_world.sql
2015-04-14 01:02:23 +01:00
Kittnz
d86b3ac50f
DB/Zone: Netherwing Ledge Part 4
...
- Add Gug
- Add missing Dragonmaw Enforcer spawns and corrected positions
- Add and change in the mines, Mine Car, Murkblood Miner, Nethermine Flayer, Nethermine Ravager, Murkblood Overseer, Crazed Murkblood Miner, Crazed Murkblood Foreman.
- Add missing SAI for Crazed Murkblood Miner, Crazed Murkblood Foreman, Mine Car, Dragonmaw Foreman
- Add waypoints for Nethermine Burster, Nethermine Ravager, Mine Car
(cherry picked from commit 7b74cf830d3c87ba3fc82a5c6a4982d27957bb1f)
Conflicts:
sql/updates/world/2015_04_11_01_world.sql
2015-04-14 01:02:22 +01:00
Kittnz
6d75d66709
DB/Misc: Last Fix startup errors
...
(cherry picked from 61aa5ec412ee462e76f8d71d888706b02bfed372)
2015-04-14 01:02:21 +01:00
DDuarte
15db3dcd7d
DB/Misc: Fix startup errors
...
(cherry picked from commit 17a4cee54694599781c2dc7ed966e087f568bbe2)
Conflicts:
2015-04-14 01:02:20 +01:00
Kittnz
266758e5d0
DB/NPC: Update guid for creatue spawn
...
(cherry picked from commit 7ab563c0dd88ad0fb73a2b070956988950f35b49)
2015-04-14 01:02:19 +01:00
Aokromes
2c6df09539
Merge pull request #14530 from Exodius/bloodmaul_brutes
...
Core/Scripts: Remove Bloodmaul Brutes script
(cherry picked from commit ca67cc8f6b1f0d16bb3c4c66343dc305b9f78acc)
2015-04-14 01:02:19 +01:00
Dr-J
7d13978289
DB/Quest: Bladespire Kegger / Getting the Bladespire Tanked
...
With previous cpp script when Bloodmaul Brutebane Keg used Bladespire Brute would run to keg and then nothing else would happen the ogre would remain standing on spot and not even be agressive (although could still be attacked.
CPP on http://www.wowhead.com/npc=21241/bloodmaul-brutebane-stout-trigger needs removing, ogre already had sai.
(cherry picked from commit 6b846a4e290097cde39f02a2f9a5be34cd06a65d)
Conflicts:
sql/updates/world/2015_04_10_01_world.sql
2015-04-14 01:02:18 +01:00
Aokromes
1ac33c0265
DB/Misc: L70 ETC Concert
...
By Foldor, closes #14492
(cherry picked from commit cc4f86cc2bf4f5ee5b2942bdb206a57750f049ae)
Conflicts:
sql/updates/world/2015_04_10_00_world.sql
2015-04-14 01:02:17 +01:00
click
1c5a193aba
Core: Follow codingstyle guidelines (CamelCase for functions, lowerCamel for vars and local stuff)
...
(cherry picked from commit adb39317fa78632c452cba1d3c9eeb31a5c3309a)
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Spells/SpellInfo.cpp
2015-04-14 01:02:16 +01:00
WishToDie
abb9e5dd29
Update LFGMgr.cpp
...
Core/LFGMgr: Fix crash in e743f4a479ce7ddd3f13d51ca1c19a591c803fc0
(cherry picked from commit 08a62f19b808a347aae56b4f5a689233c6a03db0)
2015-04-14 01:02:15 +01:00
Dr-J
d81b21a127
DB/Creature: Guard Untula
...
(cherry picked from commit 4d051ec7957a070ac4af70524ad5b4b26bace2e6)
2015-04-14 01:02:14 +01:00
Aokromes
307744cf87
DB/Creature: Deathbound Ward
...
By Nyeriah, closes #14482
(cherry picked from commit fae3e77376bae9a3bd5c969adfc2d4e96a9653d0)
2015-04-14 01:02:13 +01:00
Aokromes
25c83c61f7
DB/Creature: Warden of the Chamber
...
By Foldor, closes #14509
P.s. checked on 12340 sniff the coords, that's why i use VerifiedBuild 12340 instead 19831 of original fix.
(cherry picked from commit 904d1cc21a2145d59be52f3601e51f4b169f8437)
2015-04-14 01:02:13 +01:00
Aokromes
b770dcd4f1
DB/Quest: The Forgotten Tale
...
By Killyana, closes #14514
(cherry picked from commit 13a5c2ff6358a008d45496e60323cecadd9b533d)
Conflicts:
sql/updates/world/2015_04_09_00_world.sql
2015-04-14 01:02:12 +01:00
Kittnz
7e8ad1d9cd
DB/Zone: Netherwing Ledge Part 3
...
- Dragonmaw Tower Controller should yell MULVERICK! everytime when Dragonmaw Skybreaker flys over!
by Kilyana
(cherry picked from commit 3fc634120d4d68c050d0ef8f52ae49a5e509321a)
Conflicts:
sql/updates/world/2015_04_08_01_world.sql
2015-04-14 01:02:11 +01:00
Kittnz
cc00bcef0f
DB/Misc: Fix startup errors
...
(cherry picked from commit dd34736757cae77581758f4bf0cef7ba48c73e0d)
Conflicts:
sql/updates/world/2015_04_08_00_world.sql
2015-04-14 01:02:10 +01:00
Kittnz
bc188bc6b3
DB/Zone: Netherwing Ledge Part 2
...
- Cleanup on the Dragonmaw Ascendant spawns
- Updated Dragonmaw Ascendant positions
- Added waypoints too Dragonmaw Ascendant
(cherry picked from commit b321f84a39c1c790a6519f8c0910f99c60fb536d)
2015-04-14 01:02:09 +01:00
Kittnz
ab2a7aa8d9
DB/NPC: Goblin Merc spawn and some adjustment on Dragonmaw Base Camp
...
by @Killyana
Closes #14453
(cherry picked from commit 869955e03c3bf03352237bd33d79215aacbe06ad)
2015-04-14 01:02:09 +01:00
click
0192a602d6
Core/Spells: Allow non-skill-based flying mounts to be used in designated areas.
...
- Flying mounts that are not in the "SKILL_MOUNT"-tree and area-restricted can now be used properly (ex. 64749 - Loaned Gryphon).
- Remove isKnowHowFlyIn()-function (useless and deprecated since this is handled properly in the spellsystem).
Massive thanks to rat for extremely good help and support on fixing this (most of this is his work).
(cherry picked from commit 0e3607df5b6df0e85a458cbd37da124f7fa58825)
Core/Spells: Reinstate helperfunction removed in commit 0e3607d (with a new functionname to make more sense out of it), and adjust the remaining code slightly to accomodate that.
(cherry picked from commit 6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff)
2015-04-14 01:02:08 +01:00
Dr-J
a7a84f99d2
DB/Gossip: Add some missing gossips
...
Add missing Gossips from Diremaul North
(cherry picked from commit dcd36c1bf61fdb01696d382667f84531f74b2f6f)
2015-04-14 01:02:07 +01:00
click
1282db53e3
Core/Command: Sanitize input for .account set gmlevel <username> handling
...
(cherry picked from commit 79696e08718ea74c8063fdc13624560f4bd3118f)
Conflicts:
src/server/scripts/Commands/cs_account.cpp
2015-04-14 01:02:06 +01:00
Dr-J
8bb8737565
DB/Quest: Steamtank Surprise
...
By @Killyana, Initial work by @Kirkhammett
Closes #1866
(cherry picked from commit 210e45e303b1ae33ff4bb2c21727b27ae58f0a6c)
2015-04-14 01:02:05 +01:00
Nick
1089306118
Core/Scripts: Remove The Thunderspike script
...
As explained by @Killyana in https://github.com/TrinityCore/TrinityCore/issues/4458#issuecomment-90061073
(cherry picked from commit 77eb89157b85ff79d049b77f5c8bc35119c6ee41)
2015-04-14 01:02:04 +01:00
Dr-J
80c3f3071e
DB/Quest: The Thunderspike
...
By @Killyana
Closes #4458
(cherry picked from commit 2b51726fd009d580578c7bd363ce528e5dbf119c)
2015-04-14 01:02:04 +01:00
Dr-J
d041b34a55
DB/Misc: Silvermoon Guardians emote responses
...
By @Nyeriah
Closes #14471
(cherry picked from commit 61f6328b2bf53862a9ccdde8b89330f0b7b6c932)
Conflicts:
sql/updates/world/2015_04_06_02_world.sql
2015-04-14 01:02:03 +01:00
Dr-J
acaa3691f4
DB/Item: Brazie's Black Book of Secrets
...
By @Foldor
Closes #14502
(cherry picked from commit 866bda4c38f278437bcfc5b460245bd2d69e9bed)
Conflicts:
sql/updates/world/2015_04_06_01_world.sql
2015-04-14 01:02:02 +01:00
Kittnz
69b93f7ac3
DB/Zone: Shadowmoon Valley/ Netherwing Ledge
...
- Add waypoints for Barash the Den Mother, Arvoar the Rapacious, 2x Dragonmaw Transporter.
- Reposition Ja'y Nosliw <Skybreaker General> and Taskmaster Varkule Dragonbreath
- Changed the movement speed for flying Dragonmaw Skybreakers
(cherry picked from commit 2e461a511bd4f3f8cf523017aa43ad47ea447ff7)
Conflicts:
sql/updates/world/2015_04_06_00_world.sql
2015-04-14 01:02:01 +01:00
Kittnz
f9fbe4981b
DB/Waypoint: Add several waypoints to Shadowmoon Village
...
(cherry picked from commit 1184e98da1690f1a12e5939d29fec2f03bef4710)
Conflicts:
sql/updates/world/2015_04_05_07_world.sql
2015-04-14 01:02:00 +01:00
w1sht0l1v3
cec3f8f671
Core/LFGMgr: Fix the case where the last player left in a lfg group would be stuck in party when porting out of the instance.
...
If you find a better way or think this is wrong feel free to remove it or improve it.
(cherry picked from commit e743f4a479ce7ddd3f13d51ca1c19a591c803fc0)
2015-04-14 01:02:00 +01:00
Dr-J
aa90b66abc
DB/Creature: Anub'ar Venomancer
...
Script Anub'ar Venomancer to use poison bolt
Even though wowhead lists two spells for these creatures (poison bolt & poison bolt volley) in sniff only appears to use poison bolt ie 0 casts of the volley spell.
(cherry picked from commit 8a7ba64f7bc563a4d420cdc25a46621c00f2735c)
Conflicts:
sql/updates/world/2015_04_05_05_world.sql
2015-04-14 01:01:59 +01:00
Dr-J
f68df25a56
DB/Quest: When Smokey Sings, I Get Violent
...
Closes #2621
The other spell effect must target scourge structure in order for the damage to player to work when using item.
(cherry picked from commit 4403ef69da65dbf917c421ecb0617f9064dd610b)
2015-04-14 01:01:58 +01:00
Aokromes
6a1e2bcdad
Scripts/Kalimdor: Ashenvale - add missing enum
...
(cherry picked from commit 16481d17aacfd9e866615212df11ddcdcf1fc2e4)
2015-04-14 01:01:57 +01:00
Aokromes
8d641c9641
DB/Misc: Fix startup errors
...
(cherry picked from commit 229deea4435c7d642dd5ead062bd2e8b65916a57)
Conflicts:
sql/updates/world/2015_04_05_03_world.sql
2015-04-14 01:01:56 +01:00
Rushor
d05cd1a6d7
Scripts/Kalimdor: Ashenvale - Remove Torek C++ Script
...
(cherry picked from commit f49a1b0f1fb7423466e5773eb29c77b2ebf26fc0)
2015-04-14 01:01:56 +01:00
Aokromes
c6be9b3f68
DB/Quest: Teron Gorefiend, I am...
...
By gecko32, closes #3214
(cherry picked from commit 78d2f934b99d2e92d28648a4f12dcb47767d43db)
2015-04-14 01:01:55 +01:00
Dr-J
f9db3940e6
DB/Quest: Torek's Assault
...
CPP > SAI Conversation to overcome some problems
* Guards now follow Torek and will also attack enemy mobs
* Torek will now attack enemy npcs instead of walking straight past them
Closes #7299
(cherry picked from commit 5bfb2a193555f8b16f4bb431c5d8d200d8d0ef78)
2015-04-14 01:01:54 +01:00
Dr-J
c37e784216
DB/Misc: Old Hillsbrad Asbringer Event
...
(cherry picked from commit 0df7eebffdcf4ec4f5b8cd0fb793380c979137b1)
2015-04-14 01:01:53 +01:00
Rushor
649a2e21b1
DB/Creature: Valiance Keep Rifleman
...
closes #14339
(cherry picked from commit 0df5cb972d8204e9b5058c8734efc26a520fd869)
2015-04-14 01:01:52 +01:00