Commit Graph
17529 Commits
Author SHA1 Message Date
Shauren 869bc4e0f7 Buildsystem/Genrev: Fixed revision generator not reading existing cmake cache variables 2015-02-24 18:51:46 +01:00
joschiwald 61ba5e4f34 Core/Achievements: pick more changes from 4.3.4/6.x branch, required after abee9046a6 2015-02-23 01:22:41 +01:00
Duarte Duarte 2fe8885463 Core/Spells: Fix a float division issue in EffectLeapBack
Ref Coverity CID 1227511

(cherry picked from commit 709275eecbbe073cd9b9170debfcef476ef66a6c)

Conflicts:
	src/server/game/Spells/SpellEffects.cpp
2015-02-22 06:10:16 +00:00
Duarte Duarte 958999ff5c Core/Server: Catch exceptions in int main()
The exceptions is rethrown on debug mode.

Ref Coverity CID 1010213, 1022574, 1227501, 1227502,
1227503, 1227504, 1227505, 1254536 and 1254612

(cherry picked from commit e68ca82d4d039a401d03de145111b0a738bb9dd7)

Conflicts:
	src/server/bnetserver/Main.cpp
2015-02-22 06:09:01 +00:00
Duarte Duarte a6505dd46a Merge pull request #14103 from Epicurus4/6.x
Added a player searcher
(cherry picked from commit b7052d2ed735dca233b91c32f762b4156543aa97)
2015-02-22 05:51:26 +00:00
click cffef1e80d Core/Log: Move a few PetHandler INFO-notifications over to DEBUG-level 2015-02-22 01:28:47 +01:00
click 8c8ca2ab8d Core/Log: Change periodic spell notificiations to DEBUG-level and set it as a unique logging-mechanism named "spell.periodic" 2015-02-22 01:20:26 +01:00
joschiwald abee9046a6 Core/Achievements: check db criteria data for all achievements 2015-02-21 21:24:10 +01:00
click 4999864c4a Core/Logs: Throw a little more sensible textoutput when missing maps/vmaps (the old text was a tad confusing mixing maps and vmaps etc). 2015-02-21 20:27:05 +01:00
jackpoz b89f3be8d5 Core/Config: Force SaveRespawnTimeImmediately config to Enabled
Force SaveRespawnTimeImmediately config to Enabled to avoid assertions triggered at runtime when Disabled. It will be possible to Disable this config again only when all issues will be fixed.
2015-02-20 22:44:04 +01:00
MitchesD c5a29004f3 Core/Movement: Clarify log meaning
(cherry picked from commit 6ff1764084d9234f35609a227567875cd95561a1)
2015-02-20 14:35:24 +01:00
MitchesD f6656d7536 Merge pull request #14117 from Rushor/Zuramat
Scripts/Violet Hold: Zuramat the Obliterator - Improve Summonbehaviour of Void Sentry
2015-02-20 13:55:18 +01:00
Rushor f06b77dcb3 Scripts/Violet Hold: Zuramat the Obliterator - Improve Summonbehaviour of Void Sentry
closes #12175
2015-02-18 20:25:30 +01:00
MitchesD 3bb0abcd52 Merge pull request #14111 from Rushor/Volkhan
Scripts/HallsOfLightning: Boss Volkhan - Add OOC Forgecast
2015-02-18 20:12:07 +01:00
MitchesD 2a405b94e7 Merge pull request #14053 from Rushor/Melli
Scripts/Arcatraz: Warden Mellichar - Set summoned Units in Combat
2015-02-18 18:12:12 +01:00
jackpoz dcb500388c Core/LFG: Fix assertion triggered
Fix assertion triggered since 9582b32d22
2015-02-17 19:51:55 +01:00
Nyeriah 85105ac87b Scripts/BlackTemple: Shade of Akama
* Updated to BossAI
* Solved issue with door not closing when event starts
* Solved issue with gossip flag being reset after event is done
* Misc code clean ups

Updates #10430
2015-02-17 15:35:53 -02:00
Rushor cfc5fb29b6 DB/Misc: Fix a few startup errors from recent Updates 2015-02-15 23:11:33 +01:00
Aokromes 8fbfe677db Merge pull request #14156 from Rushor/robot
Scripts/The Barrens: Add missing Text for Q: 'The Escape'
2015-02-15 14:34:40 +01:00
jackpoz 9582b32d22 Core/LFG: Fix LFG issue when player was teleporting
Fix a LFG issue that would kick a player out of a just-formed LFG party if player was being teleported.
Fix a log warning "Player: GUID Full: 0x0000000000000001 Type: Player Low: 1 not ingame while retrieving his LockedDungeons" if player was being teleported.

