aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-16Merge branch 'master' into 4.3.4Spp
Conflicts: src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16Core/Misc: Some changes to reduce differences with 4.3.4 branch + some ↵Spp
cosmetic changes
2013-01-16Core/Logging: Add config option to enable/disable asyncronous logging ↵Spp
(disabled by default)
2013-01-16Core/Logging: Use correct realmId when logging to DBSpp
2013-01-16Scripts/ZulGurub: I can do this!Warpten
Commiting stuff one hour after waking up is no good.
2013-01-16Scripts/ZulGurub: Fixed Hakkar's aspects.Warpten
2013-01-16Scripts/ZulGurub: Missing mass replace changes and typo/codestyle fixes.Warpten
2013-01-16Scripts/ZulGurub: Forgotten change to previous commit. Damned Ctrl+S.Warpten
2013-01-16Scripts/ZulGurub:Warpten
* Fixed non-PCH compile. * Changed some codestyle on Mandokir. * Fixed compile warnings and a few typos. * Remove instance checks and use a wrapper to get AIs.
2013-01-16Core/Zul'Grub: Fix up Mandokir BossMalcrom
2013-01-16Core/Log: Change an error to contain DB table guid instead of low guidAokromes
Signed-off-by: Nay <dnpd.dd@gmail.com>
2013-01-15Merge pull request #8879 from joschiwald/spell_proc_scriptsTrista
Core/SpellScripts: Implement Spell Proc Hooks and use them in old and new ...
2013-01-15Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent_Michael
Conflicts: src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-15SQL: Fix sql import problemsVincent_Michael
2013-01-15DB/Game Event: Add missing changes in 6428af8f1663ce7b5c1ff87d86ebffd147196312Vincent_Michael
2013-01-15Core/Scripting: Implement quest Reconnaissance Flight (id 12671)w1sht0l1v3
Fix sql naming for last file.
2013-01-15DB/Game Event: Fix Hallow's End start time (thx gonzo1247)Vincent_Michael
2013-01-15Core/Scripting: Bosses should now work in ZG.Malcrom
Note: Mandokir is being rewritten blizzlike and not everything is working properly yet.
2013-01-15WorldServer/RA: Implement MSG_NOSIGNAL in RASocket send.kaelima
Used to prevent raising SIGPIPE when the host are no longer recv()ing
2013-01-15DB/Creature: Add Missing spawn for Lunk-tuskVincent_Michael
2013-01-15SQL: Fix sql import problemVincent_Michael
2013-01-14Core/Spells: Reorder more scripts in some script files and some cosmetic stuffVincent_Michael
2013-01-14DB/Quest: Lefty loosy, righty tightyGacko
Solves #2025
2013-01-14DB/Schema: rename ip2nationcountries to ip2nationCountries (Linux)Nay
Closes #8947 Thanks Vincent
2013-01-14Core: Fixed some compile warningsShauren
2013-01-14SQL: Rename some SQLs for 4.3.4 branch in correct nameVincent_Michael
2013-01-14DB/Game Event: Update some game events start time for 2013Vincent_Michael
2013-01-14Core/Misc: Apply codestyle to multiple files (II)Spp
2013-01-14Merge branch 'master' into 4.3.4Spp
Conflicts: src/server/game/Battlegrounds/Battleground.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Battlegrounds/BattlegroundMgr.h src/server/game/Battlegrounds/BattlegroundQueue.cpp src/server/game/DataStores/DBCfmt.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/BattlefieldHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp src/server/game/Movement/Spline/MovementPacketBuilder.cpp src/server/game/Movement/Spline/MovementUtil.cpp src/server/game/Server/WorldSession.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h src/server/scripts/EasternKingdoms/boss_kruul.cpp src/server/scripts/Kalimdor/zone_feralas.cpp src/server/scripts/Spells/spell_druid.cpp src/server/scripts/Spells/spell_mage.cpp src/server/scripts/Spells/spell_paladin.cpp src/server/scripts/Spells/spell_rogue.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warlock.cpp src/server/scripts/Spells/spell_warrior.cpp src/server/shared/Packets/ByteBuffer.h
2013-01-14Core/Misc: Minor cosmetic change to avoid some merge conflictsSpp
2013-01-14Core/Misc: Apply codestyle to multiple filesSpp
2013-01-14Script/Ruby Sanctum: Miss in a05e78bb18226a16f049e6b01e35597d8a2d30d9 Thanks ↵kaelima
joschiwald
2013-01-14Script/Ruby Sanctum: Some cleanup and minor fixeskaelima
Solves #8573 Closes #8490
2013-01-13Merge pull request #8906 from ille/GridLockKaelima
Core/Maps: separate mutex for grid
2013-01-13Core/Scripting: more Zul'Grub updatesMalcrom
2013-01-13Core/Scripting: Fix buildMalcrom
2013-01-13Core/Scripting: More Zul'Grub updatesMalcrom
2013-01-13Core/Scripting: Update boss Mar'li scriptMalcrom
2013-01-13Core/Scripting: Fix Zul'Grub InstanceMalcrom
2013-01-13TDB 335.50 - 2013/01/14TDB335.50Nay
2013-01-13Core/Scripting: Clean up boss Jin'doMalcrom
2013-01-13DB/Conditions: Fix DB startup errorsNay
Thanks @vlad852 Related to d77904e0af2b9a15013efc383
2013-01-13Core/Scripting: Improve boss Thekal script and misc cleanup.Malcrom
2013-01-13Core/Scripting: Update script for boss thekal, Zul'GrubMalcrom
2013-01-13Core/Dungeon finder: Fix teleport out after dungeon is finishedSpp
Closes 8914
2013-01-13Core/BG: Add workaround annotation and use exact coordsGacko
2013-01-13Core/BG: Corrections to cf5058c4e3ef5a5b736d22a7faa5ee1e8bf8035dkaelima
2013-01-13Fix nonpch build and warning. Move script to spell_quest.cppGacko
2013-01-13Core/DBC: Fixed startuptherzok
Closes #8930
2013-01-13Core/DB: Gluttonous LurkersGacko
Solves #1249