Commit Graph
10252 Commits
Author SHA1 Message Date
DDuarte 57091cc5f1 CRLF to LF
Seriously....
2015-07-10 20:16:55 +01:00
Carbenium a6f7bb029c Merge pull request #15023 from robinsch/combatMovement
SmartAI: Incorrect removal of movement at SetCombatMove
2015-07-10 00:38:01 +02:00
jackpoz fae8269589 Core/Instances: Fix some Instance Lock chat messages
Always send a Welcome type Instance Lock chat message when entering an instance instead of changing type based on remaining time.
Fix scheduled warning message to always send "Your instance lock for ... will expire in 0 minutes." even if there are hours left, issue added in 4193806dba , closes #11519 .
Update warning messages based on remaining time so that the most meaning is always used (6 hours left, 59 minutes left, etc).
2015-07-08 23:32:04 +02:00
robinsch 2b3ea2e181 SmartAI: Fixed a bug where creatures would clear movement flags when they shouldn't at SetCombatMove. 2015-07-07 10:32:49 +02:00
Shauren 23e4472d14 Core/PacketIO: Removed timezone adjustments from ReadPackedTime - player's session timezone offset should be used there, not server offset
(cherry picked from commit aa3b05c312626d903228aa7a768a069bce5fe526)
2015-07-06 22:25:34 +01:00
jackpoz b574c99549 Scripts/Ulduar: Fix Flame Leviathan instance lock
Fix Flame Leviathan instance lock not being granted to players because they were ejected from the vehicles as soon as boss died.
Players are now ejected some seconds later.
Close https://github.com/TrinityCore/TrinityCore/issues/15005
2015-07-05 17:16:35 +02:00
jackpoz e5258f92c8 Core/Spells: Normalize Z for last point in a charge path
Normalize the new point that 124398feef adds to a charge path.
2015-07-05 11:49:05 +02:00
jackpoz 6681b3600c Core/Misc: Fix build warnings
Fix build warning reported by clang 3.6
2015-07-04 19:28:11 +02:00
Kaev f3246f65d1 Update BattlegroundWS.cpp
Changed timer check from 900000 to 15*MINUTE*IN_MILLISECONDS for better readability.
2015-07-04 09:53:49 +02:00
DDuarte be32beee57 Core/Executables: Add --version and -v to worldserver and authserver arguments
Closes #14993

(cherry picked from commit 0f082e8f925f17e585fd221b901f55581d2d68ab)

Conflicts:
	src/server/bnetserver/Main.cpp
2015-07-04 02:54:23 +01:00
DDuarte dfc71765f8 Core/ObjectMgr: Fix 3 -Wunused-private-field warnings in TempSummonGroupKey
Replace a memcmp by a lexicographical comparison with std::tie

(cherry picked from commit 1df20a2134dbb84d1eb30024171ccd7e8b103e47)
2015-07-04 01:50:35 +01:00
jackpoz 37b157746e Scripts/Commands: ".mmap path line" now uses raycast pathfinding
Add "line" optional parameter to ".mmap path" command to use raycast implementation of recast, useful to simulate charge paths.
2015-07-03 23:21:09 +02:00
jackpoz a328a11978 Core/Spells: Fix Charge "no path" error with huge targets
Fix Charge returning "no path found" error when targeting targets with Object Size of 8 like Festergut by changing how the target Z coordinate is set, using only half object size.
It is unclear why the CalculatePath() call in Charge handler is using target object size, maybe for corner cases where the target is slightly below the ground.
2015-07-03 23:16:34 +02:00
joschiwald 6680a7c331 Scripts/EoE: fixed crash
- removed some useless code (and some other random changes)
2015-07-03 21:01:29 +02:00
jackpoz 275bb93034 Scripts/EyeOfEternity: Fix crash added in d1853f693b
Close https://github.com/TrinityCore/TrinityCore/issues/14984#issuecomment-118044904
2015-07-02 22:08:19 +02:00
mik1893 94bb71e5a1 Merge pull request #14797 from czw/3.3.5
Core/Spells: Fix DK Death rune selection
2015-07-02 14:23:33 +02:00
ShinDarth 5178395a4f DB/World schema backport: split quest_template and quest_template_addon
Closes #14982

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2015-07-02 00:27:38 +01:00
jackpoz 55681666b3 Core/Misc: Fix build warnings 2015-07-01 20:57:20 +02:00
robinsch 2263cb9e10 Core/Unit: Fix issue with Divine Shield immunities
Closes #14910
2015-07-01 17:37:36 +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
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
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
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
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
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
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
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
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 83954fb999 Merge pull request #14860 from mik1893/violethold
Core/Scripts: Violet Hold, full rework
2015-06-25 14:45:13 +02:00
jackpoz cb4d1574e0 Core/Instances: Make achievements and loot rolls instance-wide
Make achievements, loot rolls, master loot at money loot instance-wide, removing the previous limit for 74.f yards
2015-06-24 22:40:57 +02:00
MitchesD 0cba5558cf Scripts/Spells: fix codestyle
thanks @whoami
2015-06-24 11:05:36 +02:00
mik1893 0bb7f89e82 Core/Scripts: Rework Violet Hold bosses adding missing spells/mechanics:
- Cyanigosa, Arcane Vacuum
- Ichoron, globules mechanic
- Moragg, optic link visuals
- Lavanthor, minor changes
- Zuramat, correctly implement void sentries
- Erekem, implement Windfury and correct management of Erekem Guards
- Script for the pre-event
Thx @ManuFe
2015-06-23 16:32:50 +02:00
Rushor 8f3a9b7fe3 Game/GameObject: Fix Spellcast for 'Silithyst'
by @Whoami
updates #14637
2015-06-23 15:28:51 +02:00