Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 00:19:59 +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
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
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
f2fa1533d9 Core/Dependencies: Fix some -Wconversion warnings in G3D 2014-08-23 19:56:42 +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
Duarte Duarte
eec9320c26 Merge pull request #12911 from MitchesD/misc_3 
Scripts/SteamVault: Hydromancer Thespia rewritten to BossAI
 2014-08-23 13:55:00 +01:00
Rochet2
54936caab6 Fix free transmog exploit, fix possible crash 2014-08-22 23:20:50 +03:00
jackpoz
5e8277e923 Core/Dependencies: Update G3D to v9.0 r4036 2014-08-22 21:00:56 +02:00
Dr-J
a63aa858dc Fix some DB errors I am responsible for. 
Grr, I was going to script these but found was already scripted, but I left the ids in the line to set ai name in the commit I did make

Closes #12912
 2014-08-22 19:52:49 +01: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
MitchesD
d109fc0d7c Scripts/SteamVault: Hydromancer Thespia rewritten to BossAI 2014-08-22 16:34:18 +02:00
Dr-J
a8ff0c990b DB/Misc: Fix Conqueror Krenna/Gorgonna Phasing 
Fix phasing on Conqueror Krenna/Gorgonna in Conquest Hold (Grizzly Hills) so once The Conquest Pit: Final Showdown is turned in Conqueror Krenna and her 2 side parts disappear and Gorgonna replaces Conqueror Krenna as leader of conquest hold.
 2014-08-22 12:36:35 +01:00
Ascathor
c644f2f801 Core/Quest: Allow money reward for quests to be modified. 
Added a rate for both regular quest reward and for quest reward given on max level. Defaulted to 1.
 2014-08-22 02:37:50 +02:00
Kinzcool
dae9be08c3 Added a missing comma in d90d0fb614 2014-08-21 20:37:00 -04:00
Kinzcool
d90d0fb614 DB/Creatures: Fixed the InhabitType of some water creatures (fishes shouldn't walk) 2014-08-21 20:33:38 -04:00
Dr-J
bf526c0797 DB/Misc: The Spirit of Gnomeregan 
* Proper Phasing for The Spirit of Gnomeregan (Flight Master
* Script turn in event for Have a Part, Give a Part
 2014-08-22 00:53:47 +01:00
Aokromes
d3b5996408 DB/Conditions: Master Smith Burninate 
By Rushor, closes #12713
 2014-08-22 00:17:01 +02:00
Shauren
b8b24a26f6 Compile fix 2014-08-22 00:02:42 +02:00
Shauren
42cac6796a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Server/WorldSocket.cpp
 2014-08-21 23:59:00 +02:00
Dr-J
a2365939a2 DB/SAI: Son of Cenarius 
delete the permament spawns of Treant Ally at each Son of Cenarius and script Son of Cenerius to summon these using the proper spell.
 2014-08-21 22:37:00 +01:00
Dr-J
b56229b186 Change of guid, as was erroring 2014-08-21 22:26:53 +01:00
Shauren
d2361ae056 Core/Battle.net: Made battle.net port configurable 2014-08-21 22:28:06 +02:00
Dr-J
0c1587cc91 Remove Injured rainspeaker oracle cpp script 
Unneeded script
 2014-08-21 21:19:36 +01:00
Dr-J
558f6e17b9 DB/Misc: Various Frenzyheart/Oracles Chain fixes 
* Rescripted Injured Rainspeaker oracle and both Just Following Orders and Fortunate Misunderstandings and works properly now ie when you find the injured rainspeaker oracle you find lying on ground, you select gossip option to pull injured rainspeaker oracle to his feet crocodile attacks, once crocodile is killed Shaman Vekjik turns up and says a few lines
* New waypoints for a Rough Ride from sniff, the crocofile no longer goes through texture but camera is still glitchy
* Mosswalker victims will now summon mosswalker pocessions if the event of them deciding to die while doing the mosswalker saviour
* Correct text for softknuckle matrat for when summoned
* Spawn Shaman Jakjek and Lightningcaller Soo-met and phasing for these, however phasing does not work exactly as should do as you should only be able to see these two npcs while you are working towards that faction but since quests stay rewarded even after you change faction there is no way of doing this using quest and spell area is limited, there are two faction choice tracker quests (hidden) for wolvar and gorloc and spells which add this quests to player but also once these are rewarded they stay rewarded.
 2014-08-21 21:14:59 +01:00
Shauren
abfd29ab61 Core/WorldSession: Added research notes about CMSG_AUTH_SESSION values and reordered checks during login to always initialize encryption first to make sure the client can read failure packet 2014-08-21 18:18:13 +02:00
Duarte Duarte
33da371812 Merge pull request #12813 from MitchesD/misc_2 
Scripts/ScarletMonastery: rewritten InstanceScript and some bosses conve...
 2014-08-21 14:45:32 +01:00
Aokromes
c8e8d3396c DB/Warsong Gulch: Supreme Defender 
By horn, closes #3859
 2014-08-21 15:44:00 +02:00
Aokromes
f28a8f0df2 DB/Conditions: Add gossip conditions to Highlord Darion Mograine 
Closes #12868
 2014-08-21 15:16:06 +02:00
Aokromes
a49fce68dc Rename 2014_08_19_01_world_misc.sql to 2014_08_19_02_world_misc.sql 2014-08-20 12:30:22 +02:00