Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-18 16:09:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,447 Commits 4 Branches 147 Tags
1106eadac6df7d94de04f9f1642d53f37ca847bc
Commit Graph

30447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Trisjdc
0b3e391ac4 Merge pull request #11739 from Golrag/master 
Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
 2014-06-09 00:53:28 +01:00
Trisjdc
38e12321a5 Merge pull request #12069 from Trisjdc/cheat_death 
Core/Spells: Fix Cheat Death formula
 2014-06-09 00:45:12 +01:00
Trisjdc
551c565746 Core/Handlers: Move a couple of logs to debug, they can appear without anything abnormal due to client latency 2014-06-08 23:11:42 +01:00
Sebastian Valle Herrera
af6de7265a Merge pull request #12240 from Unholychick/patch-3 
Core/Build: Fix Warnings
 2014-06-08 16:28:39 -05:00
leak
55dee85ed8 Remove ace/config-all.h and ancient WinXP defines which are actually commented out... 2014-06-08 23:28:01 +02:00
leak
daa5c0ad0d Use correct define for endianess 2014-06-08 23:25:40 +02:00
Lucas
5d40838207 Fix Warnings 2014-06-08 21:21:49 +02:00
Sebastian Valle Herrera
d0c9ac1d69 Merge pull request #12228 from Unholychick/patch_periodics 
Core/Spells: Implement Periodic mechanics
 2014-06-08 13:13:14 -05:00
leak
0dd10269d1 Replaced dependencies on ace/OS_NS_time.h 2014-06-08 20:08:43 +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
jackpoz
fc7062049f Core/Calendar: Sanitize calendar event parameters 
Prevent events added in the past which in some conditions would cause an infinite loop in the client.
 2014-06-08 17:33:17 +02:00
jackpoz
927f16de49 Revert "Core/Calendar: Fix memory leak when malformed CMSG_CALENDAR_ADD_EVENT is received" 
This partially reverts commit 51e38872c7.
The stack-initialized variable calendarEvent would have called CalendarMgr::FreeEventId() when it went out of scope, marking the current event id as free and allowing next event to overwrite current event.
This doesn't fix the memory leak issue which still needs to be addressed in a proper way.
 2014-06-08 17:18:07 +02:00
Shauren
7dd552c826 Merge branch 'battle.net' into 4.3.4 2014-06-08 16:14:24 +02:00
leak
fdd5e11a15 Fix for LockedQueue.h (clean rebuilds ftw.) 2014-06-08 16:05:23 +02:00
Gacko
d2d1b97cff Script: Minor optimization in spell_unlocking_zuluheds_chains 2014-06-08 15:56:28 +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
leak
ee4a3b9d59 Replaced mutex related code in Common.h 2014-06-08 15:30:57 +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
Subv
f71abd173e Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases 2014-06-07 20:27:23 -05:00
Subv
bbe51bbd13 Core/Phases: Removed more of the old phasemasks 2014-06-07 20:26:25 -05:00
Subv
402b9b055c Core/Conditions: Removed deprecated CONDITION_PHASEMASK and implemented CONDITION_PHASEID 2014-06-07 19:42:08 -05:00
Sebastian Valle Herrera
e1e5f2a196 Core/Items: Fixed a transmogrify exploit 
Thanks @Rochet2
Closes #11952
 2014-06-07 19:23:38 -05:00
Sebastian Valle Herrera
cfd527c880 Core/Items: Fixed a reforge exploit 
That allowed items to be reforged more than once.
Thanks @Rochet2
Closes #11465
 2014-06-07 19:18:54 -05: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
Trisjdc
91052574ac Core/Auras: Expanding functionality of SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT to be able to take care of aura effects inside their handlers 
Currently handled:
- SPELL_AURA_MOD_RESISTANCE_PCT
- SPELL_AURA_MOD_STAT
- SPELL_AURA_MELEE_SLOW
- SPELL_AURA_MOD_MELEE_HASTE
- SPELL_AURA_MOD_DAMAGE_PERCENT_DONE

Necessary to allow stack rules such as BoK/BoS/Bok-Drums and others to be all in a target with all of the aura effects, yet with only the 'highest' effect active
 2014-06-07 23:43:11 +01:00
