Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,259 Commits 4 Branches 146 Tags
85e37db96a7454987d4ffc9be59462cfecf85e9a
Commit Graph

7015 Commits

Author SHA1 Message Date
Vincent-Michael
26dd770b8e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/shared/Utilities/Util.cpp
 2014-06-15 19:36:30 +02:00
joschiwald
e55835a6a9 Core/Creature: load correct vehicleid of difficulty mode npcs if set otherwise inherit from normal mode entry 
Closes #8783
 2014-06-15 17:49:17 +02:00
joschiwald
7b3141bfde Scripts/Gurtogg: 
* fixed bloodboil targeting
* fel rage should only hit players

Closes #12193
 2014-06-15 17:41:42 +02:00
Shauren
3899d451f9 SQL: Restored file that was not supposed to be renamed 2014-06-15 00:00:31 +02:00
Vincent-Michael
1c80e441a0 Core: Fix non pch build 2014-06-14 23:33:20 +02:00
Discover-
dbc97c0fd3 Merge pull request #12280 from MitchesD/commands 
Scripts/Commands: added option to show flags_extra (.npc info)
 2014-06-14 23:17:39 +02:00
MitchesD
3a8b5179fa Scripts/Commands: added option to show flags_extra (.npc info) 2014-06-14 22:11:50 +02:00
Vincent-Michael
b64d1e180e DB/SAI: Fix sai linked error 2014-06-14 22:08:30 +02:00
Vincent-Michael
53caf7959e Core/Ulduar: Added IsInCombat check for ulduar teleporter 2014-06-14 22:01:50 +02:00
Vincent-Michael
cd3977edf9 DB/Misc: Convert ulduar teleporter in sql 2014-06-14 20:03:55 +02:00
Shauren
712bb19ec3 Fixed typo in 2014_06_14_00_world_creature_template.sql 2014-06-14 17:57:00 +02:00
Shauren
ae608218a9 DB/Instance: Fixed mutated abomination regenerating power clientside 2014-06-14 17:14:00 +02:00
Shauren
f39a66d082 SQL: Renamed files to match the naming rules 2014-06-14 17:13:11 +02:00
Aokromes
d28f0f9a5a DB/Creature: Trenton Lighthammer missing gossip 
By dr-j closes #12248
 2014-06-12 01:54:52 +02:00
Aokromes
3399911733 DB/Quest: Fix Missing text for A Most Puzzling Circumstance 
By Crysicle, closes #12252
 2014-06-12 01:41:13 +02:00
jackpoz
d1d91d193d Merge commit 52c0fc96bb 2014-06-11 21:00:16 +02:00
Shauren
3ba1232310 SQL: Reordered statements to fix import 2014-06-11 20:54:18 +02:00
Unholychick
52c0fc96bb Move pestilence to spellscripts 
Fixes crash and warnings introduced in d4bbc26261
Fixes a bug that allowed dks to spread diseases using another dks diseases
Closes: https://github.com/TrinityCore/TrinityCore/issues/12245
 2014-06-11 20:03:30 +02:00
Aokromes
9f4bab55ed Merge pull request #12046 from phoenixfight/fishmaster 
Core/Fishing: Repair fishing spell result fish escape
 2014-06-11 17:32:49 +02:00
phoenixfight
ae46affe4e [core/database]Repair fishing spell result fish escape 
edit fish junk sql formart

Optimized code, remove some useless brackets

fix default fish result ,just like Off the coast of Storm Peaks.

cleaned the sql part  thx Kinzcool

fix todo now
 2014-06-10 11:07:15 +08:00
Aokromes
d66d1af271 DB/Quest: Fix some missing quest texts 
By crysicle, closes #12167
 2014-06-09 23:11:08 +02:00
