Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,020 Commits 4 Branches 146 Tags
6c71d555a07f2ea9a5107ea0d5855b57de098a52
Commit Graph

15510 Commits

Author SHA1 Message Date
Shocker
6c71d555a0 Core/Achievements: Delete from guild_achievement_progress table when encountering an invalid criteria in that table 2013-01-19 02:17:41 +02:00
Vincent_Michael
0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Shocker
7d28c10bd0 Core/Misc: Delete spell from character_spell table too when encountering an invalid spell 2013-01-18 03:22:58 +02:00
Malcrom
b115abde31 Script/Scholomance: Update Kirtonos the Herald script. 2013-01-17 19:50:11 -03:30
Vincent_Michael
fbcb2e5335 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-17 23:49:26 +01:00
Spp
d5faec2c0e Core/Account: Move AccountMgr back to singleton 2013-01-17 14:58:15 +01:00
Spp
7d6634e363 Fix merge problem 2013-01-17 08:48:04 +01:00
Warpten
a8652baaa4 Core/Auras: Removed an unnecessary check. 
mode is already checked in the first lines of SPELL_AURA_PHASE's handler.
 2013-01-16 18:34:10 +01:00
Spp
0e8011657d Merge branch 'master' into 4.3.4 
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-16 15:29:41 +01:00
Spp
927062f61f Core/Misc: Some changes to reduce differences with 4.3.4 branch + some cosmetic changes 2013-01-16 11:17:14 +01:00
Spp
526bdc0764 Core/Logging: Add config option to enable/disable asyncronous logging (disabled by default) 2013-01-16 09:52:49 +01:00
Spp
be3826825e Core/Logging: Use correct realmId when logging to DB 2013-01-16 08:59:56 +01:00
Warpten
faccbef869 Scripts/ZulGurub: I can do this! 
Commiting stuff one hour after waking up is no good.
 2013-01-16 07:18:47 +01:00
Warpten
3df4075a04 Scripts/ZulGurub: Fixed Hakkar's aspects. 2013-01-16 07:16:22 +01:00
Warpten
797be8d9ff Scripts/ZulGurub: Missing mass replace changes and typo/codestyle fixes. 2013-01-16 07:07:48 +01:00
Warpten
26bf10365e Scripts/ZulGurub: Forgotten change to previous commit. Damned Ctrl+S. 2013-01-16 06:55:46 +01:00
Warpten
803bf2f9cc Scripts/ZulGurub: 
* 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-16 06:51:59 +01:00
Malcrom
ace7bbeddf Core/Zul'Grub: Fix up Mandokir Boss 2013-01-16 00:41:03 -03:30
Aokromes
134785f7f1 Core/Log: Change an error to contain DB table guid instead of low guid 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-16 01:17:13 +00:00
Trista
8081704c66 Merge pull request #8879 from joschiwald/spell_proc_scripts 
Core/SpellScripts: Implement Spell Proc Hooks and use them in old and new ...
 2013-01-15 14:56:45 -08:00
Vincent_Michael
9391d087fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-15 23:33:36 +01:00
w1sht0l1v3
fc05b3dc58 Core/Scripting: Implement quest Reconnaissance Flight (id 12671) 
Fix sql naming for last file.
 2013-01-15 21:56:20 +02:00
Malcrom
b138d7fdf4 Core/Scripting: Bosses should now work in ZG. 
Note: Mandokir is being rewritten blizzlike and not everything is working properly yet.
 2013-01-15 13:23:33 -03:30
kaelima
c7ce94ee3d WorldServer/RA: Implement MSG_NOSIGNAL in RASocket send. 
Used to prevent raising SIGPIPE when the host are no longer recv()ing
 2013-01-15 16:10:59 +01:00
Vincent_Michael
6f8aa6a782 Core/Spells: Reorder more scripts in some script files and some cosmetic stuff 2013-01-14 20:28:32 +01:00
Shauren
9007ef905f Core: Fixed some compile warnings 2013-01-14 15:05:30 +01:00
Spp
0d5cb6af75 Core/Misc: Apply codestyle to multiple files (II) 2013-01-14 11:12:58 +01:00
Spp
d75222feca Merge branch 'master' into 4.3.4 
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-14 11:04:03 +01:00
Spp
7540cfedfc Core/Misc: Minor cosmetic change to avoid some merge conflicts 2013-01-14 10:02:06 +01:00
Spp
802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
kaelima
557fde86e4 Script/Ruby Sanctum: Miss in a05e78bb18 Thanks joschiwald 2013-01-14 04:38:05 +01:00
kaelima
a05e78bb18 Script/Ruby Sanctum: Some cleanup and minor fixes 
Solves #8573
Closes #8490
 2013-01-14 02:40:24 +01:00
Kaelima
c6f5bef468 Merge pull request #8906 from ille/GridLock 
Core/Maps: separate mutex for grid
 2013-01-13 17:35:59 -08:00
Malcrom
83c753f607 Core/Scripting: more Zul'Grub updates 2013-01-13 20:58:48 -03:30
Malcrom
114617fcb0 Core/Scripting: Fix build 2013-01-13 19:59:09 -03:30
Malcrom
0759f6c910 Core/Scripting: More Zul'Grub updates 2013-01-13 19:48:25 -03:30
Malcrom
0a4cfd04bb Core/Scripting: Update boss Mar'li script 2013-01-13 17:42:16 -03:30
Malcrom
63488f3a86 Core/Scripting: Fix Zul'Grub Instance 2013-01-13 17:23:46 -03:30
Malcrom
cdafb60f0c Core/Scripting: Clean up boss Jin'do 2013-01-13 15:05:31 -03:30
Malcrom
71bfda55c3 Core/Scripting: Improve boss Thekal script and misc cleanup. 2013-01-13 13:44:11 -03:30
Malcrom
a47164b3dd Core/Scripting: Update script for boss thekal, Zul'Grub 2013-01-13 12:08:40 -03:30
Spp
4c247f5d2d Core/Dungeon finder: Fix teleport out after dungeon is finished 
Closes 8914
 2013-01-13 16:22:41 +01:00
Gacko
8be3d4cc80 Core/BG: Add workaround annotation and use exact coords 2013-01-13 16:15:35 +01:00
kaelima
c54fb9efb4 Core/BG: Corrections to cf5058c4e3 2013-01-13 15:43:32 +01:00
Gacko
0b07912622 Fix nonpch build and warning. Move script to spell_quest.cpp 2013-01-13 15:37:01 +01:00
therzok
6d9ac921e0 Core/DBC: Fixed startup 
Closes #8930
 2013-01-13 14:25:54 +00:00
Gacko
3a32c76de9 Core/DB: Gluttonous Lurkers 
Solves #1249
 2013-01-13 14:59:51 +01:00
Malcrom
7abdab74ef Core/Scripting: Some updates to Zul'Grub 2013-01-13 09:52:43 -03:30
Gacko
fdd853366a Core/Script: Uldaman - Altar of the Keepers 
... and some codestyle changes.
 2013-01-13 11:54:05 +01:00
Malcrom
d7383717ea Core/Scripting: Misc Cleanup. 2013-01-13 01:38:28 -03:30