Spp
b9b57c2d62
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Chat/ChatLink.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/scripts/EasternKingdoms/hinterlands.cpp
2012-11-22 15:04:59 +01:00
Spp
32c259b1ce
Core/Channels: Remove unnecessary calls to FindPlayer wherever is possible
...
- Add better opcode debug messages
- Move isValidChatMessage debug messages to trace
2012-11-22 12:11:35 +01:00
Tuxity
7416ada4f7
DB/Misc: Fix typo in previous SQL file
2012-11-22 10:05:14 +01:00
Tuxity
2f1000a9ed
Core/Arenas: Drop old .modify arenapoint command, create a new command to add currency to players.
2012-11-22 01:39:54 +01:00
Tuxity
3d314acda8
Core/Spells: Fix Soulshards creation, remove old code of glyph of Drain Soul. Closes #8341
2012-11-22 01:20:02 +01:00
Spp
d3c902915b
Core/Dungeon Finder: Properly update Lfg Status (shouldn't lose 'eye' when changing maps or reconnect after disconnection)
...
- Also fixes removing Player data when it shouldn't... should solve some problems with players not getting reward in some cases
2012-11-21 19:56:48 +01:00
Kevin Darcel
17304baf61
Merge pull request #8389 from horn/calendar
...
Core/Calendar: Fix typos
2012-11-21 09:33:42 -08:00
Kevin Darcel
2cf2df73de
Merge pull request #8388 from horn/434_calendar
...
Core/Calendar: Update calendar to 4.3.4 and enable calendar related opcodes
2012-11-21 09:30:39 -08:00
Tuxity
f5a54f8cbe
Misc: Whitespace and tabs cleanup
2012-11-21 18:26:28 +01:00
cyberbrest
f205bc9b4f
Core/Currency: Add support of Conquest points cap for arena and bg
...
Remove obselete code for arena points distribution
Thanks to @Zakamurite
2012-11-21 18:25:23 +01:00
horn
e5681fe904
Core/Calendar: Update calendar to 4.3.4 and enable calendar related opcodes
2012-11-21 18:01:55 +01:00
horn
fa7bfbc8d0
Core/Calendar: Fix typos
2012-11-21 17:57:09 +01:00
Subv
31f6612baa
Merge pull request #8384 from Amit86/toc_fix_typo
...
Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE
2012-11-21 05:18:59 -08:00
Pitcrawler
94997a508d
DB/SAI: Cleansing Drak'Tharon
...
Closes #8317
2012-11-21 12:41:28 +01:00
Spp
1d7adbfc7f
Core/AI: Fix crash in SmartScript
...
Closes 8340
2012-11-21 12:36:00 +01:00
Amit 86
b0b3c9ffbe
Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE
2012-11-21 09:31:53 +02:00
Subv
17071df235
Merge pull request #8383 from blipi/lfg_fixes
...
Core/Dungeon Finder: Properly save old state for LfgPlayerData
2012-11-20 19:35:45 -08:00
Blipi
ae507e5cc6
Core/Dungeon Finder: Properly save old state for LfgPlayerData
2012-11-21 04:31:21 +01:00
Subv
a17d44bcc2
Merge pull request #8381 from blipi/lfg_fixes
...
Core/Dungeon Finder: Old state should be saved, not the new one
2012-11-20 19:19:30 -08:00
Blipi
441712fbba
Core/Dungeon Finder: Old state should be saved, not the new one
2012-11-21 04:11:58 +01:00
Vincent-Michael
84d88cbcec
Core: Fix warnings
2012-11-21 00:43:24 +01:00
Vincent-Michael
695836cb01
Core: Fix non pch build
2012-11-21 00:15:58 +01:00
ZxBiohazardZx
8bd462b6d1
Core/scritps: change enum to fix compile
2012-11-20 23:20:14 +01:00
ZxBiohazardZx
78c873c1d3
Commit/Naming: update filename from automerge
2012-11-20 22:56:07 +01:00
ZxBiohazardZx
074b2e3936
Merge pull request #8371 from Gacko/creaturetext
...
Core/DB: Some script to creature text conversions...
2012-11-20 13:53:55 -08:00
Gacko
9f360cc81c
DB: Correct mistake in horseman conversion
2012-11-20 22:04:31 +01:00
Gacko
1e5e7056dc
Core/DB: Converted 7 more scripts to creature text
2012-11-20 22:03:10 +01:00
Spp
cd2b79f8d4
Fix compile under windows
2012-11-20 20:45:10 +01:00
Spp
08b7439f48
Typo Fix after 81606e5 (Thanks to vlad852 for noticing)
2012-11-20 19:02:58 +01:00
Gacko
9dc06f8bd9
Core/DB: Some script to creature text conversions...
2012-11-20 18:08:18 +01:00
Spp
1ecc55272e
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/GameObjectAI.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
2012-11-20 16:01:31 +01:00
Spp
7bef4ce401
Core/Misc: Reduce header dependencies - Step III
2012-11-20 15:03:56 +01:00
Shauren
70d44f97dc
Core/ObjectMgr: Fixed crash on shutdown
...
Closes #8362
2012-11-20 12:48:00 +01:00
Spp
b5c9ab8802
Core/Misc: Reduction of header dependencies - Step II
2012-11-20 12:30:30 +01:00
Tuxity
172c5f0b93
Core/Arenas: Fix arena system, you can now enter in arenas and fight !
...
Countdown in preparation time are also displayed
EnnemyUnitFrame while fighting works too
N.B: There might be some little typos to fix.
2012-11-20 10:37:25 +01:00
Spp
81606e5d1e
Core/Misc: Define some methods const
2012-11-20 09:29:52 +01:00
MrSmite
ced723a53a
Core/Pets: Pet "at rest" distance from owner is now closer as it should be
...
Original PR modified
Closes #8358
Closes #8181
Signed-off-by: Nay <dnpd.dd@gmail.com >
2012-11-19 23:55:42 +00:00
Nay
12c9d0d466
Merge pull request #8359 from Warpten/calendarRo
...
Core/Calendar: Minor change.
2012-11-19 13:59:56 -08:00
horn
4a86b83cb6
Core/Calendar: Minor change.
2012-11-19 22:28:53 +01:00
ZxBiohazardZx
7c6c24fce8
DB/commit: darn incremental number fail 2nd time today
2012-11-19 22:11:39 +01:00
Krogonos
1954486855
DB/Misc: Ysera@Emerald Dragonshrine should lay down and ground work on Bloodmoon Isle
...
Closes #8305
2012-11-19 21:51:25 +01:00
ZxBiohazardZx
e5c047c90d
DB/Misc: some cleanups
2012-11-19 21:40:45 +01:00
ZxBiohazardZx
731d30664f
Commit: change SQL name to match indexing
2012-11-19 21:20:56 +01:00
Vincent_Michael
37f2060f4c
DB/Event: Pilgrims Bounty support, thanks to Vincent Michael
2012-11-19 21:11:39 +01:00
ZxBiohazardZx
dc5fac23dd
db/commit: NULL is a bad param, fixed
2012-11-19 21:06:50 +01:00
ZxBiohazardZx
7a30ffe68e
commitfix: add newline to prevent possible issues with next file
2012-11-19 20:46:51 +01:00
ZxBiohazardZx
cdec49fc85
DB/misc:
...
NPC Jezelle Pruitt Closes #856
Standards and Practices Closes #1539
An Improper Burial Closes #1977
Postponing the Inevitable Closes #2350
Rune of Dawn Closes #2782
No Rest For The Wicked Closes #4013
Gregory Tabor Closes #4350
Anatoly Will Talk Closes #4551
Pilgrim's Bounty Closes #5025
The Fallen Sisters Bugged again Closes #5419
The Lost Spirits Closes #5647
Feedin' Da Goolz Closes #5679
The One That Got Away Closes #5764
Find the Ancient Hero Closes #5785
Shattrath Daily Quests missing ExclusiveGroup Closes #5821
Nether Drake Egg Closes #6284
Quest - 28056 Closes #6627
Before the Gate of Horror Closes #5760
Quest Audio - 12593 Closes #6632
Souls of the Decursed Closes #6724
Norgannon's Shell (12872,12928) Closes #7837
Windcaller Yessendra (15498),Warden Haro (15499),Keyl Swiftclaw (15500),Mokvar (16012) & Deliana (16013) quests Closes #7907
Attunement to the Core (7487,7848) Closes #7908
spawn location in OG near Rogg (37072) Closes #8021
Missing Fires for Hallow End Q Closes #8086
Wickerman Festival NPC & GO's Closes #8133
Hallow's End Pumpkin Treat & Tricky Treat time fix Closes #8244
Exhausted Vrykul - not responding after using discipline stick on him Closes #8288
2012-11-19 20:35:20 +01:00
Vincent-Michael
7aa967e966
Scripts/AQ: Fix warnings (thx razhael)
2012-11-19 16:24:59 +01:00
Spp
fff684ec78
Remove duplicate code after some old merge
2012-11-19 12:03:45 +01:00
Spp
bf8b642a47
Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4)
2012-11-19 12:02:33 +01:00
