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
21,229 Commits 4 Branches 146 Tags
97fc632b9d32727480d42e7c056dff72ead8fb4e
Commit Graph

21229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
97fc632b9d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp
 2013-09-01 23:48:40 +02:00
Vincent-Michael
37bdc7a62b DB/SAI: Fix quest credit for quest "Laying Waste to the Unwanted" 2013-09-01 23:34:07 +02:00
Shauren
f388ceb8bd Merge pull request #10687 from jackpoz/farsight_fix 
Core/Spell: Fix farsight log error "Player requests non-existing seer"
 2013-09-01 13:52:05 -07:00
jackpoz
1417f62453 Core/Spell: Fix farsight log error "Player requests non-existing seer" 
Partially revert 167ca565d0 which wrongly used TYPEMASK_UNIT to denote Creatures and Players, so when a Player sent farsight opcode with another Player as target HandleFarSightOpcode() couldn't find the right Unit filtering by typemask TYPEMASK_SEER.
 2013-09-01 22:35:48 +02:00
Shauren
e8a566b3b1 Core/Objects: Removed obsolete code 2013-09-01 22:30:07 +02:00
ZxBiohazardZx
99c94f34e4 DB/Misc: Fix startup errors & typo 2013-09-01 22:00:52 +02:00
Vincent-Michael
a43e97f02d SQL: Fix fail in 7facda2002 2013-09-01 21:45:22 +02:00
ZxBiohazardZx
7facda2002 DB/Loot: make sure to update & delete the right templates, updated file! 2013-09-01 21:41:12 +02:00
ZxBiohazardZx
ed38441271 DB/Loot: Rework skinning_loot_template definitions, removing the horrible definitions ripped from wowhead and replacing them with a proper defined set of loot 
Closes #10610
 2013-09-01 21:29:34 +02:00
Shauren
79d1b7f543 Scripts/Misc: Removed unused fields and fixed a warning about uninitialized value 2013-09-01 20:33:52 +02:00
Vincent-Michael
591b90f3ce DB/SAI: Fix quest credit for quest "Torching Sunfury Hold" 2013-09-01 19:57:55 +02:00
Vincent-Michael
8897f805a0 DB/SAI: Fix quest credit for quest "Building a Perimeter" 
Note: Quest need event script
 2013-09-01 19:48:13 +02:00
Vincent-Michael
ff8eab2d9f DB/SAI: Fix quest credit for quest "Burn in Effigy" 
Note: Quest need event script
 2013-09-01 19:41:16 +02:00
Nay
cd11366690 Merge pull request #10694 from jackpoz/loopcounter_race_condition 
Core/Thread: Fix race condition in FreezeDetectorRunnable
 2013-09-01 10:05:39 -07:00
Nay
582686090d Merge pull request #10685 from Discover-/SmartAI-Target-Casting 
Core/SmartAI: Add a spellid to SMART_EVENT_TARGET_CASTING. If left on 0,...
 2013-09-01 10:03:45 -07:00
Nay
c4bd91ceb9 Merge pull request #10690 from Discover-/SmartAI-Set-Home-Pos 
Core/SAI: Allow using SMART_ACTION_SET_HOME_POS with multiple target typ...
 2013-09-01 10:03:09 -07:00
Nay
b324646005 Merge pull request #10689 from Discover-/SmartAI-Killed-Monster-Credit 
Core/SAI: Also use loot recipient for SMART_ACTION_CALL_KILLEDMONSTER wh...
 2013-09-01 10:02:43 -07:00
Nay
a762df0aba Core/SAI: Fix processing linked events when return is used in ProcessAction 
Thanks Discover-

Closes #10688
 2013-09-01 18:01:59 +01:00
Nay
271a1011ca Dep/G3D: Fix encoding of G3D-v8.0_hotfix8.diff 2013-09-01 17:50:48 +01:00
jackpoz
e1e1067d17 Core/Thread: Fix race condition in FreezeDetectorRunnable 
Fix race condition by replacing a static volatile uint32 with proper atomic thread-safe ACE_Atomic_Op<ACE_Thread_Mutex, uint32>, incremented in WorldRunnable::run() at each world loop and read in FreezeDetectorRunnable::run().

Helgrind log:
 Possible data race during read of size 4 at 0x2400D54 by thread #12
 Locks held: none
    at 0x100FEA6: FreezeDetectorRunnable::run() (Master.cpp:106)
    by 0x1637892: ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186)
    by 0x518F555: ACE_OS_Thread_Adapter::invoke() (OS_Thread_Adapter.cpp:103)
    by 0x4C2B5AD: mythread_wrapper (hg_intercepts.c:219)
    by 0x61DAB4F: start_thread (pthread_create.c:304)
    by 0x6C69A7C: clone (clone.S:112)

 This conflicts with a previous write of size 4 by thread #9
 Locks held: none
    at 0x100C23E: WorldRunnable::run() (WorldRunnable.cpp:55)
    by 0x1637892: ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186)
    by 0x518F555: ACE_OS_Thread_Adapter::invoke() (OS_Thread_Adapter.cpp:103)
    by 0x4C2B5AD: mythread_wrapper (hg_intercepts.c:219)
    by 0x61DAB4F: start_thread (pthread_create.c:304)
    by 0x6C69A7C: clone (clone.S:112)
 2013-09-01 18:49:49 +02:00
