araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-20 15:01:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,048 Commits 17 Branches 140 Tags
ac3bfd111d60bc4a11ef41855113c8a10fba8ff1
Commit Graph

19069 Commits

Author SHA1 Message Date
ariel- ac3bfd111d Update ObjectMgr.cpp 2016-08-07 15:25:11 -03:00
Aokromes e4ad88245a Core/Log: Move log to more logical loglevel 2016-08-07 11:48:44 +02:00
Aokromes b65d26b5b4 Core/Logs: Fine tune more logs 
And move others to more logical appenders
 2016-08-07 11:28:22 +02:00
Aokromes e1cbd2c34a Core/Logs: Fine tune another log 2016-08-07 07:39:38 +02:00
treeston e9d4bbc74e Core/Conditions: Add new CONDITION_PET_TYPE (45). Matches target player's pet against specified (value1) bitmask. 2016-08-06 20:20:07 +02:00
treeston 9785546967 Core/Conditions: Add new CONDITION_CHARMED (44). Does what it says on the tin. 2016-08-06 17:09:04 +02:00
jackpoz 4170a9357c Common/Utilities: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-06 16:28:46 +02:00
treeston d760219062 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-06 14:34:07 +02:00
Shauren caee7dcad5 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 dd1533b315)
 2016-08-06 14:29:11 +02:00
Aokromes b51409a5d3 Core/Logs: Fine tunning some logs 2016-08-05 21:22:12 +02:00
treeston 152b3ad5b9 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 12:41:56 +02:00
Kittnz 2c0c129a8f Merge pull request #17733 from ForesterDev/acc_del 
Core/Command: remove account_muted data on account deletion
 2016-08-05 11:15:55 +02:00
Aokromes 6bb6bc7f1d Update RBAC.h 2016-08-05 03:52:54 +02:00
Aokromes a15fa423b8 Core/RBAC: Name some permissions from 7.x to stop people reuse them 
RBAC_PERM_COMMAND_NPC_EVADE                              = 837,
    RBAC_PERM_COMMAND_PET_LEVEL                              = 838,
    RBAC_PERM_COMMAND_SERVER_SHUTDOWN_FORCE                  = 839,
conflicts with 6.x:
    RBAC_PERM_COMMAND_RELOAD_CHARACTER_TEMPLATE              = 837,
    RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING                  = 838,
    RBAC_PERM_COMMAND_DEBUG_SEND_PLAYSCENE                   = 839,
 2016-08-05 03:34:06 +02:00
jackpoz 206f08adbb Common/Threading: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-04 23:44:55 +02:00
jackpoz bcd5380e78 Common/Logging: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-04 21:53:43 +02:00
tkrokli 3c5b5f56f0 Core/Scripts: remove #define text in pyrewood_ambush 
- remove #define text from script
- move say text to DB table creature_text
- add enum names and values
- move values in code to enum
 2016-08-04 18:13:55 +02:00
