Commit Graph
11363 Commits
Author SHA1 Message Date
Vincent-Michael f89739dab5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-30 05:03:47 +02:00
joschiwald 831a6603d4 Core/Battleground/AV: convert trinity_strings to proper creature_text
Closes #12861
2014-08-30 03:34:35 +02:00
Duarte Duarte bcb2b2f6bf Merge pull request #12958 from Nyeriah/patch-ir
Core/Player: Implement a method to send out the Postmaster's item retrie...
2014-08-29 23:49:53 +01:00
Warpten 39e4a88352 Merge pull request #12926 from mik1893/LOSonTriggered
Core/Spell: Triggered spells now inherit LOS checking from their triggering spell
2014-08-30 00:27:11 +02:00
Duarte Duarte abc0380e7f Merge pull request #12953 from Golrag/master
Scripts/ICC: Fix Mutated Plague.

Closes #12492
2014-08-29 23:23:53 +01:00
Golrag 96ba36b9ce Scripts/ICC: Fix Mutated Plague. 2014-08-29 22:26:41 +02:00
Vincent-Michael 1dc8a219a3 scripts/Commands: Sync with 4.3.4 branch (meh nayd) 2014-08-29 21:40:07 +02:00
Vincent-Michael 06daf22e1e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/scripts/Commands/cs_guild.cpp
2014-08-29 21:18:23 +02:00
Shauren f5115328c5 Merge pull request #12970 from Golrag/marrowgar
Scripts/ICC: Fixed Impale (Lord Marrowgar)
2014-08-29 21:12:17 +02:00
Vincent-Michael e8d0de6778 Scripts/Commands: Added for guild info guild level output 2014-08-29 21:09:06 +02:00
Shauren 9597b1526c Core/NetworkIO: Fixed one source of UNKNOWN_OPCODE 2014-08-29 19:01:00 +02:00
Golrag 6658d41575 Scripts/ICC: Fixed Impale (Lord Marrowgar) 2014-08-29 19:00:11 +02:00
joschiwald 01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Duarte Duarte 88809359e7 Merge pull request #12967 from ShinDarth/PvPstats
Core/BG: use UInt64 instead of Int64 for UNSIGNED BIG INT field + clean
2014-08-29 16:20:03 +01:00
ShinDarth f3f6071797 Core/BG: prevent possible overflow + clean 2014-08-29 17:16:11 +02:00
Warpten 76943f738e Merge pull request #12963 from ShinDarth/PvPstats
Core/BG: use GetTypeID(true) instead of GetTypeID()
2014-08-29 15:34:56 +02:00
Duarte Duarte 743088d683 Merge pull request #12959 from Nyeriah/patch-qf
Core/Player: Already complete quests shouldn't turn failed
2014-08-29 14:09:13 +01:00
ShinDarth 1b7a9d5bfb Core/BG: use GetTypeID(true) instead of GetTypeID() to fetch the correct type even if it's a RGB 2014-08-29 13:33:12 +02:00
Nyeriah c0697c7726 Core/Player: Already complete quests shouldn't turn failed
Core/Player: Already complete quests shouldn't turn failed

Core/Player: Already complete quests shouldn't turn failed
2014-08-29 05:13:16 -03:00
Nyeriah 9f606f74a3 Core/Player: Implement a method to send out the Postmaster's item retrieval mails as it seems to be used in multiple places and also send disenchant roll result as a mail if the player's inventory is full 2014-08-29 02:53:30 -03:00
Vincent-Michael 9cb92f93aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp
2014-08-29 06:24:08 +02:00
Nyeriah cbad3b1cb8 Core/Player: Dungeon Finder quests don't follow the same rule as repeatable quests, they should award experience every time they're rewarded 2014-08-28 21:40:27 -03:00
Nyeriah 01f9acda10 Core/Players: Dungeon Finder quest rewards should be sent as a mail if the player's inventory happens to be full
Thanks @dr-j for the sniffed texts
2014-08-28 21:02:04 -03:00
Odyssey 8adde791d8 Scripts/Commands: Implement .guild info command
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-28 23:04:52 +01:00
DDuarte c14283d484 Scripts/Hodir: Initialize variables
==9458== 1 errors in context 1 of 1:
==9458== Conditional jump or move depends on uninitialised value(s)
==9458==    at 0x1D2857B: boss_hodir::boss_hodirAI::DamageTaken(Unit*, unsigned int&) (boss_hodir.cpp:367)
==9458==    by 0x14A41E9: Unit::DealDamage(Unit*, unsigned int, CleanDamage const*, DamageEffectType, SpellSchoolMask, SpellInfo const*, bool) (Unit.cpp:562)
==9458==    by 0x1ABCEB3: misc_commandscript::HandleDamageCommand(ChatHandler*, char const*) (cs_misc.cpp:2138)
2014-08-28 22:28:41 +01:00
jackpoz 04ddbc374a Core/Misc: Remove unneeded NULL checks 2014-08-28 23:07:04 +02:00
Unholychick 7c13b383cd Scripts/Ulduar: Implement Mimiron
Closes #12894
Fixes #7652
Fixes #4736

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-28 22:04:01 +01:00
jackpoz cb591634b4 Core/AuctionHouse: Merge last changes of PR #12917
Merge last changes of PR #12917 and fix a NULL dereference crash
2014-08-28 22:49:45 +02:00
Vincent-Michael fea1fdc854 Core: Fix build 2014-08-28 22:20:48 +02:00
Vincent-Michael 80d4647e78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-28 22:13:00 +02:00
Vincent-Michael 45f50ac81b Core: Fix warning 2014-08-28 22:08:11 +02:00
jackpoz 9cceb458d9 Merge branch 'Rochet2/ahbot' into master
Close pull request #12917
2014-08-28 22:01:58 +02:00
Vincent-Michael 3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
2014-08-28 21:00:53 +02:00
Vincent-Michael eccb0ed3da Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High" 2014-08-28 20:17:43 +02:00
DDuarte 86db959885 Core/BGs: Add overrides to GetAttrX methods 2014-08-28 16:10:13 +01:00
ShinDarth b65172910c Core/BattleGrounds: store data about BGs victories
Enable in worldserver.conf

