Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,088 Commits 4 Branches 146 Tags
8722164d377ebf8bbf5253decb782390e7684d96
Commit Graph

17516 Commits

Author SHA1 Message Date
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
Duarte Duarte
8b50c142cb Merge pull request #14007 from Rushor/AOESpells 
Game/Spells: 'AoD Specials' should only target one Unit
 2015-02-02 19:40:24 +00:00
Nayd
81ea9f5aa0 Core/Build: Use std namespace in getline calls 
(cherry picked from commit 86f7f47b58)
 2015-02-02 01:58:01 +00:00
jackpoz
2ec6844666 Core/Misc: Fix static analysis issues 
Fix some static analysis issues reported by Coverity

(cherry picked from commit c899944981)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
 2015-02-02 01:47:59 +00:00
jackpoz
7b05b0cb81 Core/Misc: Fix static analysis issues 
Fix some static analysis issues reported by Coverity

(cherry picked from commit 89c535cf2a)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2015-02-02 01:45:38 +00:00
click
13cbed36ef Core/Scripts: Fix missing include 2015-02-01 23:31:34 +01:00
Rushor
b01e638126 Game/Spells: AoD Specials should only target one Unit 2015-02-01 23:09:35 +01:00
Duarte Duarte
e9eba6e81f Merge pull request #14002 from Rushor/Webbs 
Scripts/Bloodmyst Isle: Disable CreatureAttack for NPC: Webbed Creature
 2015-02-01 00:14:08 +00:00
Rushor
644de8700c Scripts/Bloodmyst Isle: Disable CreatureAttack for NPC: Webbed Creature 2015-01-31 23:24:35 +01:00
jackpoz
4c0476bfd7 Core/Misc: Properly sanitize ReputationSpillover data 
Fix an issue added in 024b57bb74 that didn't properly skip ReputationSpillover rows with invalid data.
Fix also a static analysis issue reported by Coverity.

(cherry picked from commit 95b1204798)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2015-01-31 22:24:12 +00:00
jackpoz
7870ca8fdc Core/VMaps: Fix debug assert caused by invalid vmaps 
Fix debug assert thrown by G3D caused by models with empty bounding box being exported by vmap4assembler and imported by worldserver. This change will skip those models, proper investigation on the issue of why the bounding box is empty is still required.

(cherry picked from commit a7ca78b2fe)
 2015-01-31 22:21:53 +00:00
Shauren
a46d201723 Core/Spells: Renamed SPELL_ATTR4_TRIGGERED to SPELL_ATTR4_CAN_CAST_WHILE_CASTING and adjusted trigger flags accordingly 
(cherry picked from commit 6d70acbbd6)

Conflicts:
	src/server/game/Spells/Spell.cpp
 2015-01-31 20:16:21 +00:00
Shauren
9ee820d83d Core/Players: Fixed loading and saving skill data PK violations 
(cherry picked from commit 2dfd1594cd)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2015-01-31 20:14:15 +00:00
Nayd
c87de730fa Core/Quests: Fixed WPE exploit that allowed to accept any quest 
(cherry picked from commit 6b10271891)
 2015-01-31 20:12:57 +00:00