Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-17 15:39:48 +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
Aokromes
61d6b69166 Merge pull request #12225 from Trisjdc/event_map_move 
Core/Utils: Move EventMap to Util.h
 2014-06-07 00:08:02 +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
Michael
8207aff0d6 Core/NetworkIO: Added latency info for opcodes overflow log 2014-06-06 19:41:57 +02:00
Subv
ac6b8d2f15 Core/Build: Fixed build 2014-06-06 12:08:42 -05:00
Trisjdc
eae18d8ed0 Core/Utils: Move EventMap to Util.h 2014-06-06 11:14:32 +01:00
Trisjdc
b4b3e6f3a2 Scripts/Items: Imp in a Ball 2014-06-06 11:01:36 +01:00
Trisjdc
bb01c60a52 Core/Players: Improve quest item adding/removal checks, solves cases where quest item removal (under specific conditions) incorrectly incompletes quests 2014-06-06 10:41:45 +01:00
Subv
5023000c56 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases 
Conflicts:
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
 2014-06-05 19:49:03 -05:00
Aokromes
455690438f DB/Quest: Fix some missing quest texts 
By Crysicle, closes #12214 closes #12209
 2014-06-06 02:39:56 +02:00
jackpoz
d565c2b303 Core/Talents: Align server checks to Client limits 
Set the max amount of talents to process in CMSG_LEARN_PREVIEW_TALENTS_PET to 30 ( 24 talents rounded up ).
 2014-06-05 22:50:11 +02:00
jackpoz
7d623eed18 Core/Talents: Align server checks to Client limits 
Set the max amount of talents to process in CMSG_LEARN_PREVIEW_TALENTS to 150 ( 44 talents for 3 trees rounded up ).
 2014-06-05 22:19:02 +02:00
Subv
2086f18f7b Core/Phases: Removed more SetPhaseMask uses 2014-06-05 13:05:29 -05: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
Sebastian Valle Herrera
36102bea64 Merge pull request #12039 from Trisjdc/creature_ai_talk 
Core/CreatureAI: Implement CreatureAI::TalkToMap for all your map-wide talking needs
 2014-06-05 10:50:23 -05:00
Sebastian Valle Herrera
42d4144f90 Merge pull request #12045 from Trisjdc/session_expire 
Core/WorldSession: After sudden disconnects, session should persist for a minute
 2014-06-05 10:49:28 -05:00
Sebastian Valle Herrera
d098a3ce8d Merge pull request #12219 from Trisjdc/spell_swift_retribution 
Core/Spells: Swift Retribution should be reapplied when needed to be able to gain spellmods
 2014-06-05 10:13:08 -05:00
Shauren
22b04d39bf Merge pull request #12220 from Trisjdc/spelll_triggerflag_check 
Core/Spells: *Properly* solve the Disarm vs Bladestorm issue
 2014-06-05 14:07:48 +02:00
Shauren
5bb86ca7db Merge pull request #12218 from Trisjdc/tocr_despawn_time 
Scripts/ToCr: Bosses shouldn't despawn so quickly
 2014-06-05 14:06:34 +02:00
Trisjdc
afb7c705c2 Core/Spells: *Properly* solve the Disarm vs Bladestorm issue 2014-06-05 11:48:43 +01:00
Trisjdc
2282a4c359 Core/Spells: Swift Retribution should be reapplied when needed to be able to gain spellmods 2014-06-05 11:43:59 +01:00
Trisjdc
d4bdfebd9e Scripts/ToCr: Bosses shouldn't despawn so quickly 2014-06-05 11:37:24 +01:00
Trisjdc
d05bf542a5 Core/Spells: Corpse Explosion should not be able to pick the Ghoul out of implicit targets 2014-06-05 11:35:32 +01:00
blub
700baded7a Merge pull request #12215 from Trisjdc/warning_fix 
Warning fix
 2014-06-04 20:14:29 +02:00
