Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-04 16:17:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,718 Commits 4 Branches 146 Tags
c3243e20760a0200be98e94de5f56336b1c2bc35
Commit Graph

29718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
b56e7f2ec6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-27 17:29:34 +02: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
55a501c1ca SQLs: Update /dev/world_database.sql 
Again, do NOT import this file.
 2014-08-27 14:13:51 +01:00
Dr-J
3abdcc588d DB/Misc: Couple of fixes for Stormpeaks 
1) Script event with Zeev Fizzlespark when Agnetta Tyrsdottar Dies
2) Respawn spawns of http://www.wowhead.com/object=191844/enchanted-earth and http://www.wowhead.com/object=191845/enchanted-earth as previousy tc only had 5 spawns between these 2 gos.
 2014-08-27 13:28:45 +01:00
Malcrom
5e18cf9220 DB/Creature_template: Gruul's Lair Damage Update 2014-08-26 23:50:10 -02:30
Malcrom
45b149b91e DB/Creature Stats: Armor update for Paladin class from Bestiary 2014-08-26 22:29:36 -02:30
Malcrom
cba59eb874 DB/Creature Stats: Armor update for Warrior class from Bestiary 2014-08-26 20:05:58 -02:30
Dr-J
3289393b3f DB/SAI: Archivist Mechaton 
Blizzlike script for Archivist Mechaton
 2014-08-26 22:13:16 +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
Gacko
219710d37c CI/Travis: One last... use root to drop databases 2014-08-26 19:42:00 +02:00
Gacko
fc3e059b10 CI/Travis: Remove $file from previous commit 2014-08-26 19:39:48 +02:00
Gacko
ecd52cd450 CI/Travis: Add password and use cat for import 
Forgot in e08efb89e4
 2014-08-26 19:38:40 +02:00
Duarte Duarte
e08efb89e4 CI/Travis: Use the created trinity user instead of root to test sql imports 
Also increase parallel build to 10 from 4 (if it is going to fail anyway it can at least fail fast)
 2014-08-26 18:27:31 +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
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
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
Blipi
a7d1394c2e Core/AHBot: Implemented AHBot based on MaNGOS code 
Warning: CMake must be rerun

Apply if you have crashes

Rewrite Seller prices, add random properties and implement some suggestions on price calculations

Core/AHBot: Update to latest suggestions

Fix SQLs after merge, split the AH bot to spearate headers and cpps, fix the config default values

Remove case 8 from GetBuyModifier. It was not correct

Fix Gray Grey GRAY typos

Change message config name

Fix non pch build

Fix switch ident, also earlier removed whitespace. Add missing include for non pch build

Fix possible crash: if (forplayer || GetOwnerGUID()) changed to if (forplayer)

Apply Nayd.diff - Code style fixes

Fix leftovers from nayd

Correct SQL transaction and change one SQL query to C++ instead

Make loot items distinct
 2014-08-25 22:15:59 +03: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
mik1893
df744c75e7 Core/Spell: Triggered spells should inherit LOS checking from triggering aura 
Avoid triggered spells to ignore LOS by default
Fixed wrong behaviour of Bladestorm spell
 2014-08-25 17:16:02 +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