Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-01 22:56:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,397 Commits 4 Branches 146 Tags
7f3240677a6ffd57eb3286993d0202c70c4fd6bc
Commit Graph

9643 Commits

Author SHA1 Message Date
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
zorix
ff274cda0b Core/Script: 
Added missing NULL pointer check
 2013-09-18 23:31:41 +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
0177d1c4d4 Merge pull request #10822 from jackpoz/collisions_nullterm_string 
Tools/VMAP: Fix not null terminated string
 2013-09-15 07:01:58 -07:00
Nay
478ec28e6d Merge pull request #10823 from jackpoz/icewall_overflow 
Scripts/HoR: Fix possible array overflow
 2013-09-15 06:58:24 -07:00
Nay
99f5a6c3d6 Core/BGs: Fix a TC_LOG_ERROR call 2013-09-15 14:57:12 +01:00
jackpoz
6477f8c453 Scripts/HoR: Fix possible array overflow 
Fix possible array overflow reported by coverity, issue id 1062436 .
 2013-09-15 14:12:54 +02:00
jackpoz
a5134971cb Tools/VMAP: Fix not null terminated string 
Fix not null terminated string in vmap assembler tool, fix coverity issue id 1010351 .
 2013-09-15 13:38:54 +02: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
raczman
aaff97db51 Merge pull request #10821 from jackpoz/blood_tap_overflow 
Core/Spell: Fix Blood Tap array overflow
 2013-09-15 03:37:49 -07: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
Jorge
f0cd684cd1 Merge pull request #10800 from jackpoz/log_race_condition 
Core/Logs: Fix race condition in Log
 2013-09-13 12:22:31 -07:00
jackpoz
6581d7db85 Core/Commands: Fix NULL dereference crash in .account password 
Fix NULL dereference crash in .account password added in bd8d0cfbce
Fixes #10791
 2013-09-13 20:57:53 +02:00
jackpoz
1b3575ba77 Core/Logs: Fix race condition in Log 
Fix race condition in Log by using atomic operators.

Helgrind log:
 Possible data race during read of size 8 at 0x7379D98 by thread #1
 Locks held: none
  at 0x15AE9C7: AppenderFile::_write(LogMessage const&) (AppenderFile.cpp:59)
  by 0x15ADFF8: Appender::write(LogMessage&) (Appender.cpp:106)
  by 0x159F14E: Logger::write(LogMessage&) (Logger.cpp:83)
  by 0x15A215B: Log::write(LogMessage*) (Log.cpp:290)
  by 0x15A200F: Log::vlog(LogFilterType, LogLevel, char const*, __va_list_tag*) (Log.cpp:272)
  by 0x15A2682: Log::outInfo(LogFilterType, char const*, ...) (Log.cpp:364)
  by 0xF7DA28: Master::Run() (Master.cpp:296)
  by 0xF835E8: main (Main.cpp:142)

 This conflicts with a previous write of size 8 by thread #10
 Locks held: none
  at 0x15AE9D7: AppenderFile::_write(LogMessage const&) (AppenderFile.cpp:59)
  by 0x15ADFF8: Appender::write(LogMessage&) (Appender.cpp:106)
  by 0x159F14E: Logger::write(LogMessage&) (Logger.cpp:83)
  by 0x15A215B: Log::write(LogMessage*) (Log.cpp:290)
  by 0x15A200F: Log::vlog(LogFilterType, LogLevel, char const*, __va_list_tag*) (Log.cpp:272)
  by 0x15A2682: Log::outInfo(LogFilterType, char const*, ...) (Log.cpp:364)
  by 0xF7EC1F: FreezeDetectorRunnable::run() (Master.cpp:98)
  by 0x15A5B3E: ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186)

 Address 0x7379D98 is 88 bytes inside a block of size 96 alloc'd
  at 0x4C2C857: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
  by 0x15A0FE3: Log::CreateAppenderFromConfig(char const*) (Log.cpp:150)
  by 0x15A1AED: Log::ReadAppendersFromConfig() (Log.cpp:244)
  by 0x15A31B4: Log::LoadFromConfig() (Log.cpp:469)
  by 0x15A053B: Log::Log() (Log.cpp:35)
  by 0xF75CD1: ACE_Singleton<Log, ACE_Thread_Mutex>::ACE_Singleton() (Singleton.inl:13)
  by 0xF754A4: ACE_Singleton<Log, ACE_Thread_Mutex>::instance() (Singleton.cpp:91)
  by 0xF8351A: main (Main.cpp:135)
 2013-09-13 19:59:50 +02:00
Machiavelli
bd8d0cfbce Fix build 2013-09-12 16:42:22 +01:00
Nay
4df862dd4c Merge pull request #10792 from Ascathor/master 
Core/Command: Fixing .account password to no longer crash
 2013-09-12 07:50:07 -07:00
Ascathor
8c596b97bf Core/Command: Fixing .account password to no longer crash 
And add some comments to it.
 2013-09-12 16:39:41 +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
38f5c916cf Core: Fix non PCH build 2013-09-11 20:58:49 +01:00
Nay
e4ed64a6b7 Merge pull request #10782 from Ascathor/master 
Core/Commands: Fixing some problems with .account email
 2013-09-11 11:55:31 -07:00
Ascathor
3861ba5a25 Core/Commands: Fixing some problems with .account email 2013-09-11 20:54:04 +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
deb2fb7939 Merge pull request #10781 from jackpoz/create_pet_creaturetemplate 
Scripts/Commands: Retrieve Creature template in HandlePetCreateCommand f...
 2013-09-11 11:52:03 -07:00
Nay
9ca34c2e02 Merge pull request #10779 from jackpoz/murmur_unused_field 
Scripts/Murmur: Remove unused field
 2013-09-11 11:51:29 -07:00
Nay
38391cd774 Merge pull request #10737 from jackpoz/clock_fix 
Core/Timer: Better handle system clock changes
 2013-09-11 11:50:50 -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
jackpoz
dfc8a092a6 Scripts/Commands: Retrieve Creature template in HandlePetCreateCommand from Creature itself 
CreatureTemplate can be retrieved directly from the Creature itself instead of using ObjectMgr::GetCreatureTemplate(id) .
 2013-09-11 20:31:50 +02:00
jackpoz
625e47e9d3 Scripts/Murmur: Remove unused field 
Remove unused class field.
 2013-09-11 20:00:29 +02:00
joschiwald
77f90c1c67 Scripts/Halion: refixed Twilight Cutter 
Scripts/Garfrost: fixed forge jump
 2013-09-11 17:07:29 +02:00
MitchesD
3420c70a47 Scripts/PitOfSaron: some changes 
Closes #10740
 2013-09-11 15:52:59 +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