Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,880 Commits 4 Branches 146 Tags
5193eaac872d4bfa1fe511c15ea4e062824d19f2
Commit Graph

23880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent-Michael
8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2014-07-23 06:32:44 +02:00
Aokromes
1bebe15698 DB/Quest: Fix quest credit for the first trial 
By dr-j, closes #12600
 2014-07-23 00:19:24 +02:00
DDuarte
2117810aa4 DB/Schema: Change playercreateinfo_skills engine to MyISAM 2014-07-22 22:36:00 +01:00
jackpoz
3388587b7a Core/Misc: Replace rand() calls with SFMT 2014-07-22 21:43:19 +02:00
Shauren
0b236d480a Core/Authserver: Fixed changing realms 2014-07-22 20:15:11 +02:00
DDuarte
a08f931d42 DB/Quests: Add conditions to quest The Symbol of Live 
Closes #11444
 2014-07-22 18:14:06 +01:00
leak
5ee5d493c2 Increased default thread pool size as it now handles more than signals and remote access 2014-07-22 18:48:03 +02:00
DDuarte
059f3030b4 Core: Fix compile and a warning in spell_paladin 2014-07-22 14:38:37 +01:00
DDuarte
7ec7119f83 Core/Battleground: Implement BuildObjectivesBlock for BFG 2014-07-22 14:38:14 +01:00
DDuarte
92967a1240 Core/Battleground: Fix a copy paste error in Twin Peak scores and implement BuildObjectivesBlock for it 2014-07-22 14:18:13 +01:00
DDuarte
94fc885be6 README: Display 4.3.4 Travis badge instead of master's 2014-07-22 13:22:08 +01:00
DDuarte
30ea34f5be Revert "README: Display 4.3.4 Travis badge instead of master's" 
This reverts commit 5ca5d9fe44.

Wrong branch, I'm sorry.
 2014-07-22 13:21:10 +01:00
Duarte Duarte
5ca5d9fe44 README: Display 4.3.4 Travis badge instead of master's 2014-07-22 13:18:56 +01:00
DDuarte
01d9681a4d Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/authserver/Realms/RealmList.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
 2014-07-22 13:15:36 +01:00
DDuarte
44c0d66d63 Core/Misc: Remove a define that is no longer needed since ACE was removed 2014-07-22 13:12:39 +01:00
Duarte Duarte
1b6ac4ac3a Scripts/ICC: Fix non-pch build 2014-07-21 23:25:14 +01:00
Duarte Duarte
d94e1d5448 Misc/Travis: Tune down the amount of parallel builds and disable PCH 2014-07-21 19:21:38 +01:00
leak
5b0898b33c Core/DatabaseWorkerPool: Delete PCQ in dtor rather than in Close() and cancel queue properly before doing so 2014-07-21 20:12:44 +02:00
Sebastian Valle Herrera
eae97c7bc8 Core/PreparedStatements: Fixed a Coverity warning 2014-07-21 13:01:11 -05:00
Sebastian Valle Herrera
e223bbab6d Core/GridNotifiers: Fixed a warning from Coverity 2014-07-21 12:55:36 -05:00
Shauren
4f6db255a2 Core/NetworkIO: Restored world packet compression 2014-07-21 18:54:48 +02:00
Vincent-Michael
946ab3e8b7 Core: Kill again whitespace :( 2014-07-21 18:14:22 +02:00
Aokromes
f4d065dee0 DB/Creature: Update to c1006c5 
It's bad to do things at late night.
 2014-07-21 16:49:43 +02:00
Aokromes
210fb15265 DB/Creature: Remove no longer needed Summon Imp quests 
Closes #12557
 2014-07-21 15:54:17 +02:00
Aokromes
569bfc3aba DB/Misc: additions to a02ef421b1 
By dr-j, closes #12590
 2014-07-21 13:22:46 +02:00