Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity
29,917 Commits 2 Branches 1 Tag
b2ae2653f73fed2b1015d615cd6acb13064da170
Commit Graph
29917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aokromes fb4a8afa12 DB/Creature: Fix even more factions 
(This also fixes 4.3.4 startup errors)
 2014-08-29 13:32:38 +02:00
Aokromes 6489e71328 DB/Creature: Fix more factions 
(Fixes also 4.3.4 database startup errors)
 2014-08-29 13:17:57 +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
Aokromes f2210e4966 DB/Creature: Add trigger and civilian flags to the other difficulty entries of the Soul Consumption trigger 
By Nyeriah, closes #12957
 2014-08-29 09:46:05 +02: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
Duarte Duarte 662ab6d3b9 Merge pull request #12952 from Nyeriah/patch-dfq 
Core/Player: Dungeon Finder quests don't follow the same rule as repeata...
 2014-08-29 02:23:14 +01:00
Aokromes 33d09e35ca DB/Creature: Fix more factions 2014-08-29 03:13:11 +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
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