Commit Graph
32707 Commits
Author SHA1 Message Date
sevi 5fc89a1c85 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-27 21:25:58 +02:00
Shauren e02dbdb176 Core/Misc: Build fix for some compilers
Closes #21705
2018-03-27 20:51:07 +02:00
Ovahlord 7bd10bace8 Core/Phasing: synch phasing with PR 2018-03-25 18:16:40 +02:00
Ovahlord 612686f639 Core/Phasing: removed an incompatible loading validation until the datastore system has been adapted for that handling 2018-03-25 18:16:39 +02:00
Ovahlord 89c6777803 * Core/Phasing: fixed gameobject floor detection
*merged a crash fix
2018-03-22 17:36:01 +01:00
sevi a32139bded Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-22 13:54:44 +01:00
Aokromes e837c9948f typo fix 2018-03-20 00:17:27 +01:00
Aokromes b2bd434a04 missing part 2018-03-20 00:06:17 +01:00
Ovahlord 7ea9695868 Core/Player: fixed an db layout issue that was causing corrupted pvp kill counters 2018-03-19 23:59:50 +01:00
Ovahlord 1583ae45a4 Core/Phasing: fixed build 2018-03-19 23:56:58 +01:00
Ovahlord 20d0aa0c23 Core/Maps: synch phasing with latest PR state. Fixes a instance map crash 2018-03-19 23:49:21 +01:00
Aokromes a8151040c5 Core/Transport: Fix some teleportation issues while on transports 2018-03-19 13:18:29 +01:00
Shauren 97bd2e2f2f Core/Movement: Fixed transport teleports on the same map (and teleporting on transports too) 2018-03-19 00:30:38 +01:00
Aokromes e0dd75b626 warning fix 2018-03-18 19:47:39 +01:00
Aokromes e0f680131e Make travis happy, this time for real 2018-03-18 14:09:49 +01:00
Aokromes 251cce9685 Phasing 2018-03-17 19:41:20 +00:00
Ovah 16c97d35a1 Phasing 2018-03-17 19:41:20 +00:00
Aokromes 712239e215 Core/Conditions: Add missing break 2018-03-17 14:17:45 +01:00
Aokromes cc3639cbb9 fix build 2018-03-17 10:37:50 +01:00
Aokromes 04f488e55e Core/Players: Include graveyards from terrain swap maps 2018-03-17 10:12:00 +01:00
Aokromes 8d38ec47fb Core/Misc: Graveyards can now use conditions, SourceType = 27, SourceEntry = graveyard_zone.ID 2018-03-17 09:56:43 +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 https://github.com/TrinityCore/TrinityCore/commit/565cbed7bad6df759412e1d367423b074f4e1dd8
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
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
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
Aokromes 91a78c6e42 Core/Handler: Port missing stuff 2018-03-14 12:57:14 +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