Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
24,277 Commits 2 Branches 1 Tag
3a248fbfec34fe80170dfb8c50b971858fb1e488
Commit Graph
11328 Commits
Author SHA1 Message Date
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
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
jackpoz 10b7480e70 Merge branch 'trickerer/mulreflect' into master 
Close pull request #11288
 2014-08-25 19:59:19 +02:00
Vincent-Michael 3b31a847b9 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-25 17:20:12 +02:00
DDuarte 8b52a3ae51 Core/Arena: Replace hardcoded 1500 mmr value by config value when loading arena members 2014-08-25 14:25:09 +01:00
Duarte Duarte 70b70f9cda Merge pull request #12919 from MitchesD/misc_3 
Core/Channels: fixed possible exploit with channel password
 2014-08-25 00:52:30 +01:00
MitchesD 80cde8aa10 Core/Channels: fixed possible exploit with channel password 
You were able to setup longer password than you can write into the dialog window. Limit in dialog is 31 chars, in DB is varchar(32) but there was no limit in command /pass <channel> <password>, so that was the problem.
 2014-08-24 23:54:28 +02:00
Vincent-Michael 4bdedcb878 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2014-08-24 22:42:47 +02:00
Vincent-Michael 72b9b50bc7 Core/Unit: Fix some phasing change problems with vehicle 2014-08-24 22:09:10 +02:00
jackpoz 7fa49c8d62 Scripts/Ruby Sanctum: Fix Halion event ai not being updated 
Fix Halion event ai not being updated due to private member hiding base class member.
Fixes #12835
 2014-08-24 20:35:44 +02:00
Vincent-Michael 4a58341e6d Core: Fix warnings 2014-08-24 18:08:29 +02:00
Vincent-Michael 10e00f32fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-24 17:24:20 +02:00
jackpoz a3b14db015 Merge 'Numielle/master' into master 
This is a workaround required by the current spell system limitations.
Close pull request #11915 .
 2014-08-24 17:11:51 +02:00
Vincent-Michael 98e27a4f15 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/System.cpp
 2014-08-24 16:33:29 +02:00
jackpoz c20f92c08c Merge branch 'Rochet2/questreward' 
Close pull request #12657
 2014-08-24 14:38:55 +02:00
jackpoz 54d28af46d Merge branch 'PortgasDAce/1' into 4.3.4 
Close pull request #12731
 2014-08-24 14:04:54 +02:00
jackpoz 05d9dcd37f Merge branch 'Xanvia/ShoR' into 4.3.4 
Close pull request #9071
 2014-08-24 13:38:54 +02:00
Rochet2 9beae1dc97 Removed OnQuestComplete hook, use QuestReward instead. Implemented OnQuestStatusChange hook 
Also fixed some comments and added overrides
The OnQuestComplete hook was unused and didnt work properly
 2014-08-24 14:31:38 +03:00
Shauren 9ef63d7e8d Corrected initialization value in previous commit 2014-08-24 12:08:31 +02:00
Shauren c3e10f32da Core/NetworkIO: Fixed uninitialized fields in ByteBuffer for received packets 2014-08-24 11:22:18 +02:00
Vincent-Michael 79b954a349 Core: meh, remove again whitespace :( 2014-08-24 02:46:14 +02:00
Vincent-Michael 560048cf33 Core: meh, fix build and warnings 2014-08-24 02:22:14 +02:00
Vincent-Michael 547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
joschiwald 2a36d2bf5b Core/Conditions: allow CONDITION_OBJECT_ENTRY to check for object guid 
Ref #12910
 2014-08-24 00:10:09 +02:00
jackpoz 7d4801750b Core/Misc: Fix Mac OS X no-pch build 2014-08-23 19:56:42 +02:00
jackpoz 7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
DDuarte f5f9df0483 Core/Auctionhouse: Better fix for 809fb9894e 2014-08-23 16:30:45 +01:00
Vincent-Michael 4a29c73403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-23 16:41:54 +02:00
Duarte Duarte 1255434882 Merge pull request #12885 from mik1893/channel_pushback 
Core/Spells: Channeled spell pushback is now affected by haste

Closes #12879
 2014-08-23 14:16:22 +01:00
Aokromes 809fb9894e Core/Auctionhouse: Hide known recipes when the Usable box is checked in the AH 
By y1x2 @ cmangos

Closes #12247
 2014-08-23 14:05:43 +01:00
Duarte Duarte 6dec73f930 Merge pull request #12877 from ShinDarth/tc_fix_escort_quest_group_complete 
Core/SmartScripts: fix escort quest group-complete
 2014-08-23 14:01:19 +01:00
Duarte Duarte 6d09fed309 Merge pull request #12893 from Ascathor/master 
Core/Quest: Allow money reward to be modified.
 2014-08-23 13:56:01 +01:00
Rochet2 54936caab6 Fix free transmog exploit, fix possible crash 2014-08-22 23:20:50 +03:00
Shauren b90329d63a Core/Battle.net: Use real account name from account table to auth instead of always constructing bnetId#index. Fixes having to reconfigure addons by players. 
*NEW* battle.net only accounts should be created with battlenet_account_id#account_index format in username
 2014-08-22 20:09:18 +02:00
Shauren f2cb506161 Core/NetworkIO: Removed MSG_VERIFY_CONNECTIVITY as an opcode 2014-08-22 20:06:24 +02:00