Closes #12944

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-28 15:32:38 +01:00
Vincent-Michael a52135f276 Core: Remove whitespace 2014-08-27 23:22:16 +02:00
Vincent-Michael c0c708cf02 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Scripting/ScriptMgr.h
2014-08-27 23:06:40 +02:00
jackpoz 66f4b51d6f Core/RA: Workaround for telnet active mode
Add a workaround for telnet connections with active mode. A proper fix would require boost tcp::socket to support timeout on receive.
2014-08-27 22:10:07 +02:00
chadryx 983755a21d Added a new hook Called when a player's money is at limit 2014-08-27 19:01:41 +03:00
Duarte Duarte 8fbc00f26a Merge pull request #12668 from Rochet2/transmogcost
Fix free transmog exploit, fix possible crash
2014-08-27 15:34:20 +01:00
DDuarte 28381ef39e Revert "Server/PacketIO: Updated CMSG_TIME_SYNC_RESP for 434"
This reverts commit e9d0660b06.

<Shauren> int __thiscall PlayerTimeSyncResponse::CliPut(PlayerTimeSyncResponse *this, CDataStore *a2)
<Shauren> {
<Shauren>   PlayerTimeSyncResponse *v2; // esi@1
<Shauren>   v2 = this;
<Shauren>   CDataStore::PutInt32(a2, 15116);
<Shauren>   CDataStore::PutInt32(a2, v2->SyncCounter);
<Shauren>   return CDataStore::PutInt32(a2, v2->MS_Time);
<Shauren> }
<Shauren> v2->SyncCounter is the value from SMSG_TIME_SYNC_REQ and ms_time = OsGetAsyncTimeMs()
2014-08-26 21:40:17 +01:00
Vincent-Michael 741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
2014-08-26 19:21:22 +02:00
Duarte Duarte 10dfe19f9c Scripts/BladesEdge: Fix a typo introduced in 430b3ad
Thanks @Nihilianth
2014-08-26 15:10:58 +01:00
DDuarte 430b3adfe8 Scripts: Correct despawn time of multiple objects
WorldObject::SummonGameObject respawn time is in seconds and not milliseconds
2014-08-26 13:37:55 +01:00
Shocker 549ac332d5 Core/Maps: Don't use EnsureGridCreated_i() for base map in Map::LoadMap, use EnsureGridCreated() which is thread safe because although the LoadMap() call probably came from a thread safe EnsureGridCreated() call from the current map instance, multiple map instances can load grids for the same base map in the same time, and each of them has it's own mutex, therefore we should rely on the basemap's mutex 2014-08-26 14:19:19 +03:00
mik1893 1c56c41d60 Update comments for df744c7 2014-08-26 09:40:34 +02:00
joschiwald bc42c48d97 DB/Spells: added a few spells to spelldifficulty_dbc 2014-08-26 04:35:37 +02:00
AriDEV e9d0660b06 Server/PacketIO: Updated CMSG_TIME_SYNC_RESP for 434 2014-08-26 02:02:38 +02:00
jackpoz 4d9f8b926a Scripts/Commands: Change "few" commands to target current Player by default 2014-08-25 22:00:04 +02:00