jackpoz 8538151ea6 Common/Debugging: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-04 17:04:31 +02:00
treeston d76e15b587 Merge remote-tracking branch 'tkrokli/hunter_animal_handler' into 3.3.5 (PR #16554) 2016-08-04 15:33:44 +02:00
treeston 4030e4d780 ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds. 2016-08-04 15:32:24 +02:00
ForesterDev 6a87524204 Core\Command: remove account_muted data on account deletion 2016-08-04 17:24:41 +04:00
jackpoz b37c7101de Scripts/Commands: Change "server shutdown" behavior 
Change "server shutdown 0" behavior to delay the shutdown by the force threshold specified in configs if there are still players connected, set to 30 by default
 2016-08-04 15:03:58 +02:00
tkrokli 2125c12609 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:34:51 +02:00
jackpoz e4b2e0450f Common/Crypto: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 23:33:36 +02:00
jackpoz 25dc3dd7a2 Common/Maps: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 22:35:44 +02:00
jackpoz 6ce252f80a Common/Maps: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 18:29:57 +02:00
jackpoz 884736b3b2 Scripts/Commands: Change "server shutdown" behavior 
Change "server shutdown" behavior to always include [force] optional parameter when issued from local or remote console.
 2016-08-03 16:26:30 +02:00
jackpoz d77e76c584 Common/MMaps: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 15:45:44 +02:00
treeston 837caa0534 Merge remote-tracking branch 'Treeston/3.3.5-spellcastresult' into 3.3.5 (PR #17112) 2016-08-03 10:52:11 +02:00
Aokromes 153b797182 Update boss_jedoga_shadowseeker.cpp 2016-08-03 10:47:34 +02:00
Shauren 5427dd4ce6 Core/DataStores: Fixed name validation crash on locales with utf-8 characters encoded on more than a single byte 
Closes #17725
 2016-08-03 07:52:06 +02:00
Shauren 5e9f512314 Dep: Remove boost regex dependency and replace its uses with std regex (works since gcc 4.9) 
(cherry picked from commit 943496e56b)

# Conflicts:
#	src/server/game/DataStores/DB2Stores.cpp
#	src/server/game/DataStores/DB2Stores.h
 2016-08-02 17:25:33 +02:00
ariel- ad74638cd6 Core/Chat: fix codestyle 2016-08-01 19:56:46 -03:00
Aokromes 4e4a2aa7b4 Core/Chat: Add missing code 2016-08-01 20:46:31 +02:00
ariel- 33fbc453d2 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-01 14:55:53 -03:00
jackpoz bcfa47c051 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-01 18:55:47 +02:00
Aokromes cf8276845d Core/Chat: Split ChatLevelReq.Say into 3 
ChatLevelReq.Say
ChatLevelReq.Emote
ChatLevelReq.Yell
 2016-08-01 13:24:58 +02:00
Aokromes 35f06ccb55 Typo fix 2016-08-01 11:56:30 +02:00
ariel- 80a463bccb Core/Battlegrounds: do not teleport GMs if out of bounds before starting 2016-08-01 05:47:17 -03:00
Aokromes bfda0ba91d Core/Player: New PartyLevelReq setting (#17707) 2016-08-01 10:43:49 +02:00
ariel- 0d91ccf6bd Core/Spells: Abyssal Shatter should have a chance to skill up 2016-08-01 04:53:27 -03:00
Keader afaaedad2d Core/Scripts Shade of Akama Rewrite (#17567) 2016-08-01 01:29:53 +02:00
Aokromes 633264f58f Core/PVP: Move report AFK requirement to config (#17699) 2016-07-31 13:35:08 +02:00
tkrokli e54e27af92 Core/Scripts: convert script npcs_riverbreeze_and_silversky to SAI (#17690) 
Move script npcs_riverbreeze_and_silversky to SAI,
thereby removing one line of hardcoded text.

- Remove core script npcs_riverbreeze_and_silversky
- Create SAI script for gossip event Cenarion Beacon
- Add missing gossip_menu for plant description
- Add missing creature_text about Cenarion Beacon
- Add and correct conditions for gossip availability
 2016-07-31 06:16:47 +02:00
tkrokli 8fdb9b4579 Core/Scripts: Remove useless SD2 error log (#17691) 
* Core/Scripts:  Remove useless log message (ref. joschiwald)
 2016-07-31 06:08:43 +02:00
ariel- dff18152fc Update BattleGroundHandler.cpp 2016-07-31 01:02:18 -03:00
Aokromes ea4e7fec01 Core/PVP: Improve log (#17698) 2016-07-31 05:25:41 +02:00
ariel- 4baa7f443a Core/GameObject: misc type mismatch 2016-07-30 19:15:02 -03:00
ariel- 62bfee37cb Core/Entities: debloat SummonGameObject parameter list using proper wrappers and enable GO rotation in scripts 
- There's still an overload allowing for x, y, z, o to be passed directly
- Fixed default animstate for GameObject creation in many places, it should be 255, not 100 (checked in sniffs)
 2016-07-30 18:50:44 -03:00
Tomatoes 29826a92ef Core/Ticket System: Ticket comment visual output bug 
* Commenting on a ticket no longer sends the GM's name to the ticket handler for assignment
* Closes #16091
* Closes #17686

Signed-off-by: Naios <naios-dev@live.de>
 2016-07-30 22:37:35 +02:00