Nay
6f9099c0fb Merge pull request #10693 from Chaplain/g3d-typos 
Dep/G3D: Fix a typo in Vector3int32 += operator
 2013-09-01 09:41:45 -07:00
Shauren
6b60877e3e Core/NetworkIO: Fixed memory leak 2013-09-01 17:48:47 +02:00
Chaplain
a0f4177f5d Dep/G3D: Fix a typo in Vector3int32 += operator 2013-09-01 18:19:57 +03:00
Nay
cdc71659e7 DB/TrinityString: Fix an issue with non-ascii characters encoding 
Thanks Warpten for the fix (always import files with mysql --default-char-set=utf8 < file)
Thanks eragon for reporting the issue and testing the fix
 2013-09-01 14:19:45 +01:00
Nay
8dfb977cc6 Dep/G3D: Update Readme.txt 2013-09-01 13:37:57 +01:00
Discover-
8ba8190773 Core/SAI: Allow using SMART_ACTION_SET_HOME_POS with multiple target types 2013-09-01 13:56:35 +02:00
Discover-
7d7fc7b662 Core/SAI: Also use loot recipient for SMART_ACTION_CALL_KILLEDMONSTER when target is SMART_TARGET_SELF (used in four cases in a clean TDB which will be fixed by this) 2013-09-01 13:44:08 +02:00
joschiwald
e526e14d7e Core/Scripts: fix build 2013-09-01 13:43:56 +02:00
joschiwald
5c5b78c77c Scripts/Ulduar: fix mark of the faceless and add missing door handling 2013-09-01 13:25:52 +02:00
Discover-
016dac995e Core/SmartAI: Add a spellid to SMART_EVENT_TARGET_CASTING. If left on 0, it checks for all spells (like it did without these changes) 2013-09-01 10:49:29 +02:00
Vincent-Michael
27bc3b1751 Core/Creatures: Added error log for SPELL_AURA_CONTROL_VEHICLE auras in creature_addon / creature_template_addon 2013-09-01 02:21:04 +02:00
Shauren
d6fdd05493 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-01 00:59:58 +02:00
Nay
1bbd726e88 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-08-31 22:48:01 +01:00
Nay
0394238a29 Dep/G3D: Fix a typo in Matrix4 == operator 2013-08-31 22:44:10 +01:00
Machiavelli
eab035eca6 Revert e6761ea2aa 2013-08-31 21:25:53 +01:00
Nay
16fcac1991 Core/RBAC: Move bf commands to RBAC (using individual permissions) 2013-08-31 21:02:14 +01:00
Vincent-Michael
6c8d0e5405 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-31 21:52:15 +02:00
Machiavelli
e6761ea2aa Core/NetworkIO: Fix memory leak 
Packet headers not being correctly deallocated.
 2013-08-31 18:56:58 +01:00
Vincent-Michael
22b71244a0 DB/Creature: Fix cords for quest "Death Comes From On High" 2013-08-31 19:33:14 +02:00
Vincent-Michael
e753a47162 DB/Sai: Fix quest credit for quest "Blessing of Incineratus" 2013-08-31 18:29:51 +02:00
Vincent-Michael
842b807757 DB/Creature: Add missing sql in 8fd1f46192 2013-08-31 17:54:07 +02:00
Vincent-Michael
8fd1f46192 Scripted: Fix warning 2013-08-31 17:52:47 +02:00
Vincent-Michael
b1721a65ee Core/Spells: Fix quest credit for quest "Death Comes From On High" 2013-08-31 17:42:04 +02:00
joschiwald
ae36ddefec Core/Scripts: add creature_text to pet mojo 
Scripts/Karazhan/Moroes: cleanup a bit (should fixes mem leak)
 2013-08-31 16:48:37 +02:00
Filip
a2ee732a38 DB/SAI: The Lost Mistwhisper Treasure (12575) 2013-08-31 14:53:46 +02:00
Nay
2d93059114 SQL: Fix a typo in e375c6075b 2013-08-31 12:45:44 +01:00
Vincent-Michael
1501e95876 SQL: Fix typo in 44a317b71f 2013-08-31 00:03:35 +02:00
Vincent-Michael
44a317b71f DB/Reputation: Move quest_repeatable_rate after quest_monthly_rate 2013-08-30 23:58:52 +02:00
Vincent-Michael
38bb6fe8e7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
 2013-08-30 23:46:24 +02:00
Vincent-Michael
3f6296b65e Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-08-30 23:09:01 +02:00