Kinzcool
9d481fd64d DB/GameObjects: Deleted no longer needed gameobjects spawns since their phaseMask correction 2014-06-09 23:11:02 +02:00
Kinzcool
ae18b84c73 DB/GameObjects: Fixed the phasing of the remaining flags in WinterGrasp 2014-06-09 23:11:01 +02:00
Kinzcool
0cc94300d9 DB/GameObjects: Fixed some phasing of certain gameobjects in Northrend and DK's area 2014-06-09 23:11:00 +02:00
Vincent-Michael
ae1fbba3cc DB/Conditions: Fix conditions for Xink gossip 2014-06-09 23:11:00 +02:00
Aokromes
ba0b4dc06d DB/Creature: Fix Eva Sarkhoff 
By dr-j, closes #12224
 2014-06-09 23:10:51 +02:00
Trisjdc
78f1cbfba5 Scripts/Items: Imp in a Ball 2014-06-09 23:10:47 +02:00
Aokromes
90c60a5a6f DB/Quest: Fix some missing quest texts 
By Crysicle, closes #12214 closes #12209
 2014-06-09 23:10:45 +02:00
Aokromes
e5bd194bf8 DB/Quest: Fix some missing quest texts 
By crysicle, closes #12167
 2014-06-09 10:11:56 +02:00
Vincent-Michael
18b6a6450b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_warlock.cpp
 2014-06-09 03:27:53 +02:00
Shauren
434b3a80e1 Core/Commands: Added a set of commands to manage battle.net accounts 
TODO: Ban commands, linking game accounts to battle.net accounts
 2014-06-08 17:58:28 +02:00
Shauren
7dd552c826 Merge branch 'battle.net' into 4.3.4 2014-06-08 16:14:24 +02:00
Shauren
9f69eda67f Core/Battle.net: Additional checks 
* Force grunt login for versions < 15595
* Force bn login if supported and game account is linked to bn account
 2014-06-08 15:34:24 +02:00
Shauren
05c0524bf3 Core/Battle.net: Refactored handling multiple game accounts 2014-06-08 14:54:37 +02:00
Shauren
372f043a68 SQL: Sorted out temporary names and added missing statements 2014-06-08 13:02:16 +02:00
Kinzcool
1ed339547b DB/GameObjects: Deleted no longer needed gameobjects spawns since their phaseMask correction 2014-06-08 03:13:18 -04:00
Kinzcool
d9cdac643e DB/GameObjects: Fixed the phasing of the remaining flags in WinterGrasp 2014-06-08 03:11:36 -04:00
Kinzcool
cde18e19c8 DB/GameObjects: Fixed some phasing of certain gameobjects in Northrend and DK's area 2014-06-08 00:02:20 -04:00
Vincent-Michael
73e90f6241 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-08 01:21:17 +02:00
Vincent-Michael
27b5e0d9ac DB/Conditions: Fix conditions for Xink gossip 2014-06-08 01:20:47 +02:00
Vincent-Michael
1f62d9c387 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ItemHandler.cpp
	src/server/scripts/Spells/spell_dk.cpp
 2014-06-07 23:40:37 +02:00
Sebastian Valle Herrera
fd7589617d Merge pull request #12057 from Trisjdc/imp_in_a_ball 
Scripts/Items: Imp in a Ball
 2014-06-07 11:44:22 -05:00
Aokromes
91d9833916 DB/Creature: Fix Eva Sarkhoff 
By dr-j, closes #12224
 2014-06-07 11:17:50 +02:00
Vincent-Michael
1e4ec81ccb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSession.cpp
 2014-06-06 22:56:30 +02:00
Trisjdc
b4b3e6f3a2 Scripts/Items: Imp in a Ball 2014-06-06 11:01:36 +01:00
Aokromes
455690438f DB/Quest: Fix some missing quest texts 
By Crysicle, closes #12214 closes #12209
 2014-06-06 02:39:56 +02:00
Michael
83c2e79d52 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-06-05 19:42:48 +02:00
Gacko
79f01de094 DB/Creature: Remove phaseMask hack of Shadowmoon Tuber Nodes 
Related to 26370223a0
 2014-06-03 10:04:03 +02:00
Kinzcool
289a5c4318 DB/Phases: Added PhaseId & PhaseGroup fields for coming phasing changes 2014-06-01 22:13:08 -04:00
Kinzcool
edced30576 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-06-01 13:42:07 -04:00