Sebastian Valle Herrera
f53045ae5c Core/Quest: 
Fixed self-completing quests without NPCs
no, wait
Fixed self-completing quests without NPCs, and fixed some issues with the AUTOCOMPLETE quest flag
 2014-06-08 00:34:14 +02:00
Vincent-Michael
1d39db16b9 Core/Misc: Kill Whitespace ... 2014-06-07 23:58:08 +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
jackpoz
5fee5b0125 Core/Banks: Fix some bank exploits 
Re-implement the cheat checks removed in a12501fb5e and check if Player can interact with the Banker when handling bank-related opcodes.
 2014-06-07 22:47:50 +02:00
Aokromes
4ec84fd1ec Core/Database: Update log for incorrect db structure 2014-06-07 22:13:42 +02:00
Sebastian Valle Herrera
8304c09547 Merge pull request #12231 from Trisjdc/fishing_boober_link 
Core/GOs: When unlinking Fishing Bobber from player to prevent despawning, unlink from spell as well to prevent removing unwanted auras
 2014-06-07 14:24:30 -05:00
Sebastian Valle Herrera
121083e59d Merge pull request #12232 from Trisjdc/anti_magic_shell 
Core/Spells: Anti-Magic shell should give immunity to all spells that belong to SPELL_SCHOOL_MASK_MAGIC regardless of dispel type
 2014-06-07 14:23:41 -05:00
Unholychick
d4bbc26261 Core/Spells: Implement Periodic mechanics 
Change behaviour of single target periodic aura ticks to be more blizzlike
Also add some missing handling of SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE
Fixes Deep wounds and Chimera Shot Serpent
Remove an ancient hack with Drain Soul, spell id 100001 can now be deleted from spell_dbc table
Allows Rolling dot mechanics and allows DK's to roll diseases with pestilence,
see link for info:

http://forums.elitistjerks.com/topic/82503-frost-dps-in-333this-will-be-a-day-long-remembered/page-88
 2014-06-07 19:13:57 +02:00
Trisjdc
97046283b5 Core/Spells: Anti-Magic shell should give immunity to all spells that belong to SPELL_SCHOOL_MASK_MAGIC regardless of dispel type 2014-06-07 18:06:22 +01:00
aletuna
1b3149b07f Scripts/Blackrock Depths: Converted to eventmap+minor coding style changes 
Closes #11730
 2014-06-07 19:02:39 +02:00
Trisjdc
6abfdc1cea Core/GOs: When unlinking Fishing Bobber from player to prevent despawning, unlink from spell as well to prevent removing unwanted auras 2014-06-07 17:58:45 +01:00
Sebastian Valle Herrera
6c31c33f66 Merge pull request #12128 from Trisjdc/aura_transform 
Core/Auras: Update model overwriting rules for SPELL_AURA_TRANSFORM
 2014-06-07 11:49:00 -05:00
Sebastian Valle Herrera
35b8874cca Merge pull request #12216 from Trisjdc/quest_item_check 
Core/Players: Improve quest item adding/removal checks, solves cases where quest item removal (under specific conditions) incorrectly incompletes quests
 2014-06-07 11:46:57 -05:00
Sebastian Valle Herrera
906abd7956 Merge pull request #12204 from Trisjdc/map_enter 
Core/Maps: Allow logging players to enter in instances that have an encounter in progress
 2014-06-07 11:46:37 -05: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
joschiwald
32a3ecb986 Core/Spells: add missing spellradius to spell "Achievement Check" (fixes hor achievments) 2014-06-07 17:04:20 +02:00
Aokromes
91d9833916 DB/Creature: Fix Eva Sarkhoff 
By dr-j, closes #12224
 2014-06-07 11:17:50 +02:00
Warpten
84229f89e4 Merge pull request #12217 from Trisjdc/spell_corpse_explosion 
Core/Spells: Corpse Explosion should not be able to pick the Ghoul out of implicit targets
 2014-06-07 10:04:51 +02:00
Vincent-Michael
2cd0dce366 Core: Fix non pch build 2014-06-07 00:30:08 +02:00