Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,502 Commits 4 Branches 146 Tags
1438c841ed22ecb5bfeb0f0fd210c341b841bf2a
Commit Graph

24502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carbenium
1438c841ed Core/Player: Move TradeData to its own file 
(cherry picked from commit 2d7d6f505c)

Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Spells/Spell.cpp
 2015-11-14 13:40:32 +01:00
MitchesD
86aa1996a4 Merge pull request #15859 from tkrokli/coverity_defects 
Scripts/Thaddius: Coverity scan Control flow issues  (MISSING_BREAK)
 2015-11-14 12:08:20 +01:00
tkrokli
95d6f09243 Scripts/Thaddius: Coverity scan Control flow issues (MISSING_BREAK) 
Coverity scan defects CID 1339315, 1339316 and 1339317:
- CID 1339315: boss_thaddius.cpp: 542
- CID 1339316: boss_thaddius.cpp: 811
- CID 1339317: boss_thaddius.cpp: 398

Added missing break; statements.
 2015-11-14 05:12:25 +01:00
Vincent-Michael
d0c28c66eb Core: Fix warning 2015-11-14 01:23:28 +01:00
Vincent-Michael
d188960216 Core/Condition: Fix issue reported by static analysis 
Coverity defect ID: 1339314
 2015-11-14 00:56:44 +01:00
Vincent-Michael
2ee01a7b3d Core: Fix non pch build 2015-11-13 20:19:16 +01:00
Shauren
536365a70f Fix build for mysql versions older than 5.7 
(cherry picked from commit 5604aed5f1)
 2015-11-13 09:28:14 +01:00
MitchesD
8804122051 Rename 2015_10_PR15523_world.sql to 2015_11_12_01_world.sql 2015-11-12 19:47:18 +01:00
MitchesD
e14e291ef6 Merge pull request #15523 from Treeston/3.3.5-thaddius 
Scripts/Naxxramas: Thaddius: Complete rewrite
 2015-11-12 19:46:46 +01:00
MitchesD
a1150ce20f Merge pull request #15732 from ShinDarth/reset-health-mana 
Scripts/Duel: implement duel reset of health and mana and improve duel reset
 2015-11-12 19:40:26 +01:00
Shauren
9bc5088a81 Core/DBLayer: Ensure that MySQL version used when compiling is the same as libmysql.dll version used for running the server. 
Ref #15848

(cherry picked from commit 0a27f8bce2)
 2015-11-12 17:55:10 +01:00
Shauren
11b3a60900 Buildsystem: Fixed building on windows 10 with cmake 3.4 
(cherry picked from commit b5fbf773a5)
 2015-11-12 17:55:04 +01:00
Kittnz
302623a151 DB/Event: Add all Hallow's End spawns in Northrend! 
- removed all old spawns and reinserted new valid spawns.
 2015-11-11 15:45:04 +01:00
Kittnz
a9cb25e55f DB/Event: Add all Hallow's End spawns in Northrend! 2015-11-11 01:24:53 +01:00
Kittnz
9e2330f575 DB/Object: Add general spawns missing in Northrend 2015-11-11 01:22:54 +01:00
Carbenium
c5f635b689 Core/Creature: Remove duplicate call to LoadCreatureAddons in Creature::Create 
* Add error log for duplicated aura entries in creature_(template_)addon
 2015-11-11 00:13:43 +01:00
Killyana
ade33880ba DB/Object: Fix 2 objects in The Eye 2015-11-10 22:46:25 +01:00
jackpoz
abd4e2e0f1 Core/Commands: Fix NULL dereference crash 
Closes #15833
 2015-11-10 21:14:18 +01:00
Killyana
311a8df4b7 DB: Fix a DB error 2015-11-10 16:13:21 +01:00
Aokromes
df9b09495c Rename 2015_11_8_00_world.sql to 2015_11_08_00_world.sql 2015-11-10 16:04:13 +01:00
Killyana
f067bd8d90 DB/SAI: Add missing text for Lore Keeper of Norgannon 2015-11-10 15:40:33 +01:00
Carbenium
52692c3f9d Merge pull request #15835 from ariel-/entry 
Creature Addon should be updated when entry is changed.
 2015-11-10 04:21:14 +01:00
Carbenium
2a36b00907 Core/Player: Improve a log message 
(cherry picked from commit 7eb314fcd1)
 2015-11-10 00:50:15 +01:00
Carbenium
52394eb93c Core/ObjectMgr: Disable not linked graveyard error log for zoneId == 0 2015-11-09 23:34:50 +01:00
Dr-J
03740e4b02 Rename 2015_11_09_02_world.sql to 2015_11_09_02_world335.sql 2015-11-09 16:51:06 +00:00
Dr-J
f5494ed10a DB/Misc: Fix errors 
Closes #15842
 2015-11-09 16:48:21 +00:00
