Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,900 Commits 4 Branches 146 Tags
d707a474df6fd39ec1fb541679dbb468bd08841d
Commit Graph

32900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ovahlord
d707a474df Revert nullptr crash fix as it causes another crash 2018-03-17 16:44:14 +01:00
Ovahlord
afd8675a0a DB: fixed loads of database errors caused by old scriptname leftovers 2018-03-17 16:43:03 +01:00
Ovahlord
e294044787 Core/Spells: Drain Soul will now properly grant Soul Shards while channeling. 
* moved Soul Shard handling to aurascript
 2018-03-17 13:15:22 +01:00
Ovahlord
a46736ba4c Core/Spells: fixed Drain Life healing 
* implement Soul Siphon bonus heal effect for Drain Life
* implement Drain Life bonus healing from Death's Embrace
 2018-03-17 12:49:50 +01:00
Ovahlord
53fb32414b Core/Spells: corrected damage bonus for warlock pets 2018-03-17 01:11:19 +01:00
Ovahlord
a85bebf771 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-17 00:44:49 +01:00
Aokromes
0a37b6e2f9 TDB 4.3.4.28 2018/03/16 2018-03-16 22:40:08 +01:00
Aokromes
419bffeb57 rename files 2018-03-16 22:02:18 +01:00
Killyana
b78413427c DB: Typo 2018-03-16 21:57:56 +01:00
ariel-
fda47267f8 DB/Spells: Weakened soul shouldn't remove stealth 
Closes #21611
 2018-03-16 21:57:49 +01:00
Killyana
1213444f3c DB/SAI: Fix a typo in a previous commit 
Ref 565cbed7ba
 2018-03-16 21:57:33 +01:00
Killyana
222a160d68 DB/Quest: DB/Quest: The Flesh Lies... 
Closes #21591
 2018-03-16 21:54:47 +01:00
Aokromes
fefdfbb971 make travis happy 2018-03-16 20:06:14 +01:00
Ovalord
80f65d665b Core/Pets: updated many pet damage formulars and apply spellpower bonus for warlock pets 2018-03-16 12:28:34 +01:00
Aokromes
73a57ff4e9 another warning fix 2018-03-15 23:29:08 +01:00
Aokromes
fb19272ab9 more warning fixes 2018-03-15 23:19:37 +01:00
Aokromes
2229dcf8ff more warning fixes 2018-03-15 23:06:45 +01:00
Aokromes
fa182ef2c6 warning fix 2018-03-15 22:08:38 +01:00
Ovalord
0e998a6161 Scripts/Deadmines: fixed a warning 2018-03-15 22:06:15 +01:00
Ovalord
ddb9c2a698 Core/Units: fixed a possible crash location caused by nullpointers 2018-03-15 22:06:03 +01:00
Ovalord
a59ea8fc6d DB/Gilneas: updated some smart scripts for better and correct behaivior 2018-03-15 22:05:17 +01:00
Ovalord
d7d0048b7e Core/LFG: do not display currentcy reward info in chat window for random dungeon rewards 2018-03-15 20:31:34 +01:00
Aokromes
a22175ca4f Core/Transports: Fix warnings 2018-03-15 20:26:46 +01:00
Aokromes
ea4a7511d2 make travis happy 2018-03-15 19:54:04 +01:00
Ovalord
246a3c31de Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-15 17:22:03 +01:00
Ovalord
e0d987fa37 Merge branch '4.3.4' of https://github.com/Ovahlord/TrinityCore into 4.3.4 2018-03-15 17:21:39 +01:00
Ovalord
bcd6057ab9 Scripts/Deadmines: added WIP code for Vanessa VanCleef 
* removed some grid searchers and use instancescript instead
 2018-03-15 17:18:06 +01:00
Aokromes
91a78c6e42 Core/Handler: Port missing stuff 2018-03-14 12:57:14 +01:00
Ovahlord
a6368c7e6b Fixed build 2018-03-14 09:11:11 +01:00
Ovahlord
617b3a8a11 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/Map.h
 2018-03-14 08:22:00 +01:00
Ovahlord
8eda9ce7ae Revert "Core/Spells: fixed a tempfix for vehicles vanishing after area change" 2018-03-14 08:09:01 +01:00
Aokromes
a5b5762c15 Core/MMaps: fixed loading parent maps 2018-03-13 17:07:29 +00:00
Ovahlord
0526b169ff Core/MMaps: fixed loading parent maps 2018-03-13 18:04:22 +01:00
Aokromes
a3780f77a1 Updated Phasing with latest master differences 2018-03-13 12:30:56 +00:00
Ovah
3de2e68245 Updated Phasing with latest master differences 2018-03-13 12:30:56 +00:00
Aokromes
8779839d60 Tools/Extractor: Fix vmaps extractor crash on linux 2018-03-13 10:59:11 +01:00
Aokromes
9471392886 Core: fixed phasegroup error log formatting 2018-03-12 20:43:29 +00:00
Ovahlord
9f34b21347 Core: fixed phasegroup error log formatting 2018-03-12 21:36:59 +01:00
Aokromes
af494832b1 Merge branch 'phasing' into '4.3.4' 
Phasing

See merge request trinitycore/TrinityCore_434!119
 2018-03-12 20:29:01 +00:00
Ovahlord
3dfc062d72 Core/MMaps: fixed some warnings and fixed a typo that caused mmaps generation errors. please re-extract 2018-03-12 21:23:32 +01:00
Aokromes
c10a266986 MMaps phasing 2018-03-12 18:19:20 +00:00
Ovah
60afe858e8 MMaps phasing 2018-03-12 18:19:19 +00:00
Ovahlord
457839982a Core/MMaps: Implemented loading phased tiles 2018-03-12 19:15:21 +01:00
Ovahlord
1c7cb1b6af Core/Vmaps: fixed parentMapID setting for vmaps. re-extraction required 2018-03-12 19:15:20 +01:00
Aokromes
813be5c000 DB/Creature: Needs master branch hover 2018-03-12 13:05:41 +01:00
Aokromes
1a12767f16 rename files 2018-03-12 13:02:17 +01:00
Killyana
18176cc3db DB/SAI: Add an extra param "player only" for los_ooc event 2018-03-12 12:40:29 +01:00
jackpoz
19ce97eae4 Core/SmartScripts: Code cleanup 2018-03-12 12:40:23 +01:00
Killyana
81698da80d Core/SAI: Add event_parm5 "player only" for EVENT_OOC_LOS and EVENT_IC_LOS 
Closes #21497
 2018-03-12 12:40:14 +01:00
Killyana
ad4d1b20b6 DB/Gameobject: Fix phaseMask and spawntimesecs for cosmetic eggs used on Territorial Trespass Quest 
Ref #20771
 2018-03-12 12:21:58 +01:00