Commit Graph
19021 Commits
Author SHA1 Message Date
Shauren 504ca4105a Scripts/Firelands: Fixed compile without PCH 2013-01-19 13:05:20 +01:00
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
ZxBiohazardZx dd19bec433 DB/Creature: more cleanups in creature_template_addon: remove all pointless entries (0 in all fields, bytes2=1) 2013-01-18 23:49:12 +01:00
ZxBiohazardZx 29deb56877 DB/Creatures: cleaning up creature_template_addon, removed auras that where also/already added by SAI, should reduce some runtime errors 2013-01-18 23:31:35 +01:00
Pitcrawler fbe3cac28e DB/SAI: Fixes quest: Catching up with Brann, closes #8983 2013-01-18 16:00:35 +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 d37b9bdd12 DB/creature: Add some missing Zul'Gurub Panther Trigger spawns 2013-01-17 20:11:39 -03:30
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
w1sht0l1v3 a74bd06ac7 DB/Misc: Proper faction for npc Brann Bronzebeard.
This makes him assist in combat and now the mobs that spawn attack him.
2013-01-17 18:30:04 +02: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
Malcrom 937fcc3810 DB/Creature_text: Missing ; from previous commit 2013-01-16 20:54:22 -03:30
Malcrom ec50fc7c3b DB/Creature_text: Add some missing text to db. 2013-01-16 20:06:24 -03:30
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
Malcrom 117268e514 DB/Gossip: Add some missing go gossip. 2013-01-16 14:01:01 -03:30
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 <[email protected]>
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
Vincent_Michael ddd765359f SQL: Fix sql import problems 2013-01-15 23:22:18 +01:00
Vincent_Michael 4b8615e468 DB/Game Event: Add missing changes in 6428af8f16 2013-01-15 22:53:30 +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
Vincent_Michael 6428af8f16 DB/Game Event: Fix Hallow's End start time (thx gonzo1247) 2013-01-15 20:36:24 +01: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 7cb9bf1c2c DB/Creature: Add Missing spawn for Lunk-tusk 2013-01-15 12:29:50 +01:00
Vincent_Michael 8c4f59c6f9 SQL: Fix sql import problem 2013-01-15 12:04:46 +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
Gacko 602950cb77 DB/Quest: Lefty loosy, righty tighty
Solves #2025
2013-01-14 18:44:47 +01:00
Nay 5844ad55ea DB/Schema: rename ip2nationcountries to ip2nationCountries (Linux)
Closes #8947
Thanks Vincent
2013-01-14 14:37:07 +00:00
Shauren 9007ef905f Core: Fixed some compile warnings 2013-01-14 15:05:30 +01:00
Vincent_Michael d72d3df706 SQL: Rename some SQLs for 4.3.4 branch in correct name 2013-01-14 14:42:54 +01:00
Vincent_Michael c9ec5b4ce8 DB/Game Event: Update some game events start time for 2013 2013-01-14 12:07:37 +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