Killyana
7f5850d94f DB/Misc: Add missing gossip option text for Brassbolt Mechawrench and Reginald Arcfire 
Replace vendor of the brewfest condition by achievement instead of quest
 2015-11-09 14:32:05 +01:00
Killyana
afd69f05b6 DB/Quest: Aberrations 
Closes #8492
 2015-11-09 01:11:19 +01:00
Dr-J
43b114ecdb Move file to correct location 2015-11-08 21:49:35 +00:00
Dr-J
1fc7aa9c72 correct typo 2015-11-08 21:36:38 +00:00
Dr-J
e312536710 DB/Misc: Commoners (Day of the Dead) 
* Spawn commoners for this event
* Add Gossip for event

http://www.wowhead.com/spell=65529/gossip-npc-appearance-day-of-the-dead-dotd does not appear to work, this aura should give npcs the same model (if not very similar to) the one which players get when they /dance with Catrina.
 2015-11-08 21:31:00 +00:00
Dr-J
104053111f DB/Event: Day of the Dead 
* spawn all event creatures and gos.

Respawn creature spawns as some of these where found to be incorrect positions
Spawn all the missing gos for this event.

Ghostly cooking fires are meant to also require orange marigolds to be visible but atm is visible while event is active
The spell 30628 http://www.wowhead.com/spell=30628/arcane-invisibility is not sniffed (in fact in sniff there appears to be no invisibility spell used on these npcs, this is the spell we was already using on these npcs but is not from sniff)

Npcs/gos missing from stormwind as dont have valid sniff for those.
 2015-11-08 19:02:20 +00:00
ariel-
ee161a0bfa Reload creature addons on UpdateEntry. 2015-11-08 15:13:07 -03:00
Killyana
90c4304f1e Merge pull request #15022 from robinsch/GOdespawn 
SmartAI: Possibility to despawn object with SMART_ACTION_FORCE_DESPAWN
 2015-11-08 16:54:58 +01:00
treeston
29feae5901 Scripts/Naxxramas: Complete rewrite of the Thaddius encounter. 2015-11-08 14:57:01 +01:00
ShinDarth
3b1db7a514 Scripts/DuelReset: 
- do not reset when duel is fled
- minor improvement to SpellHistory::RestoreCooldonStateAfter duel method
 2015-11-07 21:16:18 +01:00
Vincent-Michael
7d5e7102cd Core: Whitespace cleanup 2015-11-07 20:01:53 +01:00
Vincent-Michael
ff9001ce1d Updated url for tc wiki 
(cherry picked from commit 6d01960448)
 2015-11-07 19:35:24 +01:00
Carbenium
82c52e40f4 TDB 335.60 - 2015/11/07 TDB335.60 2015-11-07 16:15:15 +01:00
Golrag
7593e861de Core/CreatureGroups: Don't set positionZ to ground for flying creatures. 
(cherry picked from commit df4c856360)
 2015-11-07 14:53:20 +01:00
Naios
97dd18cb78 Core/ScriptMgr: Improve commit 155a289f05 
(cherry picked from commit 30c421bf57)
 2015-11-07 13:10:21 +01:00
Naios
d81784194c Core/ScriptMgr: Fix "conditional expression is constant" warning. 
* introduced in commit 12d1993994

(cherry picked from commit 155a289f05)
 2015-11-07 13:10:04 +01:00
Naios
3a3a6bbfd2 Core/Globals: Use std::string rather than char* to pass script names around. 
(cherry picked from commit b7b49fe35f)

Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2015-11-07 13:09:10 +01:00
Naios
23153c8bf1 Core/ScriptMgr: Replace IsDatabaseBound() methods through traits. 
(cherry picked from commit 12d1993994)
 2015-11-07 12:34:15 +01:00
Killyana
987c1a3a53 DB/Creature: Apexis Flayer 
Closes #15761
 2015-11-07 01:48:58 +01:00
Killyana
55f795b9fd DB/Page text: Saga of the Sin'dorei 2015-11-07 01:23:00 +01:00
Shauren
910fb00130 Core/Corpses: Fixed a possible crash adding bones to grid 
Closes #15808

(cherry picked from commit ec1583df67)
 2015-11-06 21:30:41 +01:00
Aokromes
a08611dfef DB/Misc: Fix a runtime error 2015-11-06 01:22:01 +01:00
Shauren
e9e349c7cc Dep/g3d: Removed std::shared_ptr, std::weak_ptr, std::dynamic_pointer_cast, std::static_pointer_cast and std::enable_shared_from_this from global namespace 
(cherry picked from commit 2c23a686e3)
 2015-11-05 21:33:23 +01:00
Shauren
d6c52ba28c Core/Commands: Added assertion checking if command name is not null 
(cherry picked from commit 5695969725)
 2015-11-05 21:30:29 +01:00