Commit Graph

33378 Commits

Author SHA1 Message Date
Ovahlord
f89253b320 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-06-06 15:53:54 +02:00
Ovahlord
f6aafb7070 Scripts/BoT: finished Theralion and Valiona implementation 2018-06-06 15:12:51 +02:00
Ovahlord
272ed6805c Core/Units: merged some unit state changes from 335 branch 2018-06-06 14:01:33 +02:00
Ovahlord
d5e23043fc Scripts/BoT: finished script implementation of Theralion and Valiona 2018-06-05 22:58:46 +02:00
Ovahlord
ad3dff69c1 Core/Cmake: removed an unneeded include since bzlib is always included by now 2018-06-05 14:53:09 +02:00
Ovahlord
2cdb3a60ec Core/CMake: fixed linking servers when tools are disabled 2018-06-05 14:48:48 +02:00
Ovahlord
b5a0d7c857 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-06-05 14:21:42 +02:00
Aokromes
b71f780fb5 Update 2018_06_03_10_world.sql 2018-06-03 17:08:15 +00:00
Ovahlord
b517a9101b Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-06-03 18:39:41 +02:00
Aokromes
e8a831dd33 typo fix 2018-06-03 18:38:56 +02:00
Ovahlord
5b1201a40a Fixed build 2018-06-03 18:36:11 +02:00
Ovahlord
61ddd060a5 Scripts/BoT: more work for Theralion and Valiona's twilight phase 2018-06-03 18:13:16 +02:00
Ovahlord
359a22ce19 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
# Conflicts:
#	src/server/game/Spells/Auras/SpellAuras.cpp
#	src/tools/vmap4_extractor/wmo.cpp
2018-06-03 18:12:42 +02:00
Ovahlord
fa09bac40d Scripts/Pets: fixed a warning 2018-06-03 18:03:16 +02:00
Ovahlord
92e868cf5d Scripts/Pets: Lil' Ragnaros 2018-06-03 18:01:27 +02:00
Aokromes
96bea3a7c4 rename files 2018-06-03 17:56:28 +02:00
Keader
751f8d223d DB/Spells: Fixed proc of Seal of Command (Illidari Concil) 2018-06-03 17:55:13 +02:00
ZenoX92
f25a52b64e DB/Quest: A Gnome's Assistance
Closes #21992
2018-06-03 17:55:05 +02:00
Killyana
daf271e280 DB/GameObject: Add missing gob template 2018-06-03 17:42:36 +02:00
Killyana
9f6b236798 DB: Fix some Phases 2018-06-03 17:24:18 +02:00
Killyana
4a8ad44c68 DB/Creature: Erunak Stonespeaker 2018-06-03 13:33:45 +02:00
Aokromes
24be1a6479 rename files 2018-06-03 10:33:18 +02:00
ZenoX92
589c1ffc33 DB/Quest: Laughing Sisters
Closes #21991
2018-06-03 10:31:10 +02:00
ZenoX92
be358024b5 DB/Quest: Gathering Materials (Horde)
Closes #21990
2018-06-03 10:31:00 +02:00
ZenoX92
315c9d790f DB/Quest: Quest Emotes (Elwynn Forest & Westfall)
Closes #21989
2018-06-03 10:30:47 +02:00
ZenoX92
490d7367af DB/Gossip: Anchorite Delan
Closes #21988
2018-06-03 10:30:38 +02:00
Gooyeth
c33caac90b DB/Gossip: Grandmother - Karazhan
Closes #21982
2018-06-03 10:30:27 +02:00
Maxwelllmj
7a89b315bf Scripts/Karazhan: make Barnes properly start the Opera Event (#21970)
Close: #21881
2018-06-01 15:40:35 +02:00
Aokromes
c880aca82d Tools/vmapextractor: Fixed undeclared identifier 'assert' on OSX 2018-06-01 12:49:30 +02:00
Aokromes
72123d38b8 rename files 2018-05-31 09:41:14 +02:00
ZenoX92
979806f2ac DB/Gossip: Lady Jaina Proudmoore
Closes #21985
2018-05-31 09:39:54 +02:00
ZenoX92
04fd1edd0a DB/Quest: The Completed Orb of Noh'Orahil & The Completed Orb of Dar'Orahil
Closes #21984
2018-05-31 09:39:47 +02:00
Killyana
a98ec2583e DB/Condition: Lashh'an Channeling
Closes #21983
2018-05-31 09:39:37 +02:00
Killyana
f31de93100 DB/SAI: Power Converter
Closes  #21986
2018-05-31 09:39:29 +02:00
Aokromes
f46868630b rename files 2018-05-30 13:42:02 +02:00
ZenoX92
44236f2d68 DB/Gossip: Menara Voidrender, Acolyte Wytula & Acolyte Magaz
Closes #21979
2018-05-30 13:39:28 +02:00
ZenoX92
98873f095d DB/Quest: The Completed Orb of Noh'Orahil & The Completed Orb of Dar'Orahil
Closes #21978
2018-05-30 13:39:21 +02:00
ZenoX92
3e447d760b DB/Quest: A Noble Brew (Part 2)
Closes #21977
2018-05-30 13:39:16 +02:00
ZenoX92
805e7e7700 DB/Creature: Doc Mixilpixil
Closes #21975
2018-05-30 13:39:09 +02:00
ZenoX92
475497e2e8 DB/Creature: Defias Tower Patroller
Closes #21974
2018-05-30 13:39:02 +02:00
ZenoX92
f76325e699 DB/Creature: Klaven Mortwake
Closes #21973
2018-05-30 13:38:55 +02:00
ZenoX92
476404914b DB/Quest: Alther's Mill
Closes #21972
2018-05-30 13:38:47 +02:00
Ovahlord
7184862351 Scripts/Deadmines: added some safety checks for some spellscripts in all boss scripts 2018-05-30 11:48:30 +02:00
Ovahlord
473c663e3b Scripts/Deadmines: Glubtok should be able to use offhand attacks 2018-05-29 18:53:08 +02:00
Ovahlord
dbb60b46ad Scripts/Deadmines: Vanessa VanCleef should constantly summon Defias reinforcements rather than just each one a single time 2018-05-29 18:52:29 +02:00
Keader
10bf058436 Scripts/Magtheridon Lair: Fixed a case when channelers get hit kill and not start fight
It's needed for cataclysm+
2018-05-29 16:40:56 +02:00
Ovahlord
4376098be4 Core/Spells: fixed broken riding trainers when Druids learned Flight Form 2018-05-28 21:33:52 +02:00
Ovahlord
399e2ea132 Core/Pets: Hunter pets should always be on the same level as their owner 2018-05-28 17:00:09 +02:00
Ovahlord
a2c187ddbb Scripts/LCT: fixed a logic mistake in Wind Tunnel summon logics 2018-05-28 16:25:45 +02:00
Ovahlord
e832f056ca Core/Players: fixed currency rewards for quests that use a currency type with currency precision
*fixed average itemlevel calculation if the player is using a two-handed weapon
2018-05-28 15:47:28 +02:00