Commit Graph

13606 Commits

Author SHA1 Message Date
MitchesD 63f253e95c Merge pull request #15697 from ShinDarth/cd
Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
2015-11-07 00:35:24 +01:00
Shauren 8ceffaef44 Merge pull request #15646 from ShinDarth/ticket
Core/Player: implement ResetCoolDownAfterDuel configurable feature
(cherry picked from commit 5b8f1469ca)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
2015-11-07 00:15:00 +01:00
Naios ed20680f92 Merge pull request #15711 from ShinDarth/bg-leave
Core/BG: Improved Battleground.InvitationType = 2
(cherry picked from commit 5a71eb7384)
2015-11-06 23:51:10 +01:00
Naios 441be76050 Merge pull request #15676 from ShinDarth/bg2
Core/Battlegrounds: implement even BG teams configuration
(cherry picked from commit f179c4180f)
2015-11-06 23:46:53 +01:00
pete318 39d29edf93 Merge pull request #15707 from ShinDarth/pvpstats
Core/BG fix .character changefaction pvpstats victories amount
(cherry picked from commit 69941864ef)

Conflicts:
	sql/base/characters_database.sql
	src/server/game/Battlegrounds/Battleground.cpp
2015-11-06 23:46:03 +01:00
Shauren ec1583df67 Core/Corpses: Fixed a possible crash adding bones to grid
Closes #15808
2015-11-06 21:30:08 +01:00
duhow 28bdb50d80 Scripts/Commands: Add taxinodes cheat status to
* Some cleanup

Closes #15065

(cherry picked from commit 558ce7d877)

Conflicts:
	src/server/scripts/Commands/cs_cheat.cpp
2015-11-06 20:17:38 +01:00
Killyana 286f0ea6f3 Scripts/ICC: moved saurfang gossips to db
Closes #14904

(cherry picked from commit 7225b7abf1)
2015-11-06 13:17:54 +01:00
CreshandKesh 143d00a242 Core/Scripts: Salanar the Horseman, Into the Realm of Shadows
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected

Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.

Closes #15603
Closes #15657

(cherry picked from commit 359df54b79)
2015-11-06 13:14:05 +01:00
Incorrect b022724458 Core/Misc: Remove unneeded files
These 3 BlackRock Mountain scripts can be removed from source:

- boss_anubshiah.cpp
- boss_gorosh_the_dervish.cpp
- boss_grizzle.cpp

They already removed from the creatures in DB, and are currently causing
DBErrors.

