Warpten
95245d90ab
Core/Guilds: Some stuff that didnt get staged...
...
Also fixed non-PCH build (I guess, not enough horsepower to check myself sadly)
2013-07-06 15:28:12 +02:00
Warpten
99792f8750
Core/Guilds: Fixed 7th and 8th guild bault tabs.
2013-07-06 15:03:23 +02:00
Vincent-Michael
644e75487d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.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_thekal.cpp
src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Kalimdor/zone_silithus.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
src/server/scripts/Spells/spell_item.cpp
2013-07-04 23:08:02 +02:00
hexa-
7da727c6fe
Core/Spells: Remove correct stack of Deadly Poison when using Envenom
2013-07-02 05:27:09 +02:00
Shauren
6bccfe997c
Merge fixups
2013-06-23 15:11:08 +02:00
Shauren
3f3a32df34
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-06-23 14:51:52 +02:00
Shauren
e74c0e9f00
Core/PacketIO: Updates and enabled a bunch of opcodes
2013-06-23 00:07:25 +02:00
Shauren
1addad4dbd
Core/Vehicles: Fixed crashes in StopCastingCharm happening when unit was attempting to enter 2 vehicles at the same time
...
Closes #9293
Closes #9618
2013-06-22 16:10:48 +02:00
Shauren
55fa58af19
Core/Movement: Prevent dynamic changes of movement flags for charmed creatures
...
Closes #10075
Closes #10079
2013-06-22 13:42:13 +02:00
Vincent-Michael
614e674b34
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Northrend/zone_zuldrak.cpp
2013-06-21 22:04:11 +02:00
Shauren
cd32579a43
Core/Auras: Simplified Furor handling
...
Closes #10048
2013-06-21 02:05:55 +02:00
Shauren
f3ec76faeb
Core/Auras: Fixed a crash happening when different vehicle auras from the same caster stacked on one target
...
Closes #10050
2013-06-20 15:36:32 +02:00
Shauren
f517467817
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-06-18 21:04:31 +02:00
Shauren
d9df460694
Core/Movement
...
* Added wrapper methods for setting various movement flags and sending correct movement opcodes
* Made flying and falling spline flags exclusive with each other
2013-06-18 16:47:12 +02:00
Vincent-Michael
87d9d1d705
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.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/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/Spells/spell_pet.cpp
src/server/scripts/Spells/spell_shaman.cpp
2013-06-13 19:35:01 +02:00
Pitcrawler
2f771d4950
DB/Quests: Fix Badlands Reagent Run II, closes #9880
...
Thanks @joschiwald and @Kirkhammett
2013-06-12 21:15:17 +02:00
Malcrom
4096c54efa
Core: More Function name updates
2013-06-11 22:02:00 -02:30
Malcrom
ec474a62e5
Core: More Function Renaming.
2013-06-11 21:25:12 -02:30
Malcrom
66978cfc3b
Core: Some function renaming.
2013-06-11 19:54:27 -02:30
Malcrom
047608e7de
Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet().
2013-06-11 18:39:51 -02:30
Vincent-Michael
0bebf40fe7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/NPCHandler.cpp
2013-06-11 22:07:11 +02:00
Shauren
9ec22fffa0
Core/Objects: Object scale will now also affect bounding radius and combat reach fields
2013-06-11 17:28:16 +02:00
Shauren
f8d9a8d2e9
Core/Spells: Fixed fishing broken in a recent commit
2013-06-08 23:11:18 +02:00
Shauren
c3c66060f6
Core/Auras: Implemented SPELL_AURA_MOD_SPELL_CATEGORY_COOLDOWN
2013-06-07 20:35:30 +02:00
Shauren
bd6ea751c0
Core/Auras: Fixed SPELL_AURA_CAST_WHILE_WALKING
2013-06-07 16:08:09 +02:00
Shauren
eed1286a8c
Core/Vehicles: Handle vehicle seat switches through aura effects.
2013-06-04 16:28:30 +02:00
Shauren
7d64b56db1
Core/PacketIO: Fixed SMSG_PLAY_SOUND structure
2013-06-01 17:49:33 +02:00
Shauren
f586fabb3c
Core/Auras: Implemented SPELL_AURA_ENABLE_ALT_POWER
2013-05-31 22:19:11 +02:00
Shauren
adb78862da
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/scripts/Commands/cs_misc.cpp
2013-05-30 20:57:07 +02:00
Spp
9664c0ab5c
Core/Misc: Another batch of fixes for issues found by static analysis
2013-05-30 13:18:29 +02:00
Shocker
1315306cfc
Core/Spells: Implement SPELL_EFFECT_CREATE_AREATRIGGER (effect #179 )
2013-05-26 04:47:10 +03:00
Shauren
9c0d69e33d
Core/Items
...
* Updated structure of SMSG_ENCHANTMENTLOG and send it when changing enchantments on item
* Implemented SMSG_SOCKET_GEMS_RESULT sent when socketing is finished
2013-05-25 11:09:21 +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
Shauren
933f50558b
Core/Spells: Fixed channeling spells with infinite duration
2013-05-19 10:55:29 +02:00
Subv
6ce9e7f185
Core/Build: Fixed the build
2013-05-17 23:20:47 -05:00
Subv
98ad7309c9
* Another small batch of fixes from static analysis tool.
2013-05-17 23:08:28 -05:00
Subv
25acef2572
* Batch of fixes for issues found by static analysis.
2013-05-17 21:11:18 -05:00
Shauren
7d46703413
Core/Misc: Another batch of fixes for issues found by static analysis
2013-05-17 21:30:02 +02:00
horn
0a0698b1d4
Scripts/Ulduar: Yogg-Saron
...
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-14 17:52:37 +02:00
Warpten
6bc144a328
Core/Spells: Manually reverted 8dea73fc83.
...
Will have a closer and better look later.
2013-05-13 18:00:15 +02:00
Spp
d1677b2db0
Core/Logging: Performance-related tweaks to logging system
...
All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
Memleak fix
2013-05-13 15:07:36 +02:00
Vlad
78195b3c54
Allow use effectIndex in spell_target_position.
2013-05-13 11:30:48 +03:00
Shauren
64f0e99958
Core/StatSystem: Implemented mastery.
2013-05-12 17:56:37 +02:00
Mihapro
090951ba71
Core/Players: Cast Summon Pet on first login, relocate created pets
...
*Casts a proper Summon Pet spell on a hunter logging in for the first
time (depending on his race).
*Relocates created tamed pets before they're added to map.
2013-05-11 22:12:11 +02:00
Shauren
e2f8abd48d
Core/Spells
...
* Removed area MiscValue check for spells with SPELL_EFFECT_BIND, it's purpose is only to be sent in packets, not determine real area player will be bound to.
* Corrected guid sent in SMSG_PLAYERBOUND, it should be caster's guid, not player's
* Also updated position for Teach: Death Gate
Closes #9661
2013-05-11 12:16:36 +02:00
Nay
26efbacfab
Core/Spells: Fix a logging message error
2013-05-02 03:56:34 +02:00
Warpten
8dea73fc83
Core/Spells: Fixed a silly typo in SpellInfo::_IsPositiveEffect.
...
Fixes some auras being displayed as debuffs while they should not. (Just see Invisibility #66 )
Ref. #7912
2013-05-02 04:08:35 +03:00
Shocker
e5ec998864
Core/Spells: Fix dynobj aura stacking
2013-04-18 05:40:39 +03:00
