Commit Graph
26501 Commits
Author SHA1 Message Date
robinsch 2263cb9e10 Core/Unit: Fix issue with Divine Shield immunities
Closes #14910
2015-07-01 17:37:36 +02:00
Naios e142c3b873 Cleanup duplicated names from contributors list.
* ref 1a7a9619d8
2015-06-30 23:39:31 +02:00
Naios 4335611010 Core/Updater: Fix mysql cli password prompt when password is empty.
* ref: http://community.trinitycore.org/topic/11510-world-server-bug-enter-password-to-update/
2015-06-30 23:33:07 +02:00
Naios 836ec5a6e6 Core/Utilities: Fix callback invokation when there are no tasks present.
* thx @joschiwald for noticing.
2015-06-30 23:29:19 +02:00
Nyeriah 0b1355b280 Scripts/RubySanctum: Fix build warnings 2015-06-30 10:22:28 -03:00
Carbenium 72c66e2136 Merge pull request #14979 from ShinDarth/gitignore
Add nbproject/* to gitignore
(cherry picked from commit a0f9cadb18f1e1cfd2879a49b2dc66566652dbae)
2015-06-30 14:48:23 +02:00
mik1893 551c61b7ce Merge pull request #14898 from tkrokli/improved_devouring_plague
[3.3.5] Core/Spells: Improved Devouring Plague spell direct damage
2015-06-30 13:46:18 +02:00
Shauren efad3a3123 Core/Spells: Implemented CAST_FLAG_IMMUNITY 2015-06-30 11:44:11 +02:00
jackpoz 879af88d21 Buildsystem/Clang: Suppress warning
Suppress -Wmismatched-tags warnings on clang to avoid false positive warnings reported using gcc 4.8
2015-06-29 22:29:28 +02:00
Carbenium adb5d3ea5f Merge pull request #14941 from ShinDarth/db_backports3
DB/World schema backport: move questItem* fields to *_questitem tables
2015-06-29 20:03:11 +02:00
mik1893 aacd8feb61 Merge pull request #14969 from chaodhib/taunt_threat_fixes
[Spell] Fix bugged amount of threat given by Taunt
2015-06-29 19:53:28 +02:00
mik1893 c8df10dbc0 Merge pull request #14976 from robinsch/wgTimer
Core/WorldState: WG Interface timer
Closes issue  #14913
2015-06-29 19:39:26 +02:00
ShinDarth 1c0b0f825c DB/World schema backport: move questItem* fields to *_questitem tables 2015-06-29 19:21:00 +02:00
chaodhib 00788c6f01 [SpellEffect] Fix bugged amount of threat given by Taunt
1) doAddThreat call instead of AddThreat. ThreatCalcHelper shouldnt be called. Otherwise, the value of the threat that will be added to the caster will be multiplied by a threatModifier (about 1.6)
2) Taunt should give the caster the same threat as the one in the top of the list. If player A has aggro with 1000 threat, player B has 1050 threat and if player C taunts, player C should have 1050 threat after the taunt and not 1000 (the difference can be much bigger with ranged players).
2015-06-29 17:39:55 +02:00
DDuarte 1b2a67a1b5 Build/CMake: Fix finding MySQL install
(cherry picked from commit d4deb17a2f94d06b7eab232b90e874fa58675b36)
2015-06-29 14:09:48 +01:00
robinsch 7fbd035620 Core/WorldState: Send BATTLEFIELD_WG_WORLD_STATE_ACTIVE when sending initial world states for Wintergrasp. This will fix issue #14913 2015-06-29 10:49:43 +02:00
Naios 1a34fde96b Merge pull request #14971 from ShinDarth/fix_char_upd
DB/Characters fix auto updater
2015-06-29 00:11:08 +02:00
ShinDarth 47561ab9d3 DB/Characters fix auto updater 2015-06-29 00:09:32 +02:00
jackpoz c86cf03dce Core/Dependencies: Fix some warnings in G3D 2015-06-28 22:55:19 +02:00
jackpoz 80761849cc Tools/Misc: Fix build warnings 2015-06-28 22:01:47 +02:00
jackpoz dfa556aaa2 Core/Dependencies: Update recast
Update recast to https://github.com/memononen/recastnavigation/commit/1dd5cf1883d61e723fef3d4957cf758c50e7a52b
Fix 2 warnings.

These changes have no effect on MMAPs and it's not needed to re-extact them.
2015-06-28 21:20:01 +02:00
Aokromes 5b6cbe88d3 Update 2015_06_28_02_world.sql 2015-06-28 19:06:48 +02:00
Aokromes 3720be33e1 DB/Gameobject: Silithyst Mound
By Killyana, closes #14637
2015-06-28 18:07:52 +02:00
Aokromes d3590f92c2 DB/Quest: Master the Storm
By Killyana, closes #1883
2015-06-28 18:04:56 +02:00
Aokromes 9132cfe5e3 DB/Quest: A Race Against Time
By Killyana, closes #1074
2015-06-28 18:03:33 +02:00
Aokromes 77d083eb16 DB/Quest: The Perfect Dissemblance
By Killyana, closes #12439
2015-06-28 18:02:13 +02:00
Aokromes 7e5307b9f3 DB/Creature: Innkeeper Keldamyr
By MrSmite, closes #12474
2015-06-28 18:00:27 +02:00
Aokromes 813a903746 DB/Misc: Fix startup errors
By Killyana, updates #14730
2015-06-28 17:53:35 +02:00
mik1893 e243df4df9 DB/Oculus: typo in sql 2015-06-28 16:51:12 +02:00
mik1893 791356c27e DB/Oculus: mob missing spells / visuals 2015-06-28 16:48:46 +02:00
MitchesD a29433fbab DB/Quest: I've Got a Flying Machine
Closes https://github.com/TrinityCore/TrinityCore/issues/14965

By Killyana
2015-06-28 11:16:54 +02:00
mik1893 7c01638d45 Scripts/VioletHold: fix a crash during Ichoron encounter
Closes #14962
2015-06-27 22:07:57 +02:00
Mik1893 accab5451d Core/Creature: Fix UNIT_FLAG_IMMUNE_TO_PC validity for player pets
related to #14780 and #14744
2015-06-26 16:52:40 +02:00
Mik1893 409c8e406d Scripts/Oculus: Implemented Drake GPS system 2015-06-26 16:24:12 +02:00
DDuarte 5a7adbba3a Fix build after recent cherry picks (v2.0) 2015-06-26 04:08:40 +01:00
DDuarte 079ebe4d5d Fix build after recent cherry picks 2015-06-26 04:01:26 +01:00
DDuarte 02df39f791 Fix build and SQL import after recent cherry picks 2015-06-26 02:42:24 +01:00
Warpten aade16a2f4 Scripts/RubySanctum: Updates to Halion.
* Fixed Living Embers not spawning.
* Meteor Strike is now randomized.

(cherry picked from 1447875cac0fefd58ae3ad27e6b3fa2134a714c0)

Scripts/RubySanctum: Fix a mathematical mistake.
SQL: Do not use MAX(Id), hardcode it.

(cherry picked from 7a5bc9e1fe457f0c77cdfecefa5bd42525105c3e)

Scripts/RubySanctum: Correctly spawn Living Embers.

(cherry picked from 7c4b8b0e826fd1cdab8a635225123aebd1b950c6)

Scripts/RubySanctum: Remove duplicate code.

(cherry picked from 1d29328769d505caf4541b0d712972195dda8b70)

Core/Misc: Warning fixes

(cherry picked from dc53dad8a44292bcb555db9fdc07eb255a838cac)
2015-06-26 01:52:17 +01:00
Duarte Duarte 33f48a460c Merge pull request #14920 from Exodius/Exodius-readme
Update README.md
(cherry picked from commit 4093eee19b511864f1049c8d2e9c34ab897f619c)
2015-06-26 01:28:40 +01:00
Shauren 2538a84d0c Core/Units: Changed SPELL_AURA_MOD_MINIMUM_SPEED to always be applied, not only if under a slow aura (SPELL_AURA_MOD_MINIMUM_SPEED can set the minimum speed higher than base speed)
(cherry picked from commit d2142ac380863716ecea6f4aa44f7e556e44dfd9)
2015-06-26 01:26:22 +01:00
DDuarte 24b5dfcb4d Core/BattlegroundIC: Removed 1 hack:
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."

(cherry picked from commit 8a4afad63ac97b39f6746d466f3166eeef62e711)

Conflicts:
	sql/updates/world/2015_05_01_00_world.sql
	src/server/game/Miscellaneous/Language.h

Rename 2015_05_01_00_world.sql to 2015_06_13_00_world.sql

(cherry picked from commit 74eeefa5be163a55489f91c05d7dfd1cb624c78d)
2015-06-26 01:24:21 +01:00
Shauren 5fe819462f Core/GameObject: Removed unneeded argument from GameObjectModel::Relocate and renamed it to UpdatePosition
(cherry picked from commit 6e9ab38fcc9d2859393e452ef8630ee420783e47)
2015-06-26 00:53:12 +01:00
Duarte Duarte a8d8976e2c Merge pull request #14723 from TrinityCore/findmysql-update
Update FindMySQL.cmake
(cherry picked from commit fb4a9823c41b31158f6b5d68fc2ffc1608051984)
2015-06-26 00:52:52 +01:00
DDuarte 80695181b9 Core/LootMgr: Remove dead validation code from LoadLootTable
CID 1288389 Operands don't affect result

(cherry picked from commit 47a119e4fa617319b283e7c3824241bc0b6775fb)
2015-06-26 00:51:16 +01:00
DDuarte ae64c11b28 Core: Fix multiple Coverity issues
(cherry picked from commit b8c681c776d7918e7b3f2a89422509a87bcb5da2)

Conflicts:
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Server/Packets/CharacterPackets.h
	src/server/game/Server/Packets/MovementPackets.h
	src/server/game/Spells/SpellInfo.cpp
2015-06-26 00:49:38 +01:00
ShinDarth f8230a59a9 DB/Characters: Backport schema changes from 6.x branch (renames)
Closes #14951
2015-06-26 00:28:32 +01:00
mik1893 49809bd404 Scripts/VioletHold: Fix codestyle and unwanted crash in Violet/Hold
closes #14952 and #14953
2015-06-26 00:30:04 +02:00
MitchesD e34f74dace Scripts/VioletHold: fixed non-pch build and codestyle 2015-06-25 15:26:02 +02:00
MitchesD 8176902b17 Rename 2015_06_08_01_world.sql to 2015_06_25_00_world.sql 2015-06-25 14:45:51 +02:00
MitchesD 83954fb999 Merge pull request #14860 from mik1893/violethold
Core/Scripts: Violet Hold, full rework
2015-06-25 14:45:13 +02:00