Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-07 01:18:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,447 Commits 4 Branches 147 Tags
1106eadac6df7d94de04f9f1642d53f37ca847bc
Commit Graph

30447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Duarte Duarte
b20b6dedf9 Merge pull request #12951 from Nyeriah/patch-dfq 
Core/Players: Dungeon Finder quest rewards should be sent as a mail if t...
 2014-08-29 01:22:14 +01: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
DDuarte
82f67fd09b DB/Commands: Fix a typo in help text of .guild info 2014-08-28 23:59:58 +01:00
Dr-J
a9f52cd33b DB/SAI: Grizzly Hills quest complete scripts 
Turn in scripts for: -

12195 The Unexpected 'Guest'
12199 Bringing Down the Iron Thane
12279 A Bear of an Appetite

And one I had already scripted thinking was ooc text but event for turn in of 12484 Scourgekabob and added the missing emotes.
 2014-08-28 23:15:47 +01: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
Aokromes
37c150a74b DB/Creature: Fix faction of Mutated Abomination 2014-08-28 23:34:23 +02: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
cb37e2c9d1 SQL: Sync auth_database 2014-08-28 22:37:46 +02:00
Aokromes
09569521f7 DB/Creature: Fix Veridian Broodling 
By Pitcrawler, closes #8990
 2014-08-28 22:31:04 +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
d6dbe52e64 SQL: Fix fail ... 2014-08-28 20:19:14 +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
Gacko
51418b76ae SQL: Rename file 2014-08-28 18:05:54 +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
Aokromes
cbeaa6703c DB/Creature: Remove unused ScriptName 
Closes #7441
 2014-08-28 12:17:13 +02: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
Dr-J
00475facf2 DB/SAI: Xarantaur 
Original update by @Pitcrawler 

Scripts turn in events for : -

13034 The Witness and the Hero
13038 Distortions in Time
13058 Changing the Wind's Course

Also some script updates for Changing the Wind's Course

Closes #12946
 2014-08-27 21:31:26 +01: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
Duarte Duarte
b56cfeb45e Merge pull request #12947 from ak47sigh/master 
Added a new hook Called when a player's money is at limit
 2014-08-27 17:44:10 +01:00
chadryx
983755a21d Added a new hook Called when a player's money is at limit 2014-08-27 19:01:41 +03:00
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