Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,399 Commits 4 Branches 146 Tags
bd48d0ebe71bd9c1d64ba86d52ed6f58a7336fa7
Commit Graph

7100 Commits

Author SHA1 Message Date
zorix
bd48d0ebe7 Core/Battleground: 
Add missing NULL pointer check for player if is not in world

Core/Spell:
Add absolute value for delta because can be nevgative

Close #10846
 2013-09-20 16:58:27 +02:00
Warpten
fb997c5f41 Core/Spells: Since patch 4.3.0 Vampiric Touch's backlash effect does not have any diminishing return. 2013-09-19 17:42:36 +02:00
Warpten
7f3240677a Core/Units: Fixed Moonkin forms for Trolls and Worgens, as well as epic Flight forms. 
Also (hack?)fixed Glyph of Arctic Wolf.
 2013-09-19 17:39:09 +02:00
Warpten
74d15fdea8 Core/Spells: Since patch 4.0.1 Hunter's Mark is limited to a 30 seconds duration in PvP. 2013-09-19 17:16:19 +02:00
Warpten
5fb9023517 Core/Spells: Do not bypass target checks when handling SPELL_AURA_ADD_TARGET_TRIGGER. 
Fixes ie. Chilblains being applied to the DK on login.
 2013-09-19 17:10:43 +02:00
Warpten
3deecf1da2 Core/Players: Implemented actionbar dropdown menus. 2013-09-19 13:16:43 +02:00
Vincent-Michael
e740332c0b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-15 23:20:13 +02:00
Nay
99f5a6c3d6 Core/BGs: Fix a TC_LOG_ERROR call 2013-09-15 14:57:12 +01:00
Nay
b72fd4c209 Merge pull request #10819 from Ascathor/master 
Core/Misc: Fixed some more issues found by static code analysis tools.
 2013-09-15 04:31:29 -07:00
Ascathor
4782cc4650 Core/Misc: Fixed some more issues found by static code analysis tools. 2013-09-15 13:17:37 +02:00
jackpoz
d0b42ee4ec Core/Spell: Fix Blood Tap array overflow 
Fix Blood Tap spellid 45529 accessing the 7th element of a size 6 array.
Coverity issue id 1023095.
 2013-09-15 12:31:48 +02:00
Vincent-Michael
85e49d0d14 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/worldserver/worldserver.conf.dist
 2013-09-13 23:21:50 +02:00
Aokromes
783e28e874 Core/Groups: Allow to configure the way in which instance reset message is sent, to the whole party (not blizzlike) or not. 
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2013-09-12 10:19:05 +01:00
Vincent-Michael
974bf5c427 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2013-09-11 22:35:45 +02:00
Nay
72d15086b2 Merge pull request #10776 from xjose93/ArenaTeamLogs 
Core/ArenaTeam: Add teamnames to logs.
 2013-09-11 11:52:51 -07:00
Nay
baa159dbd4 Merge pull request #10736 from jackpoz/localtime_race_condition 
Core/Thread: Fix race condition converting time values to local time
 2013-09-11 11:50:18 -07:00
joschiwald
77f90c1c67 Scripts/Halion: refixed Twilight Cutter 
Scripts/Garfrost: fixed forge jump
 2013-09-11 17:07:29 +02:00
xjose93
189a4b08fb Core/ArenaTeam: Add teamnames to logs. 2013-09-11 08:24:26 +02:00
Vincent-Michael
653ff9b243 Core/RBAC: Update RBACPermissions enum with 4.3.4 branch 2013-09-10 19:55:06 +02:00
Vincent-Michael
5583bcfeea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2013-09-10 19:53:43 +02:00
Spp
953575abfa Core/RBAC: Remove obsolete generic command permissions 
Note: If you have any custom command, CHECK THE SQLS BEFORE APPLYING
 2013-09-10 15:35:10 +02:00
Spp
78363e11b5 Core/RBAC: Move titles and wp commands to RBAC (using individual permissions) 2013-09-10 15:26:48 +02:00
Spp
b10241876e Core/RBAC: Move ticket commands to RBAC (using individual permissions) 2013-09-10 15:13:08 +02:00
Spp
68ab10ccd4 Core/RBAC: Move tele commands to RBAC (using individual permissions) 2013-09-10 15:01:39 +02:00
Spp
abbc6b2760 Core/RBAC: Move server commands to RBAC (using individual permissions) 2013-09-10 14:57:01 +02:00
Spp
7183a355d2 Core/RBAC: Move reset commands to RBAC (using individual permissions) 2013-09-10 14:33:27 +02:00
Spp
1f95f0b0b8 Core/RBAC: Move reload command to RBAC (using individual permissions) 2013-09-10 14:25:07 +02:00
Spp
4f632ee3ff Core/RBAC: Move quest commands to RBAC (using individual permissions) 2013-09-10 13:57:30 +02:00
Spp
efa194a7ce Core/RBAC: Move npc commands to RBAC (using individual permissions) 2013-09-10 13:48:57 +02:00
Spp
04b313557e Core/RBAC: Move modify commands to RBAC (using individual permissions) 2013-09-10 13:28:32 +02:00
Spp
4d36ce7405 Core/RBAC: Move mmap commands to RBAC (using individual permissions) 2013-09-10 13:08:39 +02:00
Spp
1038446278 Core/RBAC: Move misc commands to RBAC (using individual permissions) 2013-09-10 12:59:25 +02:00
Spp
ec1e88d888 Core/RBAC: Move send commands to RBAC (using individual permissions) 2013-09-10 12:24:40 +02:00
Spp
83cb44d79f Core/RBAC: Move pet commands to RBAC (using individual permissions) 
- Pet commands moved from cs_misc.cpp to own file
 2013-09-10 12:07:03 +02:00
