Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,253 Commits 4 Branches 146 Tags
8fbc00f26a428ee05762ecb2bfc99e290a56d65c
Commit Graph

24253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shauren
febb26d4b7 Core/Deps: MySQL sources out. 
Windows users are now required to download and install mysql server with headers and libraries
 2014-08-26 18:45:54 +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
Dr-J
dbfc52f6a2 DB/SAI: Some corrections 
Wiki said despawn time for gobjects spawned using smart action 50 was in ms, which was wrong its actually in seconds,
 2014-08-26 13:04:24 +01:00
Aokromes
f5d486bee2 DB/Fishing: Add fishing level to Undercity 
By AriDEV, closes #12929
 2014-08-26 13:22:33 +02: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
Dr-J
4bec4025c4 DB/SAI: Kill SAI Errors 
NPCS in Sunken temple do not need difficulty flags as there is only one mode
 2014-08-26 01:47:58 +01:00
Duarte Duarte
67fc6a9b42 Merge pull request #12928 from AriDEV/4.3.4 
Server/PacketIO: Updated CMSG_TIME_SYNC_RESP for 434
 2014-08-26 01:04:36 +01:00
AriDEV
e9d0660b06 Server/PacketIO: Updated CMSG_TIME_SYNC_RESP for 434 2014-08-26 02:02:38 +02:00
untaught
d0daafeb87 DB/Misc: Add Cosmetic Explosion Trap spawns and SAI to despawn Unstable Explosives on use. 
Closes #12243
 2014-08-25 22:14:14 +01:00
jackpoz
4d9f8b926a Scripts/Commands: Change "few" commands to target current Player by default 2014-08-25 22:00:04 +02:00
Dr-J
f347b56fbe Correction 
I had already tested script without broadcast ids but failed on pasting column name in right place when I did add them xd.
 2014-08-25 20:20:25 +01:00
Dr-J
3d84f902fd DB/SAI: Zul'drak scripts 
several quest complete scripts for quests in Zul'drak

rescripts Explosive Charges Bunny to include the countdown text,
 2014-08-25 20:17:02 +01:00
jackpoz
10b7480e70 Merge branch 'trickerer/mulreflect' into master 
Close pull request #11288
 2014-08-25 19:59:19 +02:00
hamcake9
16f3e6597d DB/Items: Fixed some random suffix ids 
Fixed suffix ids for some items with sub-60 itemlevel

Fixes #12898
 2014-08-25 17:01:22 +01: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
Dr-J
1c1f4fe33d DB/Conditions: Injured rainspeaker oracle 
Rewrite of conditions I used in 0c1587cc91 for a few things I overlooked when I writ original conditions, like fix the issue where someone without quest could click gossip menus and select the gossip menu to get the injured oracle to his feet and then make it impossible to turn in just following orders, gossip is now only displayed if player has or needs to take quest or select gossip option to start event.

conditions to prevent gossip option been selected to start wp while has feign death.
 2014-08-24 21:25:30 +01: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
DDuarte
98fb33003c Revert "CI/Travis: Change to gcc in an attempt to reduce the number of killed builds" 
This reverts commit 32673f63c5.
 2014-08-24 19:18:24 +01:00
DDuarte
32673f63c5 CI/Travis: Change to gcc in an attempt to reduce the number of killed builds 2014-08-24 17:25:02 +01:00
Vincent-Michael
4a58341e6d Core: Fix warnings 2014-08-24 18:08:29 +02:00
Vincent-Michael
2433a184ca TDB 434.07 - 2014/08/24 2014-08-24 17:53:12 +02:00
Vincent-Michael
b086b21207 SQL: Fix typo 2014-08-24 17:27:12 +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
Vincent-Michael
d088a368f1 TDB 335.55 - 2014/08/24 TDB335.55 2014-08-24 17:22:24 +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
jackpoz
42c230adab Core/Spells: Fix Prayer of Mending visual bounce 
Close #12855 , thanks @P-Kito
 2014-08-24 17:05:59 +02:00
Vincent-Michael
772c293b24 Core: Remove tabs 2014-08-24 16:47:04 +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
Dr-J
01a694886e Rename 2014_08_24_00_world_sai.sql to 2014_08_24_00_world_sai_335.sql 
Rename of file to reflect this commit is only for 3.3.5
 2014-08-24 13:15:27 +01:00
Aokromes
c496979e1c Update 2014_07_10_00_world_creature_434.sql 2014-08-24 14:12:47 +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
Dr-J
dd985a8c26 DB/SAI: Betrayal 
Script by me closes #4172

Also slight modifications to script for the lich kings script as part of the cleansing drak'tharon event as its the same entry of the lich king what is used there that is also used for this quest, so have had to condition the on just summoned events to area and specify wp in the on reached wp events rather than any.
 2014-08-24 12:14:07 +01:00
Dr-J
1ae55c5f85 DB/SAI: Supplies To Auberdine 
Working version, WP are not sniffed but we have little choice since this quest was removed from game by Blizzard in cata and no known sniffs/videos of this quest exist.

Closes #1610
 2014-08-24 12:09:47 +01: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