Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,877 Commits 4 Branches 146 Tags
d7d0048b7edfe4842835b2c05c67b18d128e55aa
Commit Graph

23277 Commits

Author SHA1 Message Date
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
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
Ovahlord
0526b169ff Core/MMaps: fixed loading parent maps 2018-03-13 18:04:22 +01: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
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
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
Keader
6da3663547 Core/Unit: Guardians no longer enter combat before reaching the target (#19816) 2018-03-12 12:21:46 +01:00
Treeston
b09c808291 Scripts/Naxxramas: Fix an issue that could cause Sapphiron to stop using Drain 2018-03-12 12:21:37 +01:00
Ovahlord
6afdbfc8ce Revert "Core/Objects: use map to get area and zone id" 
This reverts commit 5ad547d8d9.
 2018-03-12 11:55:28 +01:00
Ovahlord
78793ac452 Core/Entities: use PhaseShift when processing terrain updates 2018-03-12 11:08:05 +01:00
sirikfoll
9209aadb43 Scripts/Spells: Quest King of the Mountain 
Added missing jump jets and battle standard visuals
Added allowed area conditions for the vehicle
Fixed Jumpbot's attack spell (thanks @keader for fixing the proc)
 2018-03-10 23:49:58 +01:00
Shauren
b7e29526a2 Core/CrashHandler: Fixed generating crash logs from CRT debug assertions 
(cherry picked from commit abdf6479dd)
 2018-03-10 23:49:43 +01:00
Aokromes
e26c77d3a1 Tools/Vmaps: Fix linux crash 
closes #152
 2018-03-10 21:36:44 +01:00
Ovahlord
4623c411be Core/Maps: fixed loading maps 2018-03-10 20:59:53 +01:00
Aokromes
066f0eada0 Core/Objects: use map to get area and zone id 2018-03-10 15:43:39 +00:00
Ovahlord
5ad547d8d9 Core/Objects: use map to get area and zone id 2018-03-10 16:37:17 +01:00
Ovahlord
27652214b5 Core/Phasing: Rewrite GetTerrainMapId *updated phasing with latest changes 2018-03-10 16:10:48 +01:00
Ovahlord
b9d0ab6ed8 Core/Maps: Implemented loading swapped maps 2018-03-10 13:54:23 +01:00
Ovahlord
ce4e137889 Core/Entities: Take terrain swaps into account when calculating LoS/height/area 2018-03-09 23:45:06 +01:00
Aokromes
83627cf2c3 rename files 2018-03-09 22:39:02 +01:00
Ovahlord
fe4f86b1bc Core/VMaps: fixed build, vmaps extraction and some copy paste fails 2018-03-09 22:21:28 +01:00
Ovahlord
4bbdce57e2 Core/VMaps: Implement loading phased tiles 2018-03-09 18:05:47 +01:00
Gooyeth
8a54503c09 Core/Player: Do not remove auras from Gamemasters in arenas (#21568) 2018-03-09 10:15:53 +01:00
ariel-
2aa4871b20 Core/Conditions: validate object types when conditioning implicit spell targets with CONDITION_OBJECT_ENTRY_GUID 
Closes #21569
 2018-03-09 10:15:46 +01:00
Ovahlord
e44bb5f387 Core/Entities: Phase Rework (main commit) 2018-03-08 22:58:50 +01:00
ariel-
79a0d012f2 Scripts/Commands: Make Shauren happy 2018-03-06 23:48:53 +01:00
Aokromes
d174eb760a Scripts/Commands: implemented command .server debug 
- Shows detailed information about server setup, useful when reporting a bug:
 * rev. hash
 * versions of mysql, openssl, boost, cmake
 * info about autoupdater
 * info about ports (realmlist and current)
 * vmap/map/mmap status and folder sizes
 * available DBC locales
 * TDB version
 2018-03-06 23:48:39 +01:00
Aokromes
bd49bfef5f sort headers 2018-03-06 23:30:42 +01:00
Ovahlord
f6d3b214c2 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
 2018-03-06 13:03:29 +01:00
Aokromes
7c041c7366 build fix 2018-03-06 00:27:54 +01:00
Aokromes
c33ff02c34 Core/MMaps: Remove phased tile support 
* Extremely slow
* Needs to be implemented partially in tools
* Conflicts with upcoming phasing rewrite
 2018-03-06 00:22:05 +01:00
Shauren
523a2dccdc Revert "Collision/MMap: Fix a memleak reported by valgrind" 
This reverts commit 32e8b6506f.
 2018-03-06 00:02:33 +01:00
Aokromes
cbf7a27478 Revert "Core/MMaps: Fix crash introduced in commit 32e8b65 (#17447)" 
This reverts commit f293994.
 2018-03-06 00:01:52 +01:00
Warlockbugs
6a8c0df9a8 Core/Crypto: Transitional Cryptography update for OpenSSL 1.1 (#21534) 
Support for both OpenSSL 1.0 LTS and OpenSSL 1.1 versions.

Many Linux distributions are still on 1.0 and will stay on LTS for quite
some time.

Port of CMaNGOS commit: e1b0048f05
 2018-03-05 14:54:35 +01:00
ariel-
23b2d7bcea Core/Spells: explicitly disable non proccing auras when generating default procs 
Closes #21529
 2018-03-05 14:36:32 +01:00
ariel-
2697bdf2b2 Core/Misc: fix bad dbc data for lock 'Locked ball and chain' 
Closes #12260
 2018-03-05 14:34:31 +01:00