Commit Graph
30447 Commits
Author SHA1 Message Date
Ric101 6820ca8bda Core/Conditions: Implement CONDITION_CREATURE_TYPE - 24 2013-05-25 07:51:23 +01: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
Aokromes 33afdad507 Update 2013_05_24_00_world_misc.sql 2013-05-24 16:25:17 +03:00
Machiavelli 94a13f6b50 Core/Player: Fix honor after duel exploit
Closes #9852
2013-05-24 13:55:04 +03:00
Aokromes bf864e7a16 Update 2013_05_24_00_world_misc.sql 2013-05-24 12:13:12 +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
ZxBiohazardZx 364f08fcbc Merge pull request #9848 from Foldor/master
Remove a duplicate semicolon
Closes #9848
2013-05-23 15:08:51 -07:00
Pitcrawler c9723d0a05 DB/Quests: Fix script 2013-05-23 23:33:57 +02:00
Pitcrawler 62ded51557 DB/Quests: Fix text type 2013-05-23 23:23:08 +02:00
Pitcrawler e44045bcd8 DB/Quests: Fix The Heart of the Storm, closes #9041 2013-05-23 23:20:48 +02:00
Pitcrawler e2cf1b0186 DB/Quests: Fix Conversing With the Depths, closes #3048 2013-05-23 23:14:20 +02:00
Foldor 80962bc991 Remove a duplicate Semicolon 2013-05-23 16:53:23 +01:00
ZxBiohazardZx 88c41a44ef commit: added newline at eof 2013-05-23 00:03:25 +02:00
kirkhammett 02d25e87c9 DB/SAI: convert EAI of some Redridge Creatures
Closes #9760
2013-05-22 22:00:20 +02:00
dr-j 4f7be6a6ea DB/SAI: Add support for Quest 11279: Green Egg Whelps
Closes #9781
2013-05-22 21:57:51 +02:00
foldor 2337639a59 DB/Gameobject: update spawnpositions
Closes #9794
2013-05-22 21:53:54 +02:00
Kirkhammett 8943ad1640 DB/SAI: Add support for Matthias Lehner Quest Chain
included Dr-j comment on PR
Closes #9783
2013-05-22 21:50:45 +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
Aokromes ec7dda85c3 Rename 2013_05_xx_xx_world_misc.sql to 2013_05_21_01_world_misc.sql 2013-05-22 01:22:52 +03:00
Aokromes e5bdb8f90a Merge pull request #9842 from Bezo/Arena
Core/Command: Implement .arena commands
2013-05-21 15:11:06 -07: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
Aokromes 195196361d Merge pull request #9840 from Ascathor/master
Core/Command: Remove excess parameter in LANG_PINFO_PLAYER
2013-05-21 11:03:56 -07: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
Kinzcool 0dc9353746 DB/Triggers: Added "anti-exploration" teleport for Scholomance. 2013-05-19 22:06:09 -04: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
Gacko b88133b366 DB: Several runtime error fixes 2013-05-20 01:35:02 +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
Vincent-Michael 1eac9c2944 DB/Creature: Fix startup error (thx Runico) 2013-05-19 23:57:03 +02:00