aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-28Core/AreaTrigger: Fixed compileShauren
2013-05-26CMake: Include AreaTrigger directory in CMake file for game project tooShocker
2013-05-26CMake: Include AreaTrigger directory in CMake filesShocker
2013-05-26Core/AreaTrigger: Add object ToAreaTrigger() cast and AreaTrigger ↵Shocker
typeid/mask to Condition::GetSearcherTypeMaskForCondition
2013-05-26Core/Spells: Implement SPELL_EFFECT_CREATE_AREATRIGGER (effect #179)Shocker
2013-05-26Core/Misc: Minor changes in recent commitShocker
2013-05-26Core/Misc: Implement AreaTrigger entityShocker
(might need some cleanup)
2013-05-26Core/Misc: Rename AreaTrigger structure to AreaTriggerStructShocker
2013-05-21Minor correction to mergeSpp
2013-05-21Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)Spp
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-21Merge branch 'master' into 4.3.4 (Only the Logging System One)Spp
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-21Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as ↵Spp
"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-21Core/Misc: Reduce the scope of ReadMovementInfo (Unit -> Player)Spp
2013-05-21Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic ↵Spp
changes
2013-05-21Core/Build: Fix compile under Ubuntu 13.04 and openSUSE 12.3 (and probably ↵Spp
other new distros) Closes #9832 Closes #9740
2013-05-19DB/Triggers: Added "anti-exploration" teleport for Scholomance.Kinzcool
2013-05-20DB: Several runtime error fixesGacko
2013-05-20Core/Spells: Fix spell script "spell_yogg_saron_malady_of_the_mind"joschiwald
Closes #9813
2013-05-19DB/Creature: Fix startup error (thx Runico)Vincent-Michael
2013-05-19MMAPS: Update mmaps_generator readme.txt with thread infoNay
2013-05-19Cmake: Fix typo in msvc/settings.cmakeNay
2013-05-19Core/Misc: Another batch of fixes for issues found by static analysisShauren
2013-05-19Core/Misc: Another batch of fixes for issues found by static analysisShauren
2013-05-19Core/Spells: Fixed channeling spells with infinite durationShauren
2013-05-19Scripts/Misc: Fixed many scripts not executing one of their actions because ↵Shauren
of an event with id = 0
2013-05-18Reverted part of 60a88a08f5e85c1986aee49f9bfdbf8fa254f370Shauren
All 8 bytes must be read from file to match output from vmap4extractor
2013-05-18Core/Collision: Corrected logic for closing source file in ↵Shauren
WorldModel_Raw::Read, fixes resource leak if method succeeds and prevents double free if it fails. Closes #9823
2013-05-18Reverted part of 8be181c7e60daf9833044da61b379c2136892c37 that was not ↵Shauren
supposed to be pushed
2013-05-18Buildsystem/MSVC: Fix a minor issue with /Zm heap allocation parameters not ↵click
being used 32-bit environment
2013-05-17Core/Build: Fixed the buildSubv
2013-05-17* Another small batch of fixes from static analysis tool.Subv
2013-05-17* Some more static analysis issues fixed.Subv
2013-05-17* Another issue found by static analysis fixed.Subv
2013-05-17* Batch of fixes for issues found by static analysis.Subv
2013-05-17Merge pull request #9815 from Ascathor/masterNay
Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class and race string.
2013-05-17Core/Vehicles: Fixed a crash that happened during seat changes searching for ↵Shauren
a previous free seat Closes #9609
2013-05-17Core/Misc: Another batch of fixes for issues found by static analysisShauren
2013-05-17Core/Misc: Fixed a bunch of issues found by static analysisShauren
2013-05-17Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class ↵Ascathor
and race names. Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class and race names.
2013-05-16DB/Characters: Remove guildId from characters table (characters_database.sql ↵Nay
only) This field was dropped long ago in 1a290f17f59943905bec7dd413c4879b4bbf6f8e Thanks to Aokromes for spotting the issue
2013-05-16Merge pull request #9814 from vlad852/masterShauren
Fix startup errors
2013-05-16Fix startup errors.Vlad
2013-05-16Core: Fix compiler warningsNay
2013-05-14Merge pull request #9800 from horn/yogg_saronShauren
Scripts/Ulduar: Fix warnings
2013-05-14Scripts/Ulduar: Fix warningshorn
2013-05-14Merge pull request #9799 from xjose93/DamageGOShauren
Core/Commands: Improve .damage command, now can damage destructible gameobjects => ".damage go <guid> <damage>"
2013-05-14Core/Commands: Improve .damage command, now can damage destructible ↵xjose93
gameobjects => ".damage go <guid> <damage>"
2013-05-14Merge pull request #9690 from horn/yogg_saronShauren
Scripts/Ulduar: Yogg-Saron
2013-05-14Scripts/Ulduar: Yogg-Saronhorn
Known issues: - encounter doesn't start immediately after you enter the room, you need to go closer - players standing outside of the room are not turned Insane after 15 seconds - encounter resets if the last living player is gripped by Constrictor Tentacle or encased in Hodir's Flash Freeze - Hodir won't freeze multiple players when they die at the same moment - Flash Freeze missile (64176) won't hit anybody, probably cast too soon (cosmetic issue) - there are some unused spells, don't know when or why they should be cast - some spell animations hit multiple players, but they shouldn't do that
2013-05-13Core/Debugging: Marked assert functions as non returningShauren