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

8808 Commits

Author SHA1 Message Date
Shauren
adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
 2013-05-30 20:57:07 +02:00
Shauren
3a697d4c9f Core/Transports: Refactored methods used to calculate passenger offsets (made orientation argument optional) 2013-05-30 20:32:33 +02:00
Shauren
3a955f5141 Core/Movement: Added generatePath argument to MovePoint overload accepting Position arg 2013-05-30 20:29:49 +02:00
Spp
9664c0ab5c Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-30 13:18:29 +02:00
Spp
782ea4309a Core/Misc: Fix invalid pointer use after being deleted 2013-05-30 13:18:29 +02:00
Spp
7ccbbdddd8 Core/Collision: Fix memory leak 2013-05-30 13:18:29 +02:00
b4nan1
894a2434bf Update Chat.cpp 
this is better or?
 2013-05-29 14:59:37 +02:00
Shauren
cf23793b4b Tools/Extractors: Fixed typo in previous commit 2013-05-28 18:00:12 +02:00
Shauren
26a22dc3ab Tools/Extractors: Fixed many false positive err=2 messages and fixed many compile warnings 2013-05-28 17:37:10 +02:00
Shauren
99680242e8 Core/Players: Send only values update when turning gm mode on or accepting quests instead of recreating the object clientside 2013-05-28 15:19:37 +02:00
Shauren
80226fb38f Scripts/Halls of Reflection: Fixed a possible crash 2013-05-28 15:18:37 +02:00
Shauren
0938fdeeec Core/Misc: Fixed includes in AreaTrigger.cpp 2013-05-28 15:00:38 +02:00
Shauren
0e36c159eb Core/Misc: Compile warning fix 2013-05-28 14:28:34 +02:00
Shauren
7f089bb36a Core/AreaTrigger: Fixed compile 2013-05-28 14:20:50 +02:00
Pitcrawler
379d41735c DB/Quests: Fix some remaining issues from aaa1d9b749 
For example the missing floating visual and prevent the script from being started more than once.
 2013-05-27 14:29:46 +02:00
Gacko
583d865c24 Script/Gundrak: Codestyle 2013-05-26 21:58:03 +02:00
Gacko
cdf0bf4f44 Merge pull request #9858 from xjose93/Gundrak-DoorGaldarah 
Scripts/Gundrak: Fix Gal'darah door.
 2013-05-26 21:53:11 +02:00
BitCoding
aeb845ce05 Core/Handler : Fix Sharing quest 
http://www.elitepvpers.com/forum/wow-exploits-hacks-tools-macros/1836723-wow-quest-sharing-exploit-item-dupe-co.html
 2013-05-26 20:11:42 +02:00
