Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,058 Commits 4 Branches 146 Tags
7616f796d0fa6a82935cfc67bfdfbcf54efbcbc7
Commit Graph

26058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dr-J
3755937611 DB/Misc: Fixes 
1) Make http://www.wowhead.com/quest=13125/the-air-stands-still and http://www.wowhead.com/quest=13235/the-flesh-giant-champion so player only has to tag the elite to receive credit so that if those op elites which assist player does more damage than player they still receive credit.
2) An update to previous script for Murloc Pets
 2016-08-09 19:13:14 +01:00
Dr-J
53b598c6c7 DB/Loot: Toc Recipes 
Set it so that both horde and alliance have equal chance of getting a recipe drop in Trial of the Crusader rather than chance been 1% for horde and 6% for alliance.
 2016-08-09 19:04:57 +01: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
jackpoz
5588881be2 Common/Common: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-08 18:07:19 +02:00
Naios
68015599dc Core/Common: Converted the common library to a shared library. 
* There is still the possibility to static link against common.

(cherry picked from commit 501fd9b502)

# Conflicts:
#	src/common/Collision/Management/MMapManager.h
#	src/common/Collision/VMapTools.h
#	src/common/Common.cpp
#	src/common/Common.h
#	src/common/Cryptography/Authentication/PacketCrypt.h
#	src/common/Cryptography/Authentication/WorldPacketCrypt.h
#	src/common/Cryptography/HmacHash.cpp
#	src/common/Cryptography/HmacHash.h
#	src/common/Cryptography/SHA256.h
#	src/common/GitRevision.h
#	src/common/Utilities/Random.h
#	src/common/Utilities/Util.h
 2016-08-08 18:00:32 +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
Nyeriah
358af1ccc2 DB/Misc: Fix a couple of start up errors and allow the mounted version of Attumen the Huntsmen to skip player damage check 2016-08-08 01:18:01 -03: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
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
Dr-J
60c142fd3b DB/Creature: Father Kamaros 
1) Add the missing second http://www.wowhead.com/npc=32800/father-kamaros (only http://www.wowhead.com/npc=31279/father-kamaros is spawned
2) Quests http://www.wowhead.com/quest=13221/im-not-dead-yet and http://www.wowhead.com/quest=13229/im-not-dead-yet should become available once  http://www.wowhead.com/quest=13120/deaths-gaze and http://www.wowhead.com/quest=13119/destroying-the-altars become available not once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton is rewarded.
3) Quests http://www.wowhead.com/quest=13482/lets-get-out-of-here and http://www.wowhead.com/quest=13481/lets-get-out-of-here should become available once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton is rewarded.
4) Both quests I'm Not Dead Yet and Let's Get Out of Here should be exclusive grouped which player gets depends on what phase they are in when they encounter Father Kamaros
5) Script and texts and wp are identical for this quest as confirmed from sniff so duplicating script from 31279
 2016-08-05 14:54:56 +01: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
Killyana
91b2351876 DB/SAI: Fix runtime SAI error 2016-08-04 17:27:45 +02:00
Killyana
dde5389673 DB: Blood elf start location / Sunstrider isle fixes 
By msoky
 2016-08-04 17:20:50 +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
Kittnz
74bf937865 Fix deleting some gameobjects 2016-08-03 20:49:21 +02:00
Kittnz
2c0b0b6afa DB/Creature: Grizzly Hills Vordrassil area 
- Add missing Vordrassil's Seed spawns
- Add missing creature spawns: Frostpaw Warrior, Redfang Hunter, Generic Trigger LAB, Frostpaw Shaman, Redfang Elder, Frostpaw Trapper
- Add pathing for Frostpaw Shaman, Frostpaw Warrior
- Change some SAI's, Redfang Hunter SAI, Frostpaw Shaman SAI, Generic Trigger LAB SAI
 2016-08-03 20:29:06 +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
Dr-J
9977bf7479 DB/Quest: From the Depths of Azjol-Nerub 
Fix this http://www.wowhead.com/quest=12036/from-the-depths-of-azjol-nerub again after cdf8f3c2e1 areatrigger_involvedrelation does not like sai triggers
 2016-08-03 16:59:51 +01: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
Aokromes
ca99b688ed DB/Misc: Fix on startup error 2016-08-03 10:44:04 +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
Dr-J
e7cfb08cb5 DB/Quest: A Couple more event scripts 
1) http://www.wowhead.com/quest=11631/vision-of-air so there is actually visual rather than quest been immedietly completed when quest item used
2) Event for turn in of http://www.wowhead.com/quest=11695/the-horn-of-elemental-fury
3) A small fix for Subjugated Iskalder so this npc has to be taken back the the bone witch rather than credit been given on spawn and npc not moving (due to bad follow action),
 2016-08-02 20:41:53 +01: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