Spp
1eee42433b Core/RBAC: Move group commands to RBAC (using individual permissions) 
- group commands moved from cs_misc.cpp to own file
- renamed groupsummon to "group summon"
 2013-09-10 11:45:59 +02:00
Vincent-Michael
ce742dc7a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
 2013-09-09 18:26:31 +02:00
Shauren
be5cf42ec3 Core/SmartAI: Fixed creatures using SAI not attacking its charmer after it breaks 
Closes #7601
 2013-09-09 17:44:07 +02:00
Shauren
fcf9552934 Core/SmartScripts: Fixed heap corruption in SMART_ACTION_EQUIP 
Closes #10739
 2013-09-08 12:15:13 +02:00
jackpoz
9578b5f87a Core/Thread: Fix race condition converting time values to local time 
Replace thread-unsafe localtime() http://www.cplusplus.com/reference/ctime/localtime/ with thread-safe portable ACE_OS::localtime_r() .

Helgrind log:
 Possible data race during read of size 4 at 0x6F183C0 by thread #1
 Locks held: none
  at 0x14E72E3: World::InitDailyQuestResetTime() (World.cpp:2772)
  by 0x14E3A01: World::SetInitialWorldSettings() (World.cpp:1790)
  by 0x101122A: Master::Run() (Master.cpp:164)
  by 0x101740C: main (Main.cpp:142)

 This conflicts with a previous write of size 4 by thread #2
 Locks held: none
  at 0x6C2D3BA: __tzfile_compute (tzfile.c:797)
  by 0x6C2D036: __tz_convert (tzset.c:627)
  by 0x164146C: LogMessage::getTimeStr(long) (Appender.cpp:23)
  by 0x1641550: LogMessage::getTimeStr() (Appender.cpp:31)
  by 0x1641722: Appender::write(LogMessage&) (Appender.cpp:80)
  by 0x1633FCE: Logger::write(LogMessage&) (Logger.cpp:83)
  by 0x16433D8: LogOperation::call() (LogOperation.cpp:29)
  by 0x16428A4: LogWorker::svc() (LogWorker.cpp:45)
 2013-09-07 14:37:54 +02:00
Aokromes
80516db48c Core/Battlegrounds: Allow random BG winner/loser rewards to be configurable 
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2013-09-07 13:32:04 +01:00
Machiavelli
287dc307bc Merge pull request #10724 from jackpoz/guild_disband_leak 
Core/Guild: Fix memory leak on Guild disband
 2013-09-07 05:07:28 -07:00
Aokromes
c3c5327fbd Merge pull request #10716 from Discover-/SAI_Owner_Or_Summoner 
Core/SAI: Make SMART_TARGET_OWNER_OR_SUMMONER also work for creatures su...
 2013-09-06 17:29:15 -07:00
joschiwald
f66120060a Scripts/Spells: drop obsolete code 2013-09-07 01:21:36 +02:00
Vincent-Michael
fab0f461c0 Core/Condition: Added CONDITION_SOURCE_TYPE_PHASE_DEFINITION define for only 4.3.4 branch 2013-09-07 00:16:10 +02:00
Vincent-Michael
be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
 2013-09-06 21:55:19 +02:00
Subv
8c70f8cb08 Merge pull request #10730 from jackpoz/scoreboard_fix 
Core/Battleground: Fix scoreboard
 2013-09-06 12:51:00 -07:00
jackpoz
3816fb440f Core/Battleground: Fix scoreboard 
Fix scoreboard broken in 07d793b94b . A local variable in a loop stored data of the iterator before incrementing it.
 2013-09-06 21:49:30 +02:00
Vincent-Michael
bc1a079b6c Core/SAI: Fix typo (i blame germans laziness) 2013-09-06 21:40:04 +02:00
joschiwald
adef15cd0f Core/Spells: add an other condition to SpellInfo::NeedsToBeTriggeredByCaster to correct spells with are wrongly triggered by target instead of caster 
- convert archavons rock shards to spellscript (now it works properly)
- add a spellscript for one spell that can't be corrected by this (and delete the sai hack, now i uses the correct spell)
 2013-09-06 20:57:38 +02:00
Machiavelli
577c9457e3 Update DBCStructure.h 2013-09-06 13:55:57 +01:00