Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 13:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,075 Commits 4 Branches 146 Tags
dd67f4ed966875e6e68f6b0a8d56cdf190d0f352
Commit Graph

11453 Commits

Author SHA1 Message Date
robinsch
dd67f4ed96 Core/Spell: Remove all raid auras on party leave (#17663) 
Core/Spell: Remove all raid auras on party leave
 2016-08-14 17:26:03 +02:00
tkrokli
e2f395863a Core/Scripts: remove script npc_timothy_daniels (#17779) 
The core script `npc_timothy_daniels` is no longer needed,
all the gossip handling is already present in the database.

- remove core script npc_timothy_daniels
- remove ScriptName from c_t entry in DB
 2016-08-14 12:05:24 +02:00
tkrokli
0c6eeb3abc Core/Scripts: move npc_mortog_steamhead to DB 
Move core script npc_mortog_steamhead to database
- script contains gossip handling + 1 condition
- both actions can be handled in DB settings
 2016-08-14 09:50:28 +02:00
treeston
d08efca201 Entities/Player: Fixed an edge case bug that could cause a character to get stuck in forced recustomization indefinitely if two or more appearance properties were out of bounds. 2016-08-14 00:29:37 +02:00
Duarte Duarte
829d550c1b Merge pull request #17776 from ShinDarth/worldstate 
Minor improvements
 2016-08-13 15:42:53 +01:00
ShinDarth
54a7b8358e Core/Worldstates: move WS_ARENA_DISTRIBUTION_TIME declaration 2016-08-13 16:32:19 +02:00
Shauren
330e5b0ebc Core/DataStores: Reduce differences between branches - rename achievement related dbc fields 2016-08-12 18:29:21 +02:00
jackpoz
194fbd1792 Core/Dynamic: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-12 11:33:02 +02:00
ForesterDev
fdcea5c7ef Core/Command: Check account password max length 2016-08-11 13:32:52 +02:00
tkrokli
2507b9f8af Core/Scripts: remove 2 unused scripts (#17759) 
These scripts are no longer in use:
- generic_creature
- trigger_death
 2016-08-11 13:29:28 +02:00
Aokromes
43c3f3a235 Core/Arena: Teams don't lose rating after arena draw (#17515) 
By Raydor, closes #16865
 2016-08-11 13:00:31 +02:00
Aokromes
1ad24352ac Core/Logs: Fine tune more logs 
And move others to more logical appenders
 2016-08-11 09:10:20 +02:00
Trond B Krokli
70b3373da1 Core/DB/Updater: English grammar corrections (#17207) 
Improve English text in strings and comments in UpdateFetcher.cpp
- replace incorrect text with the intended words in some output strings
- corrections in the comments to point out the intention of the code
(cherry picked from commit 186375d997)
 2016-08-10 18:11:36 +02:00
jackpoz
7616f796d0 Server/Database: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-10 16:57:21 +02:00
jackpoz
abe37e458c Server/Database: Reduce differences between 3.3.5 and 6.x branches 
Cherry-pick 1bea52fd46 and 543bea32 to add support to TYPE_BINARY MySQL field type
 2016-08-10 16:02:22 +02:00
treeston
ac35f93c2d Entity/Creature: Fix spawn health, for real this time. Closes #17757. Also for real this time. 2016-08-09 00:19:22 +02:00
treeston
5b6eb29b74 Entities/Creature: Fix spawn health, fdd78d2 follow-up. Fixes and closes #17757. 2016-08-08 23:54:47 +02:00
Treeston
fdd78d2077 Core/Creature: Fix health regeneration. Creatures immediately reset to full health upon reaching home, rather than slowly regaining it over multiple seconds, which allows players to re-engage them at less than max health. (#17756) 2016-08-08 11:22:11 +02:00
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
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
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
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
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
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
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