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
27,779 Commits 4 Branches 146 Tags
c4e2f0e5adfff21da647fef0dde2b9d9be95a171
Commit Graph

27779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedron
c4e2f0e5ad Core/MMaps: Fixed mmap loading 
Bug introduced in 1d2aafd

(cherry picked from commit 32a82dc956)
 2016-01-20 08:21:23 -03:00
Shauren
b605f1cc81 Core/Maps: Restored DataDir functionality accidendally removed earlier 
(cherry picked from commit 7e801595f4)
 2016-01-20 08:04:58 -03:00
ariel-
afb8c16989 DB/Spells: Added spell proc entry for Meat Cleaver 2016-01-20 02:03:01 -03:00
ariel-
47eba9ce1d Core/Scripts: Fixed Death and Decay 
Closes #46
 2016-01-20 01:35:02 -03:00
ariel-
93b31eeb4e Scripts/Spells: Merged 6.x beacon of Light instead of 3.3.5 2016-01-20 01:34:19 -03:00
ariel-
52b60d51e7 Core/Maps: fixed map loading after merge if datadir was different from local 2016-01-19 23:34:36 -03:00
ariel-
44261652ec Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 2016-01-19 22:27:29 -03:00
ariel-
9d351b5878 Core/Maps: backport ed75b0649a 
** No reextraction of maps needed **
 2016-01-19 22:25:27 -03:00
ariel-
67bb4c0c3c Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/updates/world/2015_11_09_02_world335.sql
	sql/updates/world/2015_11_09_02_world_335.sql
	sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql
	sql/updates/world/2015_12_16_02_world335.sql
	sql/updates/world/2015_12_16_02_world_335.sql
	sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql
	sql/updates/world/2016_01_02_00_world335.sql
	sql/updates/world/2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_10_05_world335.sql
	sql/updates/world/2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_12_01_world335.sql
	sql/updates/world/2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_12_02_world335.sql
	sql/updates/world/2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_15_00_world.sql
	sql/updates/world/2016_01_17_10_world.sql
	sql/updates/world/2016_01_17_11_world.sql
	sql/updates/world/2016_01_17_12_world.sql
	sql/updates/world/2016_01_17_13_world.sql
	sql/updates/world/2016_01_17_14_world.sql
	sql/updates/world/2016_01_17_15_world.sql
	sql/updates/world/2016_01_18_00_world.sql
	sql/updates/world/2016_01_19_00_world.sql
	sql/updates/world/2016_01_19_01_world.sql
	sql/updates/world/2016_01_19_02_world.sql
	sql/updates/world/2016_01_19_03_world.sql
	src/server/scripts/Spells/spell_paladin.cpp
 2016-01-19 22:24:14 -03:00
Killyana
c606ac53d6 DB: Typo 2016-01-20 01:38:30 +01:00
Killyana
cc0a4e68f7 DB/Gossip: Add missing npc text to Lorrin Foxfire 2016-01-20 01:36:28 +01:00
Killyana
ccad6eca9e Fix Some typos and mechanic_immune_mask in a previous commit 2016-01-20 00:49:00 +01:00
joschiwald
ea38a7d95b Scripts/ICC/Teleporter: moved gossips to db 2016-01-20 00:32:30 +01:00
Aokromes
8838540556 DB/Misc: Declare heroic modes for ShadowFang Keep creatures 
By dragosgirip
 2016-01-19 23:41:22 +01:00
Killyana
a534ca337a DB/Creature: Add gossip menu for Magistrate Bluntnose 
Closes #13031
 2016-01-19 21:42:11 +01:00
treeston
e8a79737a5 Merge branch '3.3.5-horsemen' into 3.3.5-base (PR #16194) 2016-01-19 21:39:23 +01:00
treeston
d23ef5d6d0 Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142) 2016-01-19 21:38:24 +01:00
Saben65
ccf3ed40e2 Scripts/Zangarmarsh: Removes empty gossip_text that resulted in NPCs saying blank text to players after buffing them 
Closes #12697
Closes #16300
 2016-01-19 21:17:10 +01:00
Killyana
cb6fa7556d DB/Creature: Restore Thaumaturge Zajir spawn and update Vaultkeeper Jazra position 2016-01-19 17:58:38 +01:00
DDuarte
ac727ab208 Scripts: Add override to CheckInRoom() definitions 
Fixes -Winconsistent-missing-override
 2016-01-19 13:06:04 +00:00
DDuarte
954323d9cb Core/Instances: Fix build in older VS versions 
Relax const uses in BossBoundaryEntry so the compiler can generate proper
copy assignment operator (error C2582: 'operator =' function is unavailable in 'BossBoundaryEntry')

