Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-02 23:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,618 Commits 4 Branches 146 Tags
ef8a08ee2c52cd00f64f0283a8862bace4e09b21
Commit Graph

9086 Commits

Author SHA1 Message Date
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
Spp
86afccc8ff Merge branch 'master' into 4.3.4 (Only the Logging System One) 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Tools/PlayerDump.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
 2013-05-21 09:55:09 +02:00
Spp
1b6fb2b695 Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review) 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Movement/Spline/MovementTypedefs.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-05-21 09:41:13 +02:00
Spp
82dc639882 Core/Misc: Reduce the scope of ReadMovementInfo (Unit -> Player) 2013-05-21 08:53:44 +02:00
Spp
00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02:00
Spp
d3c2af0f66 Core/Build: Fix compile under Ubuntu 13.04 and openSUSE 12.3 (and probably other new distros) 
Closes #9832
Closes #9740
 2013-05-21 08:36:52 +02:00
Ascathor
051d6ef925 Core/Command: Rework PInfo and give more output and add Gender to trinity_string 
* Prints out in several strings instead of few
* Leaves unnecessary ones out (e.g. phase for GMs)
* Some code documentation included (including doxygen)
* Cleaner code (partly)
* Prints more content, e.g.:
** Localized Class- and Race names
** Localizable Gender names
** Current experience, required experience
** And more

Shoutouts to @Nay, @Subv, @Shauren and several others from the irc

Core/Command: Rework PInfo and give more output and add Gender to trinity_string
 2013-05-20 03:09:34 +02:00
joschiwald
95d2ad32f7 Core/Spells: Fix spell script "spell_yogg_saron_malady_of_the_mind" 
Closes #9813
 2013-05-20 00:13:36 +02:00
wowpsp
897d5dadff Merge pull request #1 from TrinityCore/master 2013-05-19 04:31:56 -07:00
Shauren
695c8cd7b4 Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-19 11:31:17 +02:00
Shauren
7da33b6bce Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-19 11:15:54 +02:00
Shauren
933f50558b Core/Spells: Fixed channeling spells with infinite duration 2013-05-19 10:55:29 +02:00
Shauren
8633452f8d Scripts/Misc: Fixed many scripts not executing one of their actions because of an event with id = 0 2013-05-19 10:52:39 +02:00
Shauren
8e339e8558 Reverted part of 60a88a08f5 
All 8 bytes must be read from file to match output from vmap4extractor
 2013-05-18 21:33:03 +02:00
Shauren
7058d8bb4c Core/Collision: Corrected logic for closing source file in WorldModel_Raw::Read, fixes resource leak if method succeeds and prevents double free if it fails. 
Closes #9823
 2013-05-18 21:25:26 +02:00
wowpsp
529e8fba82 support 1.12.3 (build 6141) 2013-05-18 22:03:18 +08:00
Shauren
d6709ed610 Reverted part of 8be181c7e6 that was not supposed to be pushed 2013-05-18 11:49:46 +02:00
Subv
6ce9e7f185 Core/Build: Fixed the build 2013-05-17 23:20:47 -05:00
Subv
98ad7309c9 * Another small batch of fixes from static analysis tool. 2013-05-17 23:08:28 -05:00
Subv
60a88a08f5 * Some more static analysis issues fixed. 2013-05-17 22:29:58 -05:00
Subv
1c3121b9cf * Another issue found by static analysis fixed. 2013-05-17 21:56:31 -05:00
Subv
25acef2572 * Batch of fixes for issues found by static analysis. 2013-05-17 21:11:18 -05:00
Nay
7c18bbb95f Merge pull request #9815 from Ascathor/master 
Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class and race string.
 2013-05-17 17:52:35 -07:00