Commit Graph
21412 Commits
Author SHA1 Message Date
Aokromes 20895a8631 Core/Logs: Fine tune another log 2016-08-07 21:50:05 +02:00
Aokromes 4231b2ba66 Core/Conditions: Add new CONDITION_PET_TYPE (45). Matches target player's pet against specified (value1) bitmask. 2016-08-07 21:49:25 +02:00
Aokromes 4d2527e05c Core/Conditions: Add new CONDITION_CHARMED (44). Does what it says on the tin. 2016-08-07 21:46:41 +02:00
Aokromes a5a60286fa Scripts/Commands: Some adjustments to make shutdown commands more user-friendly.
- New error message if a shutdown is delayed due to force threshold.
- New status message indicating that a server shutdown was successfully cancelled.
2016-08-07 21:41:10 +02:00
Shauren ea918e1b69 Core/Utils: Added additional argument to Tokenizer class to make it behave like strtok - not returning empty tokens in case of multiple consecutive separators in input string
(cherry picked from commit dd1533b315bda37e1d43ebe0fb8bde87381c6e66)
2016-08-07 21:28:29 +02:00
Aokromes 340b0227bf Core/Logs: Fine tunning some logs 2016-08-07 21:28:07 +02:00
treeston f8862f19f5 Scripts/SmartAI: Some clean-up work:
- NULL -> nullptr
- Rename "AssistPlayerInCombat(who)" to "AssistPlayerInCombatAgainst(who)" to reflect what the method actually does
- Code style

No functionality was changed.
2016-08-05 18:33:37 +02:00
Aokromes 11f46f2030 Core/Command: remove account_muted data on account deletion 2016-08-05 18:29:28 +02:00
Aokromes 7f71c2f70f Core/RBAC: Name some permissions from 3.3.5a 2016-08-05 18:25:18 +02:00
Aokromes 58499f9488 another override 2016-08-05 02:42:30 +02:00
Aokromes 2e3db272e3 more missing overrides 2016-08-05 02:14:51 +02:00
Aokromes 1ec3b04951 More overrides 2016-08-05 01:56:50 +02:00
Aokromes f00d77e2b9 more missing override 2016-08-05 01:43:00 +02:00
Aokromes 59244d6e73 More missing overrides 2016-08-05 01:33:17 +02:00
Aokromes c3537da1e8 revert incorrect change 2016-08-05 01:17:39 +02:00
Aokromes 69e1738554 Add missing overrides. 2016-08-05 01:12:48 +02:00
jackpoz 0f965a530e Common/Threading: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
2016-08-04 23:48:39 +02:00
jackpoz 44165712ca Common/Logging: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
2016-08-04 21:56:30 +02:00
jackpoz e8bc203651 Common/Debugging: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
2016-08-04 20:57:38 +02:00
Rushor 2ec12775a1 [3.3.5] Beast Mastery hunter talent Animal Handler
The goal of this PR is to restore the correct AP values for a BM hunter:

Animal Handler, Rank 1
- Increases your pet's attack power by 5% and increases the duration of your Master's Call effect by 3 sec.

Animal Handler, Rank 2
- Increases your pet's attack power by 10%, and increases the duration of your Master's Call effect by 6 sec.

Viewed in talent calculator: http://wotlk.openwow.com/talent#cVbhzTGRb

by Rushor, closes  #15361
2016-08-04 20:57:02 +02:00
treeston f95ca514e6 ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds. 2016-08-04 20:56:06 +02:00
Aokromes d642bd34a3 Scripts/Commands: Change "server shutdown" behavior 2016-08-04 20:54:34 +02:00
tkrokli de2ad7d38c Core/Scripts: move npc_kharan_mighthammer to DB/SAI
This PR affects the following 2 quests:
Quest ID 4001 "What Is Going On?" - part 2 (Horde)
Quest ID 4342 "Kharan's Tale" (Alliance)

Target of this PR:
Move core script npc_kharan_mighthammer to DB/SAI
(thereby removing 10 lines of hardcoded text).

* DB/conditions: extra gossip conditions

- added conditions for gossip before quest taken and after quest completed.
- removed redundant core script SAY_GET_ME_OUT_OF_HERE comment

* DB/creature: add more text to Kharan