Also renamed its members to match our coding standards
(public members should be UpperCamelCase)
 2016-01-19 13:01:43 +00:00
Aokromes
6455c450fb DB/Misc: Fix import 2016-01-19 08:33:24 +01:00
Aokromes
180550a87d DB/Misc: 3.3.5a fixes 2016-01-19 07:47:25 +01:00
Aokromes
7d454c66f7 DB/Misc: Few cosmetic fixes for Black Wing Lair 
(c++ script needs to be updated to handle proper door id 176965 instead door 175946)
 2016-01-19 07:22:41 +01:00
Aokromes
c9f009c432 DB/spawn: fix coords for one mob as for wow 4.3.4 2016-01-19 07:03:53 +01:00
ariel-
a43297604f DB/Misc: some more trigger bunnies (weren't visible due to phase, doh) 
Ref #22
 2016-01-19 02:55:20 -03:00
ariel-
7cac086a16 DB/Misc: set some creatures as trigger 
Ref #22
 2016-01-19 02:43:29 -03:00
ariel-
2961a6baaf Core/DB: Fix spellscript validation startup errors 
Closes #44
 2016-01-19 01:42:42 -03:00
Killyana
0279f958fe DB/Creature: High Priestess Jeklik 
Fixed movement stood on the site.
By @DevRival
Closes #16252
 2016-01-19 03:41:48 +01:00
Killyana
89e316ca6c DB/Creature: Battleguard Sartura 
Fix the BaseAttackTime
By @DevRival
 2016-01-19 03:31:04 +01:00
Killyana
9aad349b87 DB/Creature: Landen Stilwell 
Gossip and script
Closes #16238
 2016-01-19 03:19:14 +01:00
ariel-
39fb6f1d6d Core/Spells: Fix Raise Dead 
- Also corrected issue where summoned ghoul didn't have energy bar.

Updates #44
 2016-01-18 23:19:13 -03:00
Killyana
8f71950c91 DB/Achievement: Terokkar Turkey Time 
By @sirikfoll
Closes #16235
 2016-01-19 01:33:37 +01:00
Killyana
caf160bfaf DB: Update amount of enchanting materials from Wrath greens 
By @Treeston
Closes #16206
 2016-01-19 01:29:31 +01:00
Killyana
e9ed9f80db DB: Fix some DB errors 
By @tkrokli
Closes #16323
 2016-01-19 01:16:24 +01:00
ariel-
d797741116 Core/Spells: Fix Pestilence 
Updates #44
 2016-01-18 21:07:54 -03:00
Killyana
cdf7ac6096 DB/Creature: Fordragon Battle Steed 
Closes #16295
 2016-01-18 19:31:35 +01:00
Aokromes
705cf5cb7f Update 2015_12_20_00_world.sql 2016-01-18 19:25:13 +01:00
treeston
1050b68899 Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270) 2016-01-18 18:35:20 +01:00
treeston
b945d01ee5 Instance boundary follow-up: 
- Stop tools from complaining about leaks.
- Also, list -> vector.
- Fix an ambiguous constructor warning.
- Fix a bug with Gormok and Sindragosa (Fixes #16280).
 2016-01-18 18:08:15 +01:00
Killyana
ac64e8fbb0 DB/Creature_text: Kaya Flathoof 
By @tkrokli
Closes #16315
 2016-01-18 16:57:51 +01:00
Dr-J
11a330e691 DB/SAI: Neltharion's Flame 
rewrite  Rothin the Decaying script and add some missing visuals and other stuff
 2016-01-18 14:04:12 +00:00
Kittnz
82c0a074b4 DB: Fix startup errors 2016-01-18 09:27:35 +01:00
ariel-
6fe7da9cd7 Core/Misc: Finish cleanup of incorrectly merged Raise Ally fix (Branch 3.3.5 only) 2016-01-18 02:16:39 -03:00
ariel-
c5d909693b Implemented Unit Attack power mods handling 
Closes #17
 2016-01-18 02:12:44 -03:00
ariel-
be57c96863 DB/Achievements: fixed arena season achievements rewarded on login. 
Closes #20
 2016-01-18 00:29:30 -03:00
treeston
17f924a031 Spell facing follow-up: Fix an issue with creatures' channeled spells not cancelling properly in certain conditions 2016-01-18 02:10:17 +01:00
ariel-
ce050b13be Core/Scripts: Fix merge fail 2016-01-17 21:59:38 -03:00
Killyana
7f5805f308 DB/SAI: Fix Coilfang Scale-Healer spamming 'Heal' 
By @Treeston
Closes #16176
 2016-01-18 00:52:16 +01:00
ariel-
e74775ad64 DB/Core: Add missing realm first achievement criteria conditions. 2016-01-17 20:49:23 -03:00