Trisjdc
2a6d3fa67c Warning fix 2014-06-04 19:12:02 +01:00
jackpoz
bd45a0bba9 Core/Tickets: Don't try to save the same sub-survey more than once 2014-06-04 19:56:13 +02:00
Shauren
84d0094ffa Core/Tickets: Sprinkled some transaction magic on HandleGMSurveySubmit 2014-06-03 23:24:00 +02:00
Subv
74be070d1c Core/Phases: Update transport visibility when changing phases 2014-06-03 13:08:54 -05:00
Shauren
6eee75a4f7 Core/Battle.net: Removed sending "b", it's supposed to stay secret 2014-06-03 19:15:12 +02:00
Shauren
7a27492071 Core/Crypto: Refactored HmacHash to make it easier to use with different hash algorithms 2014-06-03 18:15:35 +02:00
Gacko
79f01de094 DB/Creature: Remove phaseMask hack of Shadowmoon Tuber Nodes 
Related to 26370223a0
 2014-06-03 10:04:03 +02:00
Trisjdc
d12737d9bb Core/WorldSession: After sudden disconnects, session should persist for a minute 
- With this change, if a player alt-f4, he'll only fade from world after a minute
 2014-06-03 01:12:34 +01:00
Trisjdc
18868f5cbd Core/Maps: Allow logging players to enter in instances that have an encounter in progress 2014-06-03 00:57:36 +01:00
Trisjdc
d99f0362cb Core/Auras: Update model overwriting rules for SPELL_AURA_TRANSFORM 2014-06-03 00:39:20 +01:00
Sebastian Valle Herrera
409a19e623 Merge pull request #12201 from Unholychick/patch-2 
Core/Spells: Implement SPELL_ATTR4_FIXED_DAMAGE
 2014-06-02 18:23:17 -05:00
Sebastian Valle Herrera
d41779f8fa Merge pull request #12135 from Trisjdc/event_map_extension 
Core/Util: A couple useful new functions for EventMap
 2014-06-02 18:10:08 -05:00
Trisjdc
8db02c52ac Core/Util: A couple useful new functions for EventMap, as well as getting rid of some old junk 2014-06-02 23:59:35 +01:00
Sebastian Valle Herrera
d097a5ec97 Merge pull request #12182 from Xter/rbac 
Core/RBAC: fix RBAC_PERM_COMMANDS_BE_ASSIGNED_TICKET and RBAC_PERM_LOG_G...
 2014-06-02 17:47:40 -05:00
Subv
558642b26e Core/Phases: Removed some phasemask handling, more to come 2014-06-02 17:43:59 -05:00
Sebastian Valle Herrera
f5e6292b48 Merge pull request #12032 from Trisjdc/haste_formula 
Core/Players: Fix haste rating formulas
 2014-06-02 17:23:16 -05:00
leak
0fa3a4923e Replaced LockedQueue ACE lock with std::mutex 2014-06-02 23:01:01 +02:00
Subv
3df25bb64c Core/Phases: Added missing sql and changed how phase_definitions will work, implementation still missing 2014-06-02 15:53:54 -05:00
jackpoz
0c1ddc970d Core/Misc: Kick player in case of multiple CMSG_PLAYER_LOGIN 
Kick player in addition to logging an error in case of multiple CMSG_PLAYER_LOGIN.
 2014-06-02 17:03:31 +02:00
Lucas
82cefb661d Core/Spells: Implement SPELL_ATTR4_FIXED_DAMAGE 
Spells with this attribute will ignore damage taken auras except for mechanic damage taken (trauma, etc) and will ignore resilience because the damage caused by those spells is based off another spell' damage
 2014-06-02 15:41:02 +02:00
Subv
226f1dedb4 Core/Phases: Use a O(n) operation when comparing phases instead of a O(n^2) one 2014-06-01 23:06:17 -05:00
Subv
18924654a3 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases 2014-06-01 22:43:24 -05:00
Subv
48ec2df81f Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4 
Put here for peer review.
 2014-06-01 22:27:29 -05:00
Kinzcool
289a5c4318 DB/Phases: Added PhaseId & PhaseGroup fields for coming phasing changes 2014-06-01 22:13:08 -04:00
leak
68e22ad311 Replaced ACE based typedefs for fixed width ints with C++11 versions 2014-06-01 20:55:31 +02:00
Kinzcool
edced30576 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-06-01 13:42:07 -04:00
Gacko
26370223a0 Script/Shadowmoon Valley: Remove hack in npc_shadowmoon_tuber_node. 
This script will be converted to SAI (if possible) later.
 2014-06-01 19:39:57 +02:00