Commit Graph
1370 Commits
Author SHA1 Message Date
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
Spp 00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02:00
joschiwald 95d2ad32f7 Core/Spells: Fix spell script "spell_yogg_saron_malady_of_the_mind"
Closes #9813
2013-05-20 00:13:36 +02:00
Shauren 8633452f8d Scripts/Misc: Fixed many scripts not executing one of their actions because of an event with id = 0 2013-05-19 10:52:39 +02:00
Subv 1c3121b9cf * Another issue found by static analysis fixed. 2013-05-17 21:56:31 -05:00
Subv 25acef2572 * Batch of fixes for issues found by static analysis. 2013-05-17 21:11:18 -05:00
Shauren 8be181c7e6 Core/Misc: Fixed a bunch of issues found by static analysis 2013-05-17 20:39:53 +02:00
Nay 60dae46462 Core: Fix compiler warnings 2013-05-16 01:10:53 +01:00
horn cd8e6d12fd Scripts/Ulduar: Fix warnings 2013-05-14 18:25:58 +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
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
Gacko e9d7b53e6d Fix some creature text runtime errors 2013-04-16 20:29:24 +02:00
Shauren 24a7a6f965 Scripts/Pit of Saron: Changed Overlord's Brand script to be safer
Closes #9125
2013-04-12 17:54:40 +02:00
Gacko 852e8e720c Script: Remove unnecessary constant 2013-04-12 17:36:47 +02:00
Gacko 96ad520ea3 Script/Spell: Apply Frost Imbued Blade only in 25 man mode
Note: Quest credit spells are already casted in 25 man mode only.
2013-04-12 17:36:47 +02:00
Shauren 12a828fdbc Core/Movement
* Implemented a generic way of sending movement packets depending on who controls the unit (player or server controlled)
* Added possibility to specify extra elements in movement packets (such as speed, extra passenger guid, collision height and similar) without having to add a special element only for these
* Removed Unit::SendMovementFlagUpdate as it was something working only in 3.3.5a and earlier (no serverside HEARTBEAT opcode exists now)
2013-04-09 17:24:39 +02:00
Shauren 3e32caa593 Scripts/Ulduar: Fixed crashes with Kologarn using Stone Grip 2013-04-07 16:02:00 +02:00
kandera ad38ecaf98 Core/Battlefield: Fix the invisible wall at the end of wintergrasp Closes #9422
DB/Strings: fix the error messages from the spirit guides Author Nastrand #9035
2013-04-03 09:03:19 -04:00
Spp c97c381ea0 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/shared/Packets/ByteBuffer.h
2013-03-25 14:34:22 +01:00
Spp 1a6a23ec96 Core/Misc: Minor optimizations (+code changes to reduce differences with 4.3.4 branch)
Core/Logging: Create new logger type "Cheat". Will be used to log all cheat attempts
2013-03-25 13:26:48 +01:00
Vincent_Michael 15a249e28c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Pet/Pet.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
2013-03-21 22:00:01 +01:00
Spp 156fb824a4 Core/Scripts: Removed CAST_CRE define 2013-03-21 13:48:36 +01:00
Spp 355029fb4f Core/Scripts: Removed CAST_PLR define 2013-03-21 13:07:10 +01:00
Spp d091097433 Core/AI: Do not expose internal storage of SummonList 2013-03-21 11:06:05 +01:00
Vincent_Michael 41822a8ed3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.h
2013-03-20 22:07:56 +01:00
Visagalis 10030774c5 Fixed TOC faction champions loot chest (Now it will be selectable after spawning). 2013-03-20 08:06:47 +02:00
Vincent_Michael 11846f5990 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-14 22:40:53 +01:00
Gigatotem fcd7e94291 Scripts/Pit of Saron: Very minor spelling error correction. 2013-03-14 17:58:35 +00:00
Vincent_Michael 866d82a2ce Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-10 22:20:33 +01:00
Trista df25ccb30d Scripts/Eye of Eternity: Last stability changes
* Release button bug should be now really fixed, if someone manage to get it due to some server delay, it can be hit by typing "RepopMe()" or "Reload". It's now only clientside issue that I couldn't reproduce.

