Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,905 Commits 4 Branches 146 Tags
cdb33ab174a43fb3cc19dcd672bbfd3191fd84aa
Commit Graph

23905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DDuarte
cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2014-07-24 17:10:21 +01:00
DDuarte
3de1714350 Scripts&DB/Feralas Convert npc_screecher_spirit to SAI 
SAI by @Rushor and gossip by @malcrom

Closes #12630
 2014-07-24 16:38:18 +01:00
Shauren
f1a41eabae Core/NetworkIO: Fixed boost::asio::async_write usage - packets will now be sent properly 2014-07-24 17:09:45 +02:00
Aokromes
03146835e5 DB/Creature: Mana surge 
By untaught, closes #11661
 2014-07-24 17:08:01 +02:00
Shauren
02cbe978aa Rename 2014_07_24_00_world_misc.sql to 2014_07_24_00_world_misc.sql 2014-07-24 16:59:58 +02:00
Dr-J
88ac8d4c68 DB/Gameobject: Spawn some missing mailboxes 
Spawn Missing Mailboxes in Undercity and Stormwind

* 6 In Undercity (previously only 1 mailbox was spawned in whole of undercity) - 7 in total including the 1 already spawned
* 2 In Stormwind (12 where spawned) - 14 in total including the 12 already spawned
 2014-07-24 15:54:35 +01:00
Malcrom
532d8fb2b0 Create 2014_07_24_10_world_sai.sql 
DB/SAI: Fallen Ranger SAI fix
closes #12206
 2014-07-24 12:18:48 -02:30
Malcrom
1c3e465a9b Create 2014_07_24_09_world_sai.sql 
DB/SAI: Argus Shadow Mage SAI fix
closes #12001
 2014-07-24 12:14:20 -02:30
untaught
3009bb4808 Scripts/Darkshore: Fix an issue with the quest Gyromast's Revenge 
TODO: Rewrite the script in SAI

Closes #11987

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 15:18:04 +01:00
untaught
e48c37cc10 Scripts/AreaTriggers: Fix an issue with an AT for the quest The Etymidian (Sholazar Waygate) 
Closes #12178

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 15:15:18 +01:00
Vincent-Michael
296956e06e Revert "Core/Spells: Death and Decay" 
This reverts commit 02d56e00bc.
 2014-07-24 16:14:25 +02:00
Malcrom
d7cf0a935a Create 2014_07_24_07_world_conditions.sql 
Db/Conditions: Update conditions for Gart Mistrunner gossip
closes #12496
 2014-07-24 11:23:34 -02:30
Aokromes
062755df94 DB/Creature: Fix Innkeeper Belm 
By Rushor, closes #12618
 2014-07-24 11:34:57 +02:00
Vincent-Michael
38381f9ab2 DB/Creature: Fix model problem with "Enraged Air Spirit" 
ServerToClient: SMSG_DB_REPLY (0x1F01) Length: 101 ConnectionIndex: 1 Time: 03/30/2014 19:37:07.876 Number: 47320
Entry: 21060
DB2 File: Creature (3386291891)
Hotfix date: 03/30/2014 19:37:04
Size: 85
Creature Entry: 21060
Item Entry 1: 0
Item Entry 2: 0
Item Entry 3: 0
Mount: 0
[0] Display Id: 14515
[1] Display Id: 15294
[2] Display Id: 0
[3] Display Id: 0
[0] Display Id Probability: 1
[1] Display Id Probability: 0
[2] Display Id Probability: 0
[3] Display Id Probability: 0
Name: Enraged Air Spirit
Rank: 0
Inhabit Type: 0
 2014-07-24 07:22:46 +02:00
Trisjdc
b9b8d83eb6 Core/BGs: Reputation gained in BGs should be affected by SPELL_AURA_MOD_REPUTATION_GAIN 
An example would be Diplomacy (Racial Passive)
 2014-07-24 04:16:36 +01:00
Trisjdc
2ae9afa9e8 Core/BGs: Reputation gained in BGs should be affected by SPELL_AURA_MOD_FACTION_REPUTATION_GAIN 2014-07-24 04:09:38 +01:00
Trisjdc
e2d6b9bf8c Core/Units: Properly remove auras that don't pass IsHighestExclusiveAura 2014-07-24 04:06:49 +01:00
Ergar
40c5737200 Scripts/Karazhan: Boss Maiden of Virtue - rewrite to events and timer adjustments 
Closes #12513 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:58:39 +01:00
Trisjdc
f79e7d7640 Core/Spells: Unrelenting Assault shouldn't proc if the target isn't explicitly casting (turns out that UNIT_STATE_CASTING even a instant cast has a 'cast time') 2014-07-24 03:52:19 +01:00
DDuarte
73df8f8381 Scripts/IoC: Rename spell_gen_* spells to spell_ioc_* 
(Additions to 6bb63ab7db679d9c)

Closes #12414 (PR)
 2014-07-24 03:49:30 +01:00
karn
26496375f8 Script/IoC: Move some spell scripts from spell_generic to isle_of_conquest cpp 
Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:49:07 +01:00
Trisjdc
c541f4f5de Scripts/Four Horsemen: Horsemen's main spells should only explicitly target players 2014-07-24 03:48:35 +01:00
Trisjdc
3f9f2e3ee5 Core/Units: IsNonMeleeSpellCast will no longer return false if there's an instant cast spell still arriving at the target with the caster doing a channel 2014-07-24 03:47:04 +01:00
Trisjdc
0e91a0e54c Core/Spells: Solving the double dips in Hammer of the Righteous 2014-07-24 03:40:05 +01:00
msoky
1ab65432a6 DB/Pets: Add missing pet stats data 
Closes #11639
 2014-07-24 03:37:32 +01:00