(cherry picked from commit d98037a75d)
2015-11-06 13:00:21 +01:00
Shauren 710d9c0ecc Core/Players: Fixed saving players with incorrect gender
(cherry picked from commit 6c53f820ae)
2015-11-06 12:55:18 +01:00
Kittnz 24bad7fd20 Core/Player: Set correct Gender by Modelid
An example: You are a blood elf female, you use [Iron Boot Flask], you turn into a male dwarf, you use  [Orb of the Sin'dorei] and it will turn you into a blood elf male. This is the correct behavior like retail.
(cherry picked from commit 3c82b498cc)
(cherry picked from commit 16f9d4ceeb)
2015-11-06 12:52:41 +01:00
MitchesD dd58e56f84 Core/Player: Fix not being able to do seasonal quests(if already done in the past)
(cherry picked from commit 1ef1d42d14)
(cherry picked from commit 56b27711a4)
2015-11-06 12:35:21 +01:00
ShinDarth 040b098aef Scripts/Commands: enhanced .instance get/setbossstate commands
(cherry picked from commit 1ffec02d76)

# Conflicts:
#	src/server/game/Instances/InstanceScript.cpp
#	src/server/scripts/Commands/cs_instance.cpp
2015-11-06 11:56:13 +01:00
joschiwald c4f64c6d9c Scripts/BWL: cleanup instancescript
(cherry picked from commit 05429b3593)

# Conflicts:
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
2015-11-06 11:48:53 +01:00
MitchesD 81ce5acb34 Core/Scripts: fix build after recent cherry picks 2015-11-06 11:28:35 +01:00
sirikfoll d4b3b1d1d2 DB/CORE Minor change in quest Kick, What Kick? and some codestyle
Remove the line that despawns the 'Apple' npc, this despawn is non-blizzlike and breaks the quest.
Thx Killyana for sql and valuable information

Closes #15480

(cherry picked from commit 22f1d26986)
2015-11-06 11:11:16 +01:00
treeston 6d14c4871f Scripts/Naxxramas: Anub'rekhan encounter cleanup.
- Cleaned up events behavior to use phases instead of weird checks for auras.
- Cleaned up Crypt Guard despawn behavior, they should no longer despawn instantly upon death.
- Moved initial greeting from MoveInLineOfSight hack to proper areatrigger script.
- Fixed Crypt Guard respawn behaviour to prevent pulling them before Anub'rekhan has fully reset.
- Fixed Crypt Guard aggro behaviour to call for help on aggro. This prevents pulling the initial pair of Crypt Guards without engaging the boss.
- Added missing boss emotes.
- Code style cleanup.

(cherry picked from commit 91de0322bb)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
2015-11-06 11:07:31 +01:00
treeston b6ac8c577c Scripts/Naxxramas: Faerlina cleanup:
- Move greeting to areatrigger instead of MoveInLineOfSight hack
- Clean up add spawn handling to prevent various glitching with combinations of evade state and add aggro
- Ensure all adds are always pulled alongside the boss and vice versa
- Add missing texts.
- Fix a bug in the core that prevents castable-while-dead spells (such as Widow's Embrace) from appearing on possess bars.

(cherry picked from commit 577fcf356e)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
2015-11-06 10:59:34 +01:00
jackpoz 5f5ac9630c Scripts/Naxxramax: Fix clang warning
(cherry picked from commit da0671f4fe)
2015-11-06 10:56:27 +01:00
Rushor 9483bd9180 Scripts/IcecrownCitadel: Quest 'Blood Quickening' - Add Killcredit in 25ManRaid
closes #15733

(cherry picked from commit c5641a9a58)
2015-11-06 10:35:29 +01:00
treeston a37e6e20c8 Scripts/Naxxramas: Loatheb follow-up:
- Fix Deathbloom (for real this time)

(cherry picked from commit 17fdb1e091)
2015-11-06 09:54:40 +01:00
Shauren 49543a5174 Core/Accounts: Unified game account ban checks with 3.3.5 branch 2015-11-05 21:24:42 +01:00
Naios 30c421bf57 Core/ScriptMgr: Improve commit 155a289f05 2015-11-04 21:46:26 +01:00
Naios 155a289f05 Core/ScriptMgr: Fix "conditional expression is constant" warning.
* introduced in commit 12d1993994
2015-11-04 21:16:39 +01:00
Naios b7b49fe35f Core/Globals: Use std::string rather than char* to pass script names around. 2015-11-04 20:52:13 +01:00
Naios 12d1993994 Core/ScriptMgr: Replace IsDatabaseBound() methods through traits. 2015-11-04 20:51:56 +01:00
Shauren 5695969725 Core/Commands: Added assertion checking if command name is not null 2015-11-03 20:02:47 +01:00
Shauren c463c84325 Core/Auth: Added missing lock country check to AuthSession handler 2015-11-02 20:23:39 +01:00
Naios 6fa4588191 Core/AI: Cleanup in CreatureAISelector 2015-11-01 14:33:37 +01:00
Naios 0b6f784591 Core/AI: Convert the hardcoded variadic RAND functions into one C++11 variadic template version. 2015-11-01 14:33:31 +01:00
joschiwald 92b08fc74b Scripts/VioletHold: rewrote the whole instance
thanks @MitchesD for help

(cherry picked from commit df21162fe4)
(cherry picked from commit 3a4f54197c)
(cherry picked from commit f50df72820)
(cherry picked from commit 95bae7143f)
(cherry picked from commit 5406f82044)
2015-11-01 13:09:30 +01:00
jackpoz 7b684e8813 Script/Commands: Add new "debug loadcells" command
Closes #15292

(cherry picked from commit 5e1722c2f4)
2015-11-01 12:30:45 +01:00
jackpoz ee5eb215e9 Scripts/Commands: Change few commands to target current Player by default
(cherry picked from commit d1efb90ae8)
2015-11-01 12:00:48 +01:00
jackpoz e0ccbede07 Core/NetworkIO: Adjust more packet throttling values
Adjust more packet throttling values by increasing some limits, this might fix some random kicks.
Close #14659

(cherry picked from commit 5bd7c295c0)
2015-11-01 10:52:17 +01:00
Vincent-Michael 23bb45bfe9 Core/Misc: Fix issues reported by static analysis
Coverity defect IDs: 1296295, 1296294

(cherry picked from commit 5745c880fd)
2015-11-01 10:44:39 +01:00
Shauren 5da3079471 Build fix 2015-11-01 00:43:56 +01:00
Kittnz 2cd545849c Scripts/Uldaman: Fix build & fix some movement suggested by josch
(cherry picked from commit cf286ea9cd)
2015-11-01 00:31:18 +01:00
Kittnz c094e49e74 Scripts/Uldaman: Instance update
- Fixup Boss Ironaya
- Add the freeze animation for minions and archaedas
- Fix attack target for minions who wake up

(cherry picked from commit 9cb4cb52d8)
2015-11-01 00:31:00 +01:00
w1sht0l1v3 ec567f1c41 Core/LFG: Move code to a better place.
(the case where the last player left inside a dungeon would not be removed from lfg&group when he ports outside)

(cherry picked from commit 837a0a7524)
2015-11-01 00:30:42 +01:00
w1sht0l1v3 43cf01d510 Core/LFG: Fix crash in ".lfg group <playername>" in case of offline player and
extend the output to display the offline members of the group also.Atm if members are offline no info is displayed.

Note: all the new code is mostly copy/paste from ".group list <playername>" command.
(cherry picked from commit 4e0dec7fd2)
2015-11-01 00:29:31 +01:00
Kittnz e4d0652e7f Core/Script: Make 2 remaining bridge parts active in Serpent Shrine
(cherry picked from commit 6e1113a810)
2015-10-31 18:12:59 +01:00
Shauren d8391f23b1 Build fix after cherry-picks 2015-10-31 00:05:09 +01:00
Shauren 7f09392ccc Warning fix 2015-10-30 20:18:09 +01:00
Shauren d72293bdf7 Core/Corpses: Fixed a crash happening when a corpse is added to a grid that was not yet fully loaded
Closes #15684

(cherry picked from commit 8c9ea7782a)
2015-10-30 18:05:35 +01:00
Shauren b96bb15042 Core/Corpses: Prevent deleting corpses by ObjectGridUnloader, fixes accessing freed memory in multiple places due to the corpse still being registered in Map containers
Closes #15775
Closes #15781

(cherry picked from commit a94bdd00a9)
2015-10-30 18:05:26 +01:00
Shauren 60370d0c03 Core/Corpses: Fixed map crash happening during map unload when there are corpses inside
(cherry picked from commit 1d17475791)
2015-10-30 18:04:58 +01:00
MitchesD 26d362febc Revert "DB/NPC: Stable Masters" Please in the future mark 335 only commits with *_335 in the end of SQL file, if it has any.
This reverts commit 18f511431a.
2015-10-30 14:46:14 +01:00
Killyana 18f511431a DB/NPC: Stable Masters
Closes #15505

(cherry picked from commit a513abc02c)

# Conflicts:
#	src/server/scripts/World/npcs_special.cpp
2015-10-30 14:34:46 +01:00
joschiwald b459b10b0f Core/Scripts: fixed startup errors
Closes #14730

(cherry picked from commit 497aa4425b)

# Conflicts:
#	src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
2015-10-30 14:01:26 +01:00