* Before there was a chance for transition to phase III to break if hit at precise moment. On top of that, if SoP was to be executed there was no time for purple dimension change. (Note: If transiton happen while SoP is cast it will get specific client data and dimension light will stay changing that is hard to hit, but is blizz bug.)
2013-03-10 03:30:34 +02:00
Vincent_Michael a9b740ab74 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.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_orgrimmar.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/shared/Packets/ByteBuffer.h
2013-03-10 01:08:55 +01:00
Vincent_Michael d2024c5c05 Core: Fix build 2013-03-09 04:54:58 +01:00
Trista 8e44b2d4a6 Scripts/Eye of Eternity: Remove some uneeded check and last to do that is uneeded after last GO changes
* also repair some broken GO data for 3.3.5a.
2013-03-09 05:32:02 +02:00
Vincent_Michael 83a5043741 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
2013-03-09 00:32:33 +01:00
Nefarion 49fd11ab5a First step of comment style refactoring to doxygen-style. 2013-03-08 21:55:37 +01:00
Trista 2dbe3d6cfe Scripts/Eye of Eternity: Fix not being able to press release button on death during phase III 2013-03-08 19:18:19 +02:00
Spp 377cfdb560 Core/RBAC: Fix multiple permissions and remove multiple config options that are currently implementes by RBAC
- Remove config options: CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT, CONFIG_ALLOW_TWO_SIDE_INTERACTION_MAIL, CONFIG_GM_LOG_TRADE, CONFIG_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_ALLOW_TWO_SIDE_WHO_LIST, CONFIG_ALLOW_GM_FRIEND, CONFIG_ALLOW_TWO_SIDE_ADD_FRIEND, CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL
- Fix RBAC_PERM_SKIP_CHECK_CHAT_SPAM (Was checking spam for those that had the permission)
- Only check RBAC_PERM_TWO_SIDE_INTERACTION_CHAT for sender of whispers (Restores GM being able to whisper players)
- Only check RBAC_PERM_TWO_SIDE_INTERACTION_MAIL for sender
- Fix .ticket assign <Player>, with last RBAC change it was changed by mistake from Player to Account
2013-03-08 13:15:25 +01:00
Vincent_Michael b4542c6504 Core: Fix non pch build 2013-03-08 06:20:38 +01:00
Trista 17061cb9e5 Scripts/Icecrown: Add script* support for Borrowed Technology/Volatility quests
* There are heavy core problems that make it not fully functional for now.
1) Enter vehicle of 31578 is being overriding the vehicle aura of the accessory so it kicks it out. (both get applied to 1, but instead decoy should be to 0).
2) Even if mentioned above get fixed the accessory is supposed to implicitly hit another passenger with explosion
and no seat flags for it even unknown.
3) Armored Decoy doesn't keep emote from freeze mechanic when enter vehicle connected with a not supported flag.
4) Vehicle speed seems too fast (there is some general vehicle not correct speed problem with spline being involved).

Connected with: #5757
2013-03-08 04:55:44 +02:00
Vincent_Michael a196ab60c3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-07 23:00:41 +01:00
Trista 8993eef723 Scripts/Eye of Eternity: Fix vehicle crashes
* I tought if a spell would hit all targets on map then the force cast would be cast for each, apparently I was wrong since it had unlimited implicit targets.
* Remove a condition with target mask players since there is a attribute that takes care of that.

Closes #9365
2013-03-07 04:54:57 +02:00
Vincent_Michael 36495966c0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-06 18:00:30 +01:00
Trista 7508e8cf65 Scripts/Eye of Eternity: Correct failed approach for hook target handling
* thx to Shauren
2013-03-06 11:05:11 +02:00
Trista a79143fc88 Scripts/Eye of Eternity: Fix Arcane Barrage handling and a lot other mechanics
* Nexus Lords had a bit imba timers on Arcane Shork, sorry for it wrong information. Now have retail timers.
* Scion of Eternity Arcane Barrage had wrong timers also for intial random cast and for each after. They were a bit lower.
* Implemented source mechanic that will always differ target of cast X to target of next cast. All rest is % chance based on various cases can happen.
* Removed condition for Arcane Overlaod bubbles now aura will never ("disappear"), if two are at one place they will override each other, but damage will never be leaked test enough times so don't bother stating opposite. Damage in ALL cases is reduced.
* Made Malygos range outside of platform a bit shorter to match retail real distance that also fixed timings of bubble mechanic, now they will always be there, if you are fast enough.
* And finally fixed some slight stuff on Malygos spell. Now all will work and Arcane Storm has it's correct visual mechanic again.

Closes #9321
2013-03-06 04:10:26 +02:00
Vincent_Michael 7ce02e7900 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2013-03-04 19:09:57 +01:00
Shauren 6b37c8d9f3 Scripts/Eye of Eternity: Fixed some silly code 2013-03-04 16:47:12 +01:00
Vincent_Michael c376757241 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-03 21:17:41 +01:00
Trista a108a9026a Scripts/Eye of Eternity: Rewrite Arcane Barrage mechanic
* Note that even after last changes happens I'm not sure exactly how the timers are controlled. The wipe chance should be a lot smaller now.. Any further change I can think of is beyond what I see. The main problem is currently. In theory there is chance, If timers get to be same with delay lesser than 2 seconds and if target randomisations select same target for shit out of luck reason. And if starting different timers were matching you can be hit atleast 2-3 times and on 25 mode maybe more. The timers are not with fixed difference for sure is all I know.
2013-03-03 03:16:17 +02:00