Commit Graph
29917 Commits
Author SHA1 Message Date
Vincent-Michael 3e42602afc Core/Commands: Allowed .server idlerestart / idleshutdown / restart / shutdown to take another parameter structure:
e.g.:
* .server idlerestart 12d3h13m13s
* .server idleshutdown 46m13s
* .server restart 45h56m
* .server shutdown 323m42s

(cherry picked from commit 0940f3e0776b58bd7abad472347da7d0dea2ac50)
2016-05-12 09:19:21 +02:00
Shauren f6824d1207 Core/Auras: Implemented AURA_INTERRUPT_FLAG_LEAVE_COMBAT
(cherry picked from commit d621023192a6480aa0f338908a353002fc6accf1)
2016-05-12 09:19:01 +02:00
Ariel Silva fb87f7d445 Core/Spells: fix console spam (#17084) 2016-05-12 09:17:57 +02:00
treeston 7dfa86b878 align fix 2016-05-12 09:17:40 +02:00
Aokromes 4205140a75 DB\misc: remove duplicate file 2016-05-12 09:17:10 +02:00
Kito 4ce6bd3014 Scripts/Icecrown Citadel: Sindragosa - Ice Tomb should always deal damage to all other ice tombs too
Closes #7808
Merges #16863
2016-05-12 09:16:52 +02:00
treeston 5671f50933 CreatureAI: Adjust AI behavior when a charm ends. OnCharmed will be invoked on the creature's base (non-charmed) AI, allowing the AI to react to the creature no longer being charmed. 2016-05-12 09:16:31 +02:00
Aokromes 73fd689c1e DB\misc: remove duplicate file 2016-05-12 09:15:18 +02:00
Trond B Krokli 737d61e9ab Core/Scripts/DB: remove hardcoded text from npc_beaten_corpse (#16907)
- remove hardcoded text from script npc_beaten_corpse
- remove OnGossipHello() hook, gossip text moved to DB
- use sGossipSelect() hook instead of OnGossipSelect()
- add npc_text 3557 and 3558 as text_id to gossip_menu
- add gossip_menu_option 2871 to NPC 10668 Beaten Corpse
- add condition for gossip_menu_option 2871 in Quest ID 4921

Tested on 4 different characters/classes, male & female.
Thanks to joschiwald for the sGossipSelect() script change.
2016-05-12 09:14:45 +02:00
Duarte Duarte 28caabfdda Scripts/SWP: Remove unused #defines
(cherry picked from commit 71a7f96e22a68654edd66ccdb5f6202dec4dfd2c)
2016-05-12 09:14:23 +02:00
kelno 60f1c18ecd Update CONTRIBUTING.md (#17042)
(cherry picked from commit 8424e73a108d69ce66332a117a0006f169036e7c)
2016-05-12 09:11:30 +02:00
Shauren af17e23204 Core/Misc: Fixed -Wmisleading-indentation warnings
(cherry picked from commit 3ac33163db2786cbd18f2158fc81d6ea9fa66316)

# Conflicts:
#	src/server/game/Server/Protocol/PacketLog.cpp
2016-05-12 09:10:53 +02:00
Shauren ff4da3acaa Core/Misc: Fixed warnings found by GCC 6
(cherry picked from commit 67fd3ee726cbd509e6a15f81f4780e757a78a8b5)

# Conflicts:
#	src/server/game/Spells/Auras/SpellAuras.cpp
2016-05-12 09:09:30 +02:00
Shauren 2aa7dff892 Core/Misc: Use steady_clock instead of system_clock for calculating ms timers. This makes update diffs immune to systemwide time changes
(cherry picked from commit 406ac4f4b492e8733d0c1e6142838b3fff8c80a3)
2016-05-12 09:09:13 +02:00
Trond B Krokli 3d1e5200c9 Core/authserver.conf.dist: missing description line (#17038)
This line is missing from authserver.conf.dist :
`#                     MySQL server and their own thread on the MySQL server.`

I have copied this description text line from the matching description in
`worldserver.conf.dist` (line 108 in the 3.3.5 worldserver source file).

This line is also missing in bnetserver.conf.dist , but the files are different
in line number, filename and folder, so bnetserver needs a separate commit.
2016-05-12 09:08:54 +02:00
Mikhail Redko c8cd578ddf Core/Misc: Move STOP_TIME_FOR_PLAYER value to config. (#17024) 2016-05-12 09:08:19 +02:00
Aokromes 60c55d028e Update worldserver.conf.dist 2016-05-12 09:08:01 +02:00
joschiwald 42033fd904 Core/Utils: replaced std::random_shuffle with our own implementation using SFMT random generator 2016-05-12 09:07:29 +02:00
Naios b823c06973 Core/Updater: Correct the config key hint of a log message 2016-05-12 09:05:56 +02:00
joschiwald 3e8e867dcb Core/SpellScripts: allow to modify target destination of all target type 2016-05-12 09:05:37 +02:00
Lopfest 28b3874057 Core/Spells: enabled SPELL_EFFECT_160 (#16987)
(cherry picked from commit ff3e176eb1da4139fb9e516b2433cdc404dc7a42)
2016-05-12 08:52:23 +02:00
Henry Gordon 4158049767 Core/Instances: If a boss kills itself, still save the group to the instance (#16978)
(cherry picked from commit a4b00886718148dd021871ead5ac8a1e8a64285f)
2016-05-12 08:48:25 +02:00
Aokromes 05d4b503ea DB\misc: delete duplicate file 2016-05-12 08:47:22 +02:00
Gustavo a407fddca5 Core/Quests Fix Quests Borrowed Technology, Volatility and The Solution Solution (#16968) 2016-05-12 08:47:02 +02:00
Aokromes abb27e60d4 DB\misc: delete duplicate file 2016-05-12 08:46:18 +02:00
chaodhib 8a84d7de3e Scripts/Naxxramas: Rework of Gluth
1) Gluth should be able to eat zombies close to him, one at the time, during the whole fight.
2) Gluth should be able to eat zombies at an accelerated rate after each Decimate.
3) The zombies should put the "Infected Wound" debuff on their auto-attack targets.
4) Zombies should have a normal threat table before decimate and should loose all kind of aggro behavior and walk toward Gluth after decimate.
5) Gluth shouldn't be affected by the decimate damage.
6) Newly poped zombies should have all players in their aggro list as soon as they spawn. So far, they were not moving and were only aggroed by proximity.
7) and several minor fixes (emotes, useless data in db).
2016-05-12 08:45:44 +02:00
Aokromes 0b96416bda Misc: template fix 2016-05-12 08:43:49 +02:00
Andrew Letson 0f747ea87f Core/AHBot: Improve AHBot seller math (#16123)
Eliminates edge cases with low values that would round to zero
due to using uint32 in the calculation of sell price and buyout price.
(cherry picked from commit 45ea01fe5ccabb66efa73811d1f10720dd830162)

# Conflicts:
#	src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
2016-05-12 08:42:32 +02:00
chaodhib a2337bff45 Movement bug fix. Npc mistakenly move away from its new target. 2016-05-12 08:40:58 +02:00
Aokromes d1e3be8b00 Misc: typo fix 2016-05-12 08:38:01 +02:00
Aokromes 44a161bad5 DB\misc: delete duplicate file 2016-05-12 08:36:05 +02:00
sirikfoll 5ebbfc63b5 Core/Spells Fix Spell Inferno, used by boss Baron Geddon
This is based on the cmangos fix https://github.com/cmangos/mangos-classic/commit/7556165b3e15f574602fcb0ea4188db8186ccee6

Also correct the spellId of Armageddon spell
2016-05-12 08:35:21 +02:00
Aokromes 8df46327a9 Update worldserver.conf.dist 2016-05-12 08:34:28 +02:00
Shauren 4801f77b3c Core/Auras: Fixed a visual issue with combat log appearing to deal negative damage with SPELL_AURA_PERIODIC_LEECH if the spell does more damage than target has health (before calculating resist) and any damage is resisted.
Closes #16495
2016-05-12 08:33:11 +02:00
Dustin Paul a3e17a8d4d Core/LFG: Readd players to queue when proposal fails because someone else declined it (#16279) 2016-05-12 08:32:57 +02:00
Chaouki Dhib 920d829b64 Core/Movement: Added a wrapper method in MotionMaster for a unit to move toward another unit and stop once it reaches the target at a certain distance. (#16806) 2016-05-12 08:32:38 +02:00
Gacko 05cffd29c6 Add missing configuration key LoginDatabase.SynchThreads.
(cherry picked from commit b23a6aeaff403266491ea75207558bf9917b9cc4)

# Conflicts:
#	src/server/bnetserver/bnetserver.conf.dist
2016-05-12 08:32:21 +02:00
Shauren e0f6b24c93 Core/Spells: Don't report spell errors to client when spell was triggered and failed some internal condition 2016-05-12 08:30:38 +02:00
Shauren b7f52184c2 Travis: Configure fake user for tagging
(cherry picked from commit 373d7104c14f1e4fc64c41e25eee0f7f672c2b74)
2016-05-12 08:29:40 +02:00
Shauren cd7537e1f4 Travis: Fixed git version info output
(cherry picked from commit 03917c79cdecb906912d9a94ac5ccdaecc8f62e1)
2016-05-12 08:29:21 +02:00
Shauren 4c3db96715 Core/Common: Moved MessageBuffer to common
(cherry picked from commit a81a204678f4cbd8b8a53333600f50f0b494706a)
2016-05-12 08:28:38 +02:00
Shauren a7f68c489a Properly rename the stand state method... 2016-05-12 08:27:48 +02:00
Shauren a12493fd84 Core/Misc: Renamed getStandState to minimize differences between branches 2016-05-12 08:27:29 +02:00
Shauren 0fbcff44df Core/DataStores: Fixed creating entries in sEmotesTextSoundMap if passed invalid arguments (also a data race, if done in multiple threads) 2016-05-12 08:26:26 +02:00
treeston 29fc5909e6 - Clean up spell facing behavior a bit. Visual target behavior should now be a lot smoother.
- Clean up Creature.cpp. NULL -> nullptr, gotta love it.
- Renamed some recently added members of Creature to match code style.
2016-05-12 08:25:01 +02:00
DDuarte 477a4edfe2 Core/Config: Fix 3 more missing config warnings
Closes #16861

Thanks tkrokli

(cherry picked from commit 0afcefea2724081968b07119ebd54943fdc44b60)
2016-05-12 08:24:45 +02:00
DDuarte 06a91b090d Core/Config: Error logging for ptree_bad_data
Ref https://github.com/TrinityCore/TrinityCore/commit/6487e2f2d6a1ddbeff77362219658376b8a3f9f0#commitcomment-16888976

(cherry picked from commit 9431b94bff939457cb915da3728cda6067674558)
2016-05-12 08:24:32 +02:00
Aokromes 25fe85f031 DB\misc: Delete duplicate file 2016-05-12 08:23:58 +02:00
Kittnz 5c2d8939f4 Pet/Misc: Implement Baby Blizzard Bear 2016-05-12 08:23:16 +02:00
DDuarte 2f5a67438a Core/Config: Remove references to Arena.QueueAnnouncer.PlayerOnly which hasn't been used since 3dd6fdedf7
Ref #16859
2016-05-12 08:22:54 +02:00