Malcrom
b7dd7f0442 Core/SmartAI: Add ability to modify UNIT_FIELD_FLAGS_2 to SAI actions. 2013-05-26 13:22:21 -02:30
Shocker
8064b5a8f3 CMake: Include AreaTrigger directory in CMake file for game project too 2013-05-26 05:28:20 +03:00
Shocker
dc81fa0d57 CMake: Include AreaTrigger directory in CMake files 2013-05-26 05:07:49 +03:00
Shocker
cf4e8acf44 Core/AreaTrigger: Add object ToAreaTrigger() cast and AreaTrigger typeid/mask to Condition::GetSearcherTypeMaskForCondition 2013-05-26 04:56:43 +03:00
Shocker
1315306cfc Core/Spells: Implement SPELL_EFFECT_CREATE_AREATRIGGER (effect #179) 2013-05-26 04:47:10 +03:00
Shocker
f976c730a0 Core/Misc: Minor changes in recent commit 2013-05-26 04:34:12 +03:00
Shocker
1ef3dd29b8 Core/Misc: Implement AreaTrigger entity 
(might need some cleanup)
 2013-05-26 04:28:19 +03:00
Shocker
c0f94d944f Core/Misc: Rename AreaTrigger structure to AreaTriggerStruct 2013-05-26 02:25:58 +03:00
Shauren
9c0d69e33d Core/Items 
* Updated structure of SMSG_ENCHANTMENTLOG and send it when changing enchantments on item
* Implemented SMSG_SOCKET_GEMS_RESULT sent when socketing is finished
 2013-05-25 11:09:21 +02:00
xjose93
5a7cebe114 Scripts/Gundrak: Fix Gal'darah door. 2013-05-24 22:27:34 +02:00
Shauren
b688fc0ed5 Compile fix 2013-05-24 20:36:29 +02:00
Shauren
b8d75db4f1 Scripts/Halls of Reflection: Fixed gauntlet event 2013-05-24 20:06:58 +02:00
Shauren
f6241a07a3 Core/Commands: Warning fix 2013-05-24 20:05:41 +02:00
Shauren
590133c2b0 Missed change for previous commit 2013-05-24 18:33:33 +02:00
Shauren
bda68d3f9d Core/Commands: Fixed wrong field types used in db queries for pinfo command and output alive state if target is offline 2013-05-24 18:31:19 +02:00
Shauren
fd0397cbd2 Scripts/Halls of Reflection: Fixed a few possible crashes and cleaned up the code a bit 2013-05-24 18:03:07 +02:00
Vincent-Michael
a00d61485c Core: Fix warnings 2013-05-24 17:39:30 +02:00
Vincent-Michael
76e7ba886b Core: Fix logic fail in 77743ea13e 2013-05-24 17:28:17 +02:00
Vincent-Michael
77743ea13e Core: Fix non pch build 2013-05-24 17:12:06 +02:00
Machiavelli
94a13f6b50 Core/Player: Fix honor after duel exploit 
Closes #9852
 2013-05-24 13:55:04 +03:00
Aokromes
1136d90bac Scripts/Halls of Reflection: Falric/Marwyn 
This is a Work in Progress script by WishToDie based on the work found at http://www.trinitycore.org/f/topic/7192-patch-halls-of-reflections/
 2013-05-24 10:09:00 +02:00
Shocker
03aa05a799 Actually fix compile 
(sorry about the multitude of commits)
 2013-05-22 02:26:21 +03:00
Shocker
0ae066254d Another missing include 2013-05-22 01:39:22 +03:00
Shocker
0b8ad579df Compile fix after recent merge 2013-05-22 01:29:04 +03:00
Bezo
178cb300d1 Implement .arena commands - add new commands to the core to handle with arena teams. 
*.arena create [player] "arena name" [type]
	*.arena create "arena name" [type]
	*.arena disband [TeamID]
	*.arena rename "oldName" "newName"
	*.arena captain [TeamID] [Player]
	*.arena info [TeamID]
	*.arena lookup [name]
 2013-05-22 00:50:51 +03:00
Ascathor
cef217a2fa Core/Command: Remove excess parameter in LANG_PINFO_PLAYER 
Should fix the command on linux servers
 2013-05-21 19:59:00 +02:00
Vincent-Michael
75c4f28442 Core: Fix warnings 2013-05-21 19:18:55 +02:00
Aokromes
1cec36790c Merge pull request #9822 from wowpsp/master 
Support 1.12.3 (build 6141)
 2013-05-21 09:46:31 -07:00
Aokromes
78840516f1 Merge pull request #9827 from Ascathor/master 
Core/Command: Rework .PInfo and give more output and add Gender to trinity_string
 2013-05-21 09:41:18 -07:00
Aokromes
fa5ab46d87 Merge pull request #9808 from xjose93/ImproveLog12 
Core/Logs: Added more info for .send mail command.
 2013-05-21 09:39:51 -07:00
Spp
6c5529a5a0 Minor correction to merge 2013-05-21 11:46:52 +02:00
Spp
ec0688ade3 Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict) 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-05-21 11:27:12 +02:00