Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,694 Commits 4 Branches 146 Tags
eab10cc6ae6932a44f249dc21d83cd488bcd7110
Commit Graph

19694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
eab10cc6ae Core/Achievement: Fix warning 2013-09-18 23:47:35 +02:00
Vincent-Michael
8af46f1c57 Core: Fix non pch build 2013-09-18 23:15:25 +02:00
joschiwald
05e72b4906 Core/Achievements: Implemented ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE 2013-09-18 22:55:10 +02:00
raczman
c9c12b9867 Merge pull request #10864 from zorix/auras 
Core/Auras: Fix removing auras when player reset talents or changing/leaving shapeshift

Close #10763
Close #10809
 2013-09-18 09:17:49 -07:00
zorix
cac1968ab7 Core/Auras: 
Fix removing auras when player reset talents or changing/leaving shapeshift

Close #10763
Close #10809
 2013-09-18 18:09:29 +02:00
Filip
aa6736cfcc DB/SAI: Missing addition 2013-09-18 09:05:33 +02:00
Filip
173a2478aa DB/SAI: Misc Fixes 
Authors @untaught @dr-j @MitchesD
Fixes #10847 Fixes #10844 Fixes #10830 Fixes #10829 Fixes #10830
 2013-09-17 20:35:13 +02:00
Filip
d80d36b1da DB/Error: Delete empty guid addon 2013-09-17 08:44:17 +02:00
w1sht0l1v3
0c7e27535f DB/SAI: The Murketh and Shaadraz Gateways. 2013-09-16 23:22:05 +03:00
Filip
1427302afa DB/SAI: So Far, So Bad 2013-09-16 18:12:40 +02:00
Filip
ef09e8bc7d DB/SAI: Fate of the Titans 2013-09-16 16:24:38 +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
Filip
9c7de29e93 DB/GO: Spell Focus for Trial of the Lake 
Closes #10807
 2013-09-14 14:20:41 +02:00
Filip
042df13506 DB/Update: Warm Up - credit update 
Fixes #10804
 2013-09-14 00:44:10 +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
Machiavelli
2e15f78305 Merge pull request #10801 from jackpoz/account_password_crashfix 
Core/Commands: Fix NULL dereference crash in .account password
 2013-09-13 12:09:26 -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
Warpten
cb4bf1fd97 Scripts/Ruby Sanctum: (Possibly) fixed Twilight Mending. 
I don't have the computer to even compile a core, please report back. My logics shouldn't be wrong here from what I can read on the wiki.

Ref #10016.
 2013-09-13 19:15:39 +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
Filip
ca4d53a844 DB/SAI: War is Hell 
Fixes #3915, By Vincent_Michael
 2013-09-12 09:14:20 +02:00
Nay
38f5c916cf Core: Fix non PCH build 2013-09-11 20:58:49 +01:00
Filip
0e21292892 DB/SAI: Strengthen the Ancients addition 
Fixes #10778
 2013-09-11 20:59:27 +02: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
Filip
97db57703f DB/Cond: Error fix-up 2013-09-11 08:59:41 +02:00
xjose93
189a4b08fb Core/ArenaTeam: Add teamnames to logs. 2013-09-11 08:24:26 +02:00
Nay
6d3ebe925f SQL: Update sql/base/auth_database.sql 2013-09-10 23:21:27 +01:00
Filip
9379813251 DB/Update: Few updates 
Fixes #10758
 2013-09-10 20:53:24 +02:00
Vincent-Michael
653ff9b243 Core/RBAC: Update RBACPermissions enum with 4.3.4 branch 2013-09-10 19:55:06 +02:00