- add all missing creature_text lines to entry 9021 Kharan Mighthammer
- add SAI duration to wait before TEXT_OVER is triggered (3000 ms)
2016-08-04 02:42:00 +02:00
Aokromes c3cb3e7233 compile fix 2016-08-03 23:47:37 +02:00
jackpoz 5dcb395e90 Common/Crypto: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
2016-08-03 23:35:34 +02:00
jackpoz 3c66feafcc Common/Maps: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
2016-08-03 22:39:59 +02:00
jackpoz 8cd5cefaf6 Common/Maps: Reduce differences between 3.3.5 and 6.x branches
Code functionality shouldn't have been modified.
2016-08-03 19:48:38 +02:00
Aokromes 14ee1c992f revert fail 2016-08-03 14:16:30 +02:00
Aokromes ee2a8eafcf compile fix 2016-08-03 12:13:15 +02:00
ariel- a69cbeb9d5 Core/PvP: Gameobject rotation in BGs and Wintergrasp.
- Add a workaround in BattleGround correcting for bad rotations in BG scripts
- Calculate rotation from rotation in Wintergrasp, this function hasn't a rotation parameter and should be added in the future.
- Also removed an ugly hardcode in Battlefield::SpawnGameObject

Closes #17711
2016-08-03 11:57:09 +02:00
jackpoz 242917e461 Core/Group: Do not allow a player to invite himself
Do not allow a player to invite himself in group.
Fix an edge case when inviting another player that would cause a crash.
Fix #17664
2016-08-03 11:56:29 +02:00
Aokromes 3ed49467ba Core/Chat: Split ChatLevelReq.Say into 3 2016-08-03 11:56:08 +02:00
Aokromes d6915eb661 Typo fix 2016-08-03 11:50:11 +02:00
ariel- 4a5e0e2f35 Core/Battlegrounds: do not teleport GMs if out of bounds before starting 2016-08-03 11:49:50 +02:00
Aokromes 56feab44d9 Core/Player: New PartyLevelReq setting 2016-08-03 11:49:01 +02:00
ariel- 35209adb87 Core/Spells: Abyssal Shatter should have a chance to skill up 2016-08-03 11:44:23 +02:00
Keader e8c31ba61a Core/Scripts Shade of Akama Rewrite (#17567) 2016-08-03 11:43:27 +02:00
Aokromes da3f7d464c Core/PVP: Move report AFK requirement to config (#17699) 2016-08-03 11:42:59 +02:00
Aokromes bb79774f01 Core/Scripts: convert script npcs_riverbreeze_and_silversky to SAI
By tkrokli
(remove dead code)
2016-08-03 11:35:28 +02:00
tkrokli 28848a1860 Core/Scripts: Remove useless SD2 error log (#17691)
* Core/Scripts:  Remove useless log message (ref. joschiwald)
2016-08-03 11:27:03 +02:00
ariel- a85dd54ce0 Update BattleGroundHandler.cpp 2016-08-03 11:26:49 +02:00
Aokromes d1197ef166 Core/PVP: Improve log (#17698) 2016-08-03 11:25:57 +02:00
ariel- aa53a0d71b Core/Spells: Define some aura types
(cherry picked from commit 802ebbe36a57103814ee0ad90378f29f2585a2d7)

Conflicts:
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
2016-08-01 03:54:32 -03:00
ariel- 61c72215c3 Core/Auras: Renamed spell aura 333 to better describe its purpose
(cherry picked from commit c2f6c4d2bd6f06e382c27ca256fcffaa3f0d498b)

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
2016-08-01 03:54:31 -03:00
ariel- badef62df4 Core/Spells: ported helper function from 3f28fd304d833eadefff8d343ab45caf8d0575c2
Core/Spells: Reimplemented automatic spell learning
2016-08-01 03:54:31 -03:00
ariel- 87f25be0aa Core/Spells: build fixes 2016-08-01 03:54:30 -03:00
ariel- 79b3fa5862 Core/Auras: Implemented SPELL_AURA_MOD_SPELL_COOLDOWN_BY_HASTE, SPELL_AURA_MOD_GLOBAL_COOLDOWN_BY_HASTE, SPELL_AURA_MOD_COOLDOWN_BY_HASTE_REGEN and SPELL_AURA_MOD_GLOBAL_COOLDOWN_BY_HASTE_REGEN
(cherry picked from commit 6c71c8694f91f6254e8a913f0550e4ff78cb6875)

Conflicts:
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellHistory.cpp
2016-08-01 03:54:29 -03:00
ariel- 0c51829cc4 Core/Auras: Implemented aura 321 SPELL_AURA_MOD_NO_ACTIONS
(cherry picked from commit 55d5cd37df8f3415b71dac1e50ecc970873d6deb)
2016-08-01 03:54:28 -03:00
ariel- 7c58e4cc08 Core/GameObject: misc type mismatch
(cherry picked from commit 4baa7f443a26df36ced18f96f28c64f1920514eb)
2016-08-01 01:29:58 -03:00
ariel- a0ce33c209 Core/Scripts: Compile fix 2016-08-01 01:27:23 -03:00