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
32,332 Commits 4 Branches 146 Tags
dcd2ffdaf4c358dbbab7915ab744871e5a7cc4ad
Commit Graph

32332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jackpoz
dcd2ffdaf4 CI/Circle CI: Show codestyle instructions 
Show a short comment about how to fix the codestyle errors
 2020-04-07 21:43:47 +02:00
Killyana
09b22fd4a5 DB/GameObject: Link "Floating, Medium - MFF" gobs to Midsummer Fire Festival 
Closes #24400
 2020-04-06 19:22:52 +02:00
Killyana
46d38526a9 DB/Quest: Conversing With the Depths 
Fix the reset of the gob and allow the second action list to override the first one and fix the cosmetic npc trigger position
 2020-04-06 18:38:06 +02:00
ForesterDev
97405ceb01 Core/PacketIO: Updated SMSG_LOGIN_VERIFY_WORLD (#24395) 
(cherry picked from commit 7256c7c2c7)

Co-authored-by: Shauren <shauren.trinity@gmail.com>
 2020-04-06 15:18:36 +02:00
Lewis Brumby
caf4c4cf2b Update AuthSession.cpp (#24397) 2020-04-06 00:36:56 +02:00
jackpoz
0844ad2ff0 Scripts/Guards: Fix spell cast spam after killing npc_air_force_bots guards 2020-04-05 20:23:46 +02:00
jackpoz
cb41c8828f Core/Misc: Replace tabs with spaces 2020-04-05 19:11:01 +02:00
jackpoz
5f29577f63 CI/Circle CI: Add codestyle check 
Tabs are not allowed, use 4 spaces instead
 2020-04-05 19:11:00 +02:00
jackpoz
caae3886d2 Core/Misc: Remove whitespace at the end of lines 2020-04-05 19:11:00 +02:00
jackpoz
0017c7a082 CI/Circle CI: Add codestyle check 
Whitespace at the end of lines is not allowed
 2020-04-05 19:10:59 +02:00
Giacomo Pozzoni
3def52c1c4 Core/Logs: Log full guid instead of just low guid, part 2 2020-04-05 19:10:58 +02:00
jackpoz
4f88be63e7 CI/Circle CI: Add support to multiline regex 2020-04-05 19:10:57 +02:00
Giacomo Pozzoni
468ecb7252 Core/Logs: Log full guid instead of just low guid 2020-04-05 19:10:57 +02:00
jackpoz
af1260c40e CI/Circle CI: Add codestyle check 
ObjectGuid::GetCounter() should not be called in logs, use ObjectGuid::ToString().c_str() instead
 2020-04-05 19:10:56 +02:00
jackpoz
32c9f1c7a2 CI/Circle CI: Enforce codestyle checks 2020-04-05 19:10:55 +02:00
jackpoz
404dbcdcf6 Build/CMake: Code cleanup 2020-04-05 15:17:02 +02:00
Shauren
2a2867cdc0 Build: Delete FindBoost.cmake and rely on the one that ships with cmake instead 
(cherry picked from commit e5b12a76dc)

# Conflicts:
#	cmake/macros/FindBoost.cmake
 2020-04-05 15:14:28 +02:00
jackpoz
965ac6fb08 Build/CMake: Increase minimum version to 3.8 2020-04-05 15:11:14 +02:00
NoName
fbcd244b2f Core/PacketIO: Handle CMSG_REQUEST_PET_INFO for more cases (#24364) 
+ vehicle
+ charm
+ possession

from 87c6cc19e5
 2020-04-05 14:53:23 +02:00
TheWinchesters
d5f5734241 DB/Quest: "Attunement to Dalaran" Remove non repeatable flag from the quest credit event 2020-04-04 20:39:57 +02:00
jackpoz
d1f9cf84a5 Core/Battleground: Attempt to fix a crash 
Please report this error if you get it
 2020-04-04 19:50:53 +02:00
ForesterDev
5d70f6ccd4 Core/Packets: update & enabled CMSG_SHOWING_CLOAK, CMSG_SHOWING_HELM (#24394) 
(cherry picked from commit a47d57d1db)

Co-authored-by: DJScias <zumbak04@gmail.com>
 2020-04-04 18:34:43 +02:00
Killyana
a7636c39d6 DB/Event: Argent Tournament heralds Alliance & Argent Tournament heralds Horde 
Add spawns to the game event, an error was made in the original commit bbd79e514f
 2020-04-04 16:29:22 +02:00
Rushor
3da8f37ddb Scripts/BlackfathomDeeps: Kelris will now channel his spell (#24300) 
* Scripts/BlackfathomDeeps: Kelris will now channel his spell

* Scripts/BlackfathomDeeps: Kelris will now channel his spell
 2020-04-04 15:38:23 +02:00
Jozef Dúc
936ff574c5 Fixes #22884 (#24338) 
Fix issue 22884 with non stacking necrotic plague debuff after dispell//death
 2020-04-04 15:30:55 +02:00
Sorikoff
264a583903 Scripts/Pet: Baby Blizzard Bear & Egbert (#24349) 
* Baby Blizzard Bear & Egbert

* SQL

* Update 9999_99_99_99_world.sql

SQL fix

* Rename 9999_99_99_99_world.sql to 2020_04_04_00_world.sql

Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-04-04 15:29:21 +02:00
Sorikoff
a513922fc1 Core/DB: Add DB error for missing gossip npcflag (#24375) 
* Add DB error for missing npcflag

* Improvements

* Update ObjectMgr.cpp

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-04-04 15:27:42 +02:00
Eridium
0e2342c169 Core/Movement: Formation Rewrite (#24379) 
* Core/Movement: Formation Rewrite

* Add a missing include

* fixed another warning

* meh

Co-authored-by: Ovahlord <Ovahlord@users.noreply.github.com>
Co-authored-by: Ovah <dreadkiller@gmx.de>
 2020-04-04 15:08:42 +02:00
ForesterDev
0f506f0dea Core/Locales: Optimize locale loading - move the strings (#24385) 
* Core/Locales: Optimize locale loading - move the strings

(cherry picked from commit 5dd686c080)
Signed-off-by: ForesterDev <gmmunchkinbox@gmail.com>

# Conflicts:
#	src/server/game/Globals/ObjectMgr.cpp

* Fix AchievementReward locales build

Co-authored-by: Shauren <shauren.trinity@gmail.com>
 2020-04-04 15:05:00 +02:00
funjoker
1794338532 CI/Circle CI: Prevent conflict with diff branches (#24388) 2020-04-04 14:58:00 +02:00
Giacomo Pozzoni
1df52da0b0 Require Visual Studio 2019 16.4 or greater (#24214) 
* CI/AppVeyor: Add appveyor.yml file

* Build: Require Visual Studio 2019 16.4 or greater

* CI/AppVeyor: Upgrade to VS2019 image

* Update cmake error message

* CI/AppVeyor: Fix appveyor VS 2019 configuration
 2020-04-03 21:14:09 +02:00
dr-j
69f4024929 DB/Event: Argent Tournament Val'Kyr invasion 
Closes #24249
 2020-04-03 20:44:48 +02:00
Keader
ed1520bda1 Script/Spells: Fixed some codestyle issues of previous commit 2020-04-03 14:00:46 -03:00
Alan Deutscher
2b1b36f561 Scripts/Spells: prevent Drain Soul from cancelling prematurely (#24378) 
More info at https://github.com/TrinityCore/TrinityCore/pull/24390#issue-398263036
 2020-04-03 13:57:20 -03:00
Jozef Dúc
e61c54dce8 Scripts/Spells: Fixed Bloodlust duplicated hook call 2020-04-03 12:51:17 -03:00
Killyana
bbc66308f6 DB/SAI: Spire Frostwyrm use area triggers to start the event instead of los 2020-04-03 17:14:49 +02:00
Lewis Brumby
b48c50ba23 Update action_ip_logger.cpp (#24371) 2020-03-31 22:49:18 +02:00
jackpoz
ac61dc6153 Core/DBLayer: Remove unused class forward declarations 2020-03-31 22:13:09 +02:00
Killyana
593efba961 DB/Locales: Fix locale RewardText for Tharil'zun 2020-03-31 16:35:31 +02:00
Shauren
f7a67099d4 Core/DBLayer: Prevent mixing databases with query holders 
(cherry picked from commit 13440434c3)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
 2020-03-31 13:42:01 +00:00
Shauren
635b8d52d5 Core/DBLayer: Prevent committing transactions started on a different database 
(cherry picked from commit f6e2b8cdc1)

# Conflicts:
#	src/server/bnetserver/REST/LoginRESTService.cpp
#	src/server/database/Database/DatabaseWorkerPool.cpp
#	src/server/database/Database/DatabaseWorkerPool.h
#	src/server/database/Database/Implementation/HotfixDatabase.h
#	src/server/database/Database/MySQLConnection.h
#	src/server/database/Database/Transaction.cpp
#	src/server/database/Database/Transaction.h
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/Achievements/AchievementMgr.h
#	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
#	src/server/game/AuctionHouse/AuctionHouseMgr.h
#	src/server/game/BattlePets/BattlePetMgr.cpp
#	src/server/game/BattlePets/BattlePetMgr.h
#	src/server/game/BlackMarket/BlackMarketMgr.cpp
#	src/server/game/BlackMarket/BlackMarketMgr.h
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Item/Item.cpp
#	src/server/game/Entities/Item/Item.h
#	src/server/game/Entities/Player/CollectionMgr.cpp
#	src/server/game/Entities/Player/CollectionMgr.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Garrison/Garrison.cpp
#	src/server/game/Garrison/Garrison.h
#	src/server/game/Groups/Group.cpp
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/Guild.h
#	src/server/game/Guilds/GuildFinderMgr.cpp
#	src/server/game/Handlers/BlackMarketHandler.cpp
#	src/server/game/Handlers/CalendarHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/MailHandler.cpp
#	src/server/game/Handlers/PetHandler.cpp
#	src/server/game/Handlers/PetitionsHandler.cpp
#	src/server/game/Mails/Mail.cpp
#	src/server/game/Pools/PoolMgr.cpp
#	src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp
#	src/server/game/Quests/QuestObjectiveCriteriaMgr.h
#	src/server/game/Scenarios/InstanceScenario.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
#	src/server/game/Spells/SpellHistory.cpp
#	src/server/game/Support/SupportMgr.cpp
#	src/server/game/Tools/PlayerDump.cpp
#	src/server/scripts/Commands/cs_misc.cpp
 2020-03-31 13:42:01 +00:00
Shauren
fe1003bdbd Core/DBLayer: Prevent using prepared statements on wrong database 
(cherry picked from commit e8e89f58fb)

# Conflicts:
#	src/server/bnetserver/REST/LoginRESTService.cpp
#	src/server/bnetserver/Server/Session.cpp
#	src/server/database/Database/DatabaseWorkerPool.cpp
#	src/server/database/Database/Implementation/HotfixDatabase.h
#	src/server/database/Database/MySQLConnection.cpp
#	src/server/database/Database/MySQLConnection.h
#	src/server/database/Database/PreparedStatement.cpp
#	src/server/database/Database/PreparedStatement.h
#	src/server/database/Database/QueryHolder.cpp
#	src/server/database/Database/SQLOperation.h
#	src/server/database/Database/Transaction.h
#	src/server/game/Accounts/BattlenetAccountMgr.cpp
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
#	src/server/game/AuctionHouseBot/AuctionHouseBot.cpp
#	src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
#	src/server/game/BattlePets/BattlePetMgr.cpp
#	src/server/game/Battlegrounds/ArenaTeam.cpp
#	src/server/game/BlackMarket/BlackMarketMgr.cpp
#	src/server/game/Chat/Channels/Channel.cpp
#	src/server/game/Entities/Corpse/Corpse.cpp
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/Item/Item.cpp
#	src/server/game/Entities/Pet/Pet.cpp
#	src/server/game/Entities/Player/CollectionMgr.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Garrison/Garrison.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Groups/Group.cpp
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/GuildFinderMgr.cpp
#	src/server/game/Guilds/GuildMgr.cpp
#	src/server/game/Handlers/AuctionHouseHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/ItemHandler.cpp
#	src/server/game/Handlers/MailHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Handlers/PetitionsHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Handlers/TicketHandler.cpp
#	src/server/game/Loot/Loot.cpp
#	src/server/game/Mails/Mail.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Movement/Waypoints/WaypointManager.cpp
#	src/server/game/OutdoorPvP/OutdoorPvP.cpp
#	src/server/game/Pools/PoolMgr.cpp
#	src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp
#	src/server/game/Reputation/ReputationMgr.cpp
#	src/server/game/Scenarios/InstanceScenario.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSocket.cpp
#	src/server/game/Spells/SpellHistory.cpp
#	src/server/game/Support/SupportMgr.cpp
#	src/server/game/Tools/PlayerDump.cpp
#	src/server/game/World/World.cpp
#	src/server/scripts/Commands/cs_account.cpp
#	src/server/scripts/Commands/cs_ban.cpp
#	src/server/scripts/Commands/cs_battlenet_account.cpp
#	src/server/scripts/Commands/cs_group.cpp
#	src/server/scripts/Commands/cs_lfg.cpp
#	src/server/scripts/Commands/cs_list.cpp
#	src/server/scripts/Commands/cs_message.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/server/scripts/Commands/cs_npc.cpp
#	src/server/scripts/Commands/cs_tele.cpp
#	src/server/scripts/Commands/cs_wp.cpp
#	src/server/shared/DataStores/DB2DatabaseLoader.cpp
#	src/server/shared/Realm/RealmList.cpp
 2020-03-31 13:42:01 +00:00
Killyana
f880132bb9 DB/Locales: Fix locale RewardText for Trial of the Lake 2020-03-31 15:31:58 +02:00
Aokromes
d03aaece7d Rename 2020_03_29_02_world_335 .sql to 2020_03_29_02_world_335.sql 2020-03-31 00:49:35 +02:00
ForesterDev
3c8622dd83 Core/PacketIO: updated spell "cancel" opcodes to new packet class (#24342) 
CMSG_CANCEL_CAST, CMSG_CANCEL_AURA, CMSG_PET_CANCEL_AURA,CMSG_CANCEL_GROWTH_AURA, CMSG_CANCEL_MOUNT_AURA, CMSG_CANCEL_AUTO_REPEAT_SPELL and CMSG_CANCEL_CHANNELLING.
 2020-03-30 17:21:40 +02:00
ForesterDev
c2a76efdca Core/Packets: Added SMSG_WORLD_STATE_UI_TIMER_UPDATE (#24312) 
(cherry picked from commit 7d88f8c491)

# Conflicts:
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Server/Protocol/Opcodes.cpp
#	src/server/game/Server/Protocol/Opcodes.h
 2020-03-30 17:20:09 +02:00
Killyana
f408b45a88 DB/SAI: Fix Captive Crocolisk Chains 2020-03-30 13:54:43 +02:00
jjo72ddd
dcd907a63a DB/Quest: Add some Russian quest_offer_reward_locale 
Ref #24367
 2020-03-29 22:47:47 +01:00
jjo72ddd
583d0b3b96 DB/Quest: Add some Russian quest_offer_reward_locale 
Closes  #24367
 2020-03-29 21:20:55 +01:00
Ovah
61aec37b4f Core/Spells: fixed a possible client crash when casting pull towards dest spells with misc value 0 (#24365) 
* This case is not happening in 335 yet as it barely has any spell with pull towardst dest effects. However, this is very well present in 4.x and beyond so let's add it for future cherrypicks
 2020-03-29 21:23:53 +02:00