Refers to #14039 , #10191
2015-02-15 14:22:01 +01:00
Rushor 8904a94856 Scripts/The Barrens: Add missing Text for 'The Escape'
closes #12259
2015-02-15 14:17:56 +01:00
MitchesD 89a7026898 Merge pull request #13989 from Rushor/Leaves
Scripts/Areatrigger: Assign Script to 'Ancient Leaves' Trigger
2015-02-15 12:21:35 +01:00
Dr-J 77bed4c4bb Remove CPP script for Blueleaf tubers 2015-02-14 20:13:32 +00:00
jackpoz 2eee1b349f Core/AHBot: Fix AHBot bidding and correct logged AH type
Correct AuctionHouseType definition to log the right AH type.
Handle auctions without bidder but with a bid as bought by the AH Bot
Closes #14124
2015-02-13 23:39:58 +01:00
joschiwald 2478bbcdb8 Merge pull request #14144 from Rushor/ZulAman
Scripts/ZulAman: Enable Script for Gazakroth
2015-02-13 22:37:30 +01:00
Rushor ca60ae6d19 Scripts/ZulAman: Enable Script for Gazakroth
*removes one more startuperror from #13707
2015-02-13 22:22:22 +01:00
joschiwald 6dfc35d13c Scripts/FoS: improved bronjahm encounter, thanks @Grimton1337, @tkrokli
Closes #14130
2015-02-13 21:15:30 +01:00
Aokromes e9263d9f71 Merge pull request #14138 from Rushor/mulgore
Scripts/Kalimdor: Remove Mulgorescripts
2015-02-13 14:06:48 +01:00
Rushor 87f40a5ad3 Scripts/Kalimdor: Remove Mulgorescripts 2015-02-13 14:04:19 +01:00
Aokromes c21a600478 Delete zone_mulgore.cpp 2015-02-13 13:54:45 +01:00
Nyeriah 69d016d0fe Scripts/ForgeOfSouls: Fix an indentation issue on Bronham's script 2015-02-13 03:28:44 -02:00
Aokromes 11f41d9461 Merge pull request #14129 from Rushor/Ghost
Scripts/Mulgore: The Plains Vision - Move Corescript to SAI
2015-02-13 03:01:23 +01:00
Rushor adfd8a6172 Scripts/Mulgore: The Plains Vision - Move Corescrript to SAI 2015-02-12 23:42:43 +01:00
jackpoz 62001360dd Shared/Database: Improve dead-lock error handling
Improve dead-lock error handling by making sure only 1 thread at time retries to execute a transaction so they don't keep dead-locking each other.
2015-02-12 22:48:57 +01:00
Rushor 9eea348d82 Scripts/Areatrigger: Assign Script to 'Ancient Leaves' Trigger 2015-02-12 00:05:15 +01:00
Rushor dc87cc69a1 Scripts/HallsOfLightning: Boss Volkhan - Add OOC Forgecast
closes #14066
2015-02-11 21:45:36 +01:00
Duarte Duarte a3bc75b7b9 Merge pull request #14098 from ariel-/arenacd
Arena Spells Reset Cooldown micro correction
2015-02-11 18:40:03 +00:00
Sarah Alexander 15718b639f Merge pull request #14080 from Rushor/Action
Scripts/Redridge Mountains: Corporal Keeshan - Complete Escortquest for all Groupmember
2015-02-11 13:43:51 -02:00
Duarte Duarte f961c06612 Merge pull request #14106 from Noeliel/3.3.5
Scripts/ScarletEnclave: Add missing WorldObject parameter for Talk() ove...
2015-02-11 15:18:28 +00:00
Duarte Duarte 1d627ca1ea Merge pull request #13963 from tkrokli/3.3.5
Fix Cooldown for Raise Dead (Ghoul)
2015-02-11 15:17:01 +00:00
Noeliel 80d9524b1c Scripts/ScarletEnclave: Add missing WorldObject parameter for Talk() overload (player race contained in some spoken texts) 2015-02-11 16:16:20 +01:00
arks f0e4f64417 Arena shouldn't reset 10 min or longer CDs
Closes #13449
2015-02-10 15:06:18 -03:00
Rushor c86761ccd6 Scripts/Redridge Mountains: Corporal Keeshan - Complete Escortquest for all Groupmember
closes #13711
2015-02-09 12:24:17 +01:00
Nyeriah 1e3247f00e Scripts/SunwellPlateau: Fix a typo that caused M'uru's phase transition to fail on some rare cases 2015-02-08 03:42:53 -02:00
jackpoz b69fd4ac68 Merge PR #14059 from 'Rochet2/ahbot_buyer' into 3.3.5 2015-02-07 21:32:17 +01:00
Rochet2 d4dac7e161 Fix AHBot Buyer buyin, bidding and enhance logic 2015-02-07 15:43:18 +02:00
Rushor 1e90b096ca Scripts/Arcatraz: Warden Mellichar - Set summoned Units in Combat 2015-02-06 22:28:12 +01:00
Trond B Krokli 073c14eb4e Fix Cooldown for Raise Dead (Ghoul)
@joschiwald: Fix written on 31 Jan 2014.
@Nyeriah: suggested null pointer check.
@ariel-: supplied code for null pointer check.
@ccrs: supplied code (cat && spellInfo->CategoryRecoveryTime) to replace (cat && catRec)
@Dduarte: cleanup of bad edit based on my misinterpretation

Fixes issue #11538
Replaces #13941 and #13924
2015-02-06 17:42:22 +01:00
Nayd c66bd709f1 Fix build 2015-02-04 19:44:34 +00:00
jackpoz d4db0c15c7 Shared/Database: Fix transactions not being recommitted on dead-lock error
Fix transactions not being recommitted on dead-lock error (error code 1213) because of calling http://dev.mysql.com/doc/refman/5.0/en/mysql-errno.html after sending the ROLLBACK command. This way the returned error code was related to the ROLLBACK command, not the failed transaction.
2015-02-04 19:42:39 +01:00