DDuarte
5193eaac87 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
 2014-07-24 03:35:19 +01:00
nelegalno
7524e2dfda Scripts/WesternPlaguelands: Fix conditions to show gossip of Myranda the Hag (In Dreams quest) 
Ref #7519

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:25:33 +01:00
Rushor
79c83dc4db Scripts/Feralas: Make Screecher Spirit disappear after clicking on them 
This is a temporary solution, the script should be rewritten in SAI

Closes #12298

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 03:25:32 +01:00
Aokromes
a2c35e33af DB/Gameobject: Spawn Maraudon portal 
Closes #10131
 2014-07-24 04:12:26 +02:00
Duarte Duarte
6180924465 Merge pull request #12622 from Exodius/master 
Core/Spells: Death and Decay

Closes #6345
 2014-07-24 03:11:08 +01:00
Exodius
02d56e00bc Core/Spells: Death and Decay 
Solves problems with Death and Decay doing LoS check using the caster instead of the center of AOE.
Fix by @PKX
Closes #6345
 2014-07-24 03:08:49 +02:00
Aokromes
9a80eb5a85 DB/Creature: Fix of Doc Mixilpixil gossips 
By Malcrom, closes #12617
 2014-07-24 02:57:47 +02:00
Aokromes
24a46a3574 DB/Creature: Update SAI of more creatures 
By Malcrom.
 2014-07-24 02:31:08 +02:00
malcrom
6b4dafc1aa DB/NPCs: Add missing gossip for Strahad Farsan 
Closes #12613
 2014-07-24 01:25:08 +01:00
Foldy
9e81b23a57 Scripts/ICC: Summon Sealed Chest quest npc's upon the Lich King's Death 
TODO: template updates for these npcs and gossips

Closes #10554
Closes #12591 (PR)

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-07-24 01:23:45 +01:00
DDuarte
737c3aa9f6 Core/Common: Remove the no longer finite(x) macro for MSVC 
Use std::isinfinite(f) instead.
 2014-07-24 01:01:03 +01:00
Duarte Duarte
193191e03b Merge pull request #12610 from jaredjones/master 
Core/Misc: Silenced 500 OS X Warnings and removed deprecated finite() me...
 2014-07-24 00:46:33 +01:00
Jared P. Jones
11ecd851a1 Core/Misc: Silenced 500 OS X Warnings and removed deprecated finite() method. 
*Mac OS X fires off over 200 warnings related to gsoap about the deprecated register method. CMake has been patched to remove this warning.
*Updated all occurences of finite() to std::isfinite. The method finite() is not standardized by anyone aside from BSD. std::isfinite() however is standarized by C++
*Removed -ncurses and -pthread from OS X compilation. Now that we use Boost and C++11 there is no longer a need for pthread in OS X. All it does is throw a warning. However, ncurses isn't needed either as it's built into the OS X SDK and linked by default.

Note: There are only 5 remaining warnings left when compiling on OS X. I did not attempt to fix these as they were related to 3rd party libraries statically linked into the code. The 5 warnings left are all related to unused variables.
 2014-07-23 17:30:45 -05:00
Aokromes
1116e8544d DB/Creature: Update SAI of even more creatures 
By Malcrom.
 2014-07-23 23:12:25 +02:00
Aokromes
98a1ba59c2 DB/Creature: Update SAI of more creatures 
By Malcrom
 2014-07-23 22:15:44 +02:00
Aokromes
a8026fd23f DB/Creature: Update SAI of multiple creatures 
By Malcrom, King of fixes.
 2014-07-23 20:33:11 +02:00
Shauren
f6fc81fed7 SQL: Moved file to proper location 2014-07-23 19:28:21 +02:00
Shauren
42eeec12bf Core/Mains: Handle SIGBREAK to achieve clean shutdown when users click X button on windows 2014-07-23 19:04:07 +02:00
Dr-J
a7476a7898 DB/SAI: Eye of the Lich King 
Properly fix Eye of the Lich King in Pit of Saron so it randomly whispers players
 2014-07-23 17:49:18 +01:00
joschiwald
b5975c2817 Scripts/ICC: fixed Festergut Malleable Goo (thx @ManuFe) 
Closes #12023
 2014-07-23 17:24:50 +02:00
Aokromes
6d33078731 DB/SAI: Script multiple mobs with SAI 
By Malcrom, king of fixes.
 2014-07-23 17:03:17 +02:00
Dr-J
51614d2319 Fix my screw up cec1ae4c5b 
Fix my screwup with cec1ae4c5b
 2014-07-23 12:08:34 +01:00
Dr-J
cec1ae4c5b DB/Misc: Vault of Lights 
Scripts for Audrid, Tobin, Torian, Omony and Kurzon for the repeating event at the vault of Lights Exodar
 2014-07-23 11:41:56 +01:00
Shauren
22e16b2460 Core/Players: Set fist weapon skill value equal to current unarmed skill when learning fist weapons for the first time 2014-07-23 11:20:50 +02:00
Aokromes
b7251e1c9e DB/Misc: More aditions to 569bfc3 
By dr-j, closes #12601
 2014-07-23 07:51:47 +02:00