Commit Graph
100 Commits
Author SHA1 Message Date
DDuarte cc2aa7df38 Core/Bnetserver: Catch and log an exception that happens when WorldserverListenPort is already used
Closes #15284
2019-10-08 16:02:25 +02:00
Duarte Duarte 13c91911b3 Tools/ConnectionPatcher: Fix a typo when checking if moduleName dir exists 2019-09-29 01:41:14 +02:00
Nayd 84e89ce9c8 Tools/ConnectionPatcher: Pause program when an error happens
Similar to what is done in mmaps_generator and vmap4_extractor.
This hopefully reduces the number of problems that Windows users have
when patching fails.
2019-09-29 01:33:46 +02:00
DDuarte 0578f5612a Dep: Update fmt (cppformat) to 3.0.1 https://github.com/fmtlib/fmt/commit/7fa8f8fa48b0903deab5bb42e6760477173ac485 2016-12-30 01:19:58 +01:00
Duarte Duarte 49dcbf43eb Optimizations for Zapcc compiler 2016-12-01 03:42:50 +01:00
DDuarte e2248bbfa4 Scripts/Commands: Fix build warning 2016-07-20 18:37:01 +02:00
DDuarte d8bd7aa551 Core/Items: Missing renames 5faaddcf6bba50845f46a98a6387ffcd8abad2b8 2016-07-20 16:04:39 +02:00
DDuarte 3f90a9ac87 Core/Items: Rename some ITEM_PROTO_FLAG
Source: vanilla alpha pdb
2016-07-20 16:04:18 +02:00
DDuarte c47ec46ebc Scripts: Add missing override 2016-07-19 15:55:11 +02:00
Duarte Duarte 28caabfdda Scripts/SWP: Remove unused #defines
(cherry picked from commit 71a7f96e22a68654edd66ccdb5f6202dec4dfd2c)
2016-05-12 09:14:23 +02:00
DDuarte 477a4edfe2 Core/Config: Fix 3 more missing config warnings
Closes #16861

Thanks tkrokli

(cherry picked from commit 0afcefea2724081968b07119ebd54943fdc44b60)
2016-05-12 08:24:45 +02:00
DDuarte 06a91b090d Core/Config: Error logging for ptree_bad_data
Ref https://github.com/TrinityCore/TrinityCore/commit/6487e2f2d6a1ddbeff77362219658376b8a3f9f0#commitcomment-16888976

(cherry picked from commit 9431b94bff939457cb915da3728cda6067674558)
2016-05-12 08:24:32 +02:00
DDuarte 2f5a67438a Core/Config: Remove references to Arena.QueueAnnouncer.PlayerOnly which hasn't been used since 3dd6fdedf7
Ref #16859
2016-05-12 08:22:54 +02:00
DDuarte 941192ba38 Core/AHBot: Add missing AuctionHouseBot.Class.CLASS.Allow.Zero to config
Ref #16859
2016-05-12 08:22:39 +02:00
DDuarte 4e4cbad69f Core/Network: Change SocketMgr.StartNetwork to take the thread count by arg instead of config
AuthSocketMgr doesn't need "Network.Threads" config

Fixes "Missing name Network.Threads in config file authserver.conf"

Ref #16859
2016-05-12 08:22:27 +02:00
DDuarte 6cc4cc362d Core/Startup: Warn when a config key isn't found in the config files
Example: "Missing name Guild.SaveInterval in config file worldserver.conf, add "Guild.SaveInterval = 15" to this file"
(cherry picked from commit 06b3bca0d2bf6f049128da110681a5244d90225a)

# Conflicts:
#	src/common/Configuration/Config.cpp
2016-05-12 08:22:15 +02:00
DDuarte 62f5ea83ad Github: Minor updates to issue and PR templates
(cherry picked from commit 147322b570ff03ff45d0074d35830beebbfb812d)
2016-05-12 08:03:49 +02:00
DDuarte 504feb663b Core/Misc: 3.3.5a ports 2016-05-05 03:37:49 +02:00
DDuarte a41bd8e943 Tools/MMaps: Add format library linking to mmaps_generator
(Very) partial cherry pick of ed75b0649add23e082976fa4e5d504bc0c312602
2016-03-07 17:30:06 +00:00
Duarte Duarte 2e1e608450 Merge pull request #16696 from TrinityCore/realm6xto335
Core: Backport 6.x realm changes
2016-03-07 00:06:37 +00:00
DDuarte 7b687be4ba Core/Auth: Fix the "Added realm" spam 2016-03-07 00:06:13 +00:00
DDuarte 6cd63ca3d4 Core/Authserver: Partial port of 56cf7ff2a8
Change the "UpdateIfNeed" logic to a deadline_timer
2016-03-06 19:46:59 +00:00
DDuarte 2ea31027e5 Core: Backport 6.x realm changes
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches

Original changes by Shauren

Partial port of bacc90b6baa34e6a194c93e5a7860d4041f08af7 and 63def8aa3291d0a6e5f83b289ad12c4c8a3cebd9
2016-03-06 19:46:59 +00:00
DDuarte b8bd0053d8 Github issue and pull request templates
(cherry picked from commit 494480239964fb677f16433b3172e22b5b4e5e87)
(cherry picked from commit a624b4523fb5da4929b299a35293833d1740ee03)
(cherry picked from commit 08e6294c803db4cedf5cdd38be383abff819283e)
(cherry picked from commit b6b5665158ca5c52ddd429c0feb85885aaa283d5)
2016-02-17 21:02:23 +00:00
Duarte Duarte 60f8751c64 Merge pull request #16451 from tkrokli/uldaman_at_map_chamber
Core/Scripts/Uldaman: change hardcoded text to enum
2016-02-01 21:52:03 +00:00
DDuarte 7a252fc648 Core/SAI: Typo fix of 77087db793
There's no %b, silly
2016-01-26 03:43:15 +00:00
DDuarte 77087db793 Core/SAI: Code improvements to SMART_ACTION_RANDOM_SOUND
Warning fixes and extra sanity checks

Ref #16376
2016-01-26 03:37:07 +00:00
DDuarte ac727ab208 Scripts: Add override to CheckInRoom() definitions
Fixes -Winconsistent-missing-override
2016-01-19 13:06:04 +00:00
DDuarte 954323d9cb Core/Instances: Fix build in older VS versions
Relax const uses in BossBoundaryEntry so the compiler can generate proper
copy assignment operator (error C2582: 'operator =' function is unavailable in 'BossBoundaryEntry')

Also renamed its members to match our coding standards
(public members should be UpperCamelCase)
2016-01-19 13:01:43 +00:00
Duarte Duarte 8ef9ea9157 Merge pull request #16231 from ariel-/smartfix
Core/SmartScripts: Fix typo
2016-01-11 03:16:17 +00:00
Duarte Duarte bddf9ec6fe Merge pull request #16101 from NathanHandley/3.3.5
Updated AuctionHouseSeller to have item class stack control
2016-01-09 18:46:20 +00:00
Duarte Duarte 893c63f320 Core/DBUpdater: Fix help text download link
Change from forums to GH Releases
(cherry picked from commit 6b529fcd43dd394a96a5441ab95523bdce3d58d3)
2016-01-04 22:53:34 +00:00
DDuarte 5d2cee1c2e Rename SQL after PR merge 2015-10-06 14:54:43 +01:00
Duarte Duarte 22536641b2 Merge pull request #15654 from ShinDarth/resolvedBy
Core/Ticket keep always trace of GM who resolves the ticket
2015-10-06 06:35:45 -07:00
Duarte Duarte 2c16edbdf3 Merge pull request #15590 from unknown-8H3D/patch-1
Fix TYPO in config file
2015-09-24 10:15:45 -07:00
Duarte Duarte 0720414042 Merge pull request #15582 from mthsena/3.3.5
Config: Typo/Cosmetic changes
2015-09-23 07:46:16 -07:00
Duarte Duarte 7c4dd4059e Merge pull request #15579 from M-Pan/3.3.5
Config ; Minor Typo
2015-09-23 04:57:44 -07:00
Duarte Duarte f7e9acb6ed Merge pull request #15577 from M-Pan/3.3.5
Revise MaxPrimaryTradeSkill comment

Closes #15575
2015-09-22 17:05:57 -07:00
Duarte Duarte 6cdfe9dc09 Merge pull request #15452 from Treeston/3.3.5
Core/Unit: Allow mounting for certain transformations
2015-09-09 08:37:03 -07:00
Duarte Duarte ab5ecb7470 Merge pull request #15466 from M-Pan/3.3.5
Config: Minor Typo
2015-09-08 12:00:08 -07:00
Duarte Duarte 821b5f2b5c Merge pull request #15413 from ShinDarth/sort_quest_template
DB/World: fix bad field rename introduced in 6b43e72f01
2015-09-03 06:13:04 -07:00
DDuarte 470c3e8420 SQL renames after PR merge 2015-09-02 15:21:24 +01:00
Duarte Duarte 139598a07e Merge pull request #15384 from ShinDarth/quest_backports2
DB/World schema backport: sort some quest_template fields using 6.x style
2015-09-02 07:20:20 -07:00
Duarte Duarte e28ee38664 Merge pull request #15356 from ShinDarth/quest_backports
DB/World schema backport: quest_details, _request_items and _offer_reward
2015-09-02 07:20:04 -07:00
DDuarte f2a1d3152e Build/Cmake: Fix a typo in common's CMakeLists.txt 2015-08-17 02:23:47 +01:00
DDuarte 90c9290761 Add a missing include of d5cf594bfe91ff22175c6e344b23b95cdbcc8a3c 2015-08-16 01:09:29 +01:00
DDuarte 233615c785 Fix build warnings addded in d5cf594bfe91ff22175c6e344b23b95cdbcc8a3c 2015-08-16 00:45:50 +01:00
DDuarte e1b534e40f Core/Object: Add changes to ObjectGuid from 6.x
copy and move cctor
assignment and assig move operators

Ref 81abfe93bb96e5a769dc855f06fdc7578b352b39 and 89a8a7e1a4bdc22d2da17b1a3bf34fd52bf87e85
2015-08-15 18:09:12 +01:00
DDuarte fa6a83b270 Build: Add 1.59 Boost version to FindBoost 2015-08-15 17:54:18 +01:00
DDuarte d23e2f9cc0 Fix SpellAurasEffects build on GCC 5.1
Closes #14655

(cherry picked from commit 57ced3ccbd44c8d4955da645522c6cd85c001c6c)
2015-07-31 16:29:17 +01:00
DDuarte b63082971f Build: Add missing include to MapScripts.cpp
Fixes linker error in GCC/Clang
2015-07-27 01:37:04 +01:00
DDuarte bc4baa4e05 Build/CMake: Partially revert recent changes to FindMySQL.cmake
Looking for folders like ".../MySQL/*/include" matches the MySQL Connector C libs which caused some problems.
Related #15072, #15068

P.S ".../MySQL/MySQL Server*/include" doesn't work

(cherry picked from commit e2fb3bbd466641c794438933e636d63ebf19432e)
2015-07-27 01:13:38 +01:00
DDuarte 4476f6c867 DB/Ulduar: Fix Mimirons Rocket Strike not dealing damage in 25man mode
(cherry picked from commit acd3fe5807e6f81c6d49037b4e38d819d94d6166)
2015-07-26 00:45:03 +01:00
DDuarte d12fec67f2 Core/Misc: Add a few consts to methods
(cherry picked from commit 7d9843c380cf00f38ad0c5bc75fd387e50ee11da)

Conflicts:
	src/server/bnetserver/Packets/ConnectionPackets.h
	src/server/game/AI/SmartScripts/SmartAI.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceSaveMgr.h
	src/server/game/Support/SupportMgr.h
2015-07-24 12:02:57 +01:00
DDuarte 3c4484d782 Scripts/ScarletEnclave: Add weapons to Unworthy Initiate
Closes #14954
Closes #14955

(cherry picked from commit 673648ee6507597837bd2c8a7a78f425d139baea)
2015-07-20 01:16:47 +01:00
DDuarte 24ae640de3 Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid
Additions to cb0e6cac63638fd229cce16c341c6d3d2d77d0d9

(cherry picked from commit 57da378dea2b13c092dab71b181c859790e41b99)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
2015-07-20 01:16:06 +01:00
DDuarte a9d00b9c96 TDB 335.59 - 2015/07/14 2015-07-14 01:24:35 +01:00
DDuarte 5b078786a2 Update .gitattributes to prevent CRLF issues 2015-07-10 20:32:59 +01:00
DDuarte 57091cc5f1 CRLF to LF
Seriously....
2015-07-10 20:16:55 +01:00
DDuarte be32beee57 Core/Executables: Add --version and -v to worldserver and authserver arguments
Closes #14993

(cherry picked from commit 0f082e8f925f17e585fd221b901f55581d2d68ab)

Conflicts:
	src/server/bnetserver/Main.cpp
2015-07-04 02:54:23 +01:00
DDuarte 5e9a21291c Buildsystem: Fixed disabling compiler warnings in dep for clang/icc
(cherry picked from commit c24787f6665b5ea2b696bdfa7134a19ab5a3c331)

(reverts 77f7f56268)

Conflicts:
	dep/CascLib/CMakeLists.txt
	dep/zmqpp/CMakeLists.txt
2015-07-04 01:56:10 +01:00
DDuarte dfc71765f8 Core/ObjectMgr: Fix 3 -Wunused-private-field warnings in TempSummonGroupKey
Replace a memcmp by a lexicographical comparison with std::tie

(cherry picked from commit 1df20a2134dbb84d1eb30024171ccd7e8b103e47)
2015-07-04 01:50:35 +01:00
DDuarte 1b2a67a1b5 Build/CMake: Fix finding MySQL install
(cherry picked from commit d4deb17a2f94d06b7eab232b90e874fa58675b36)
2015-06-29 14:09:48 +01:00
DDuarte 5a7adbba3a Fix build after recent cherry picks (v2.0) 2015-06-26 04:08:40 +01:00
DDuarte 079ebe4d5d Fix build after recent cherry picks 2015-06-26 04:01:26 +01:00
DDuarte 02df39f791 Fix build and SQL import after recent cherry picks 2015-06-26 02:42:24 +01:00
Duarte Duarte 33f48a460c Merge pull request #14920 from Exodius/Exodius-readme
Update README.md
(cherry picked from commit 4093eee19b511864f1049c8d2e9c34ab897f619c)
2015-06-26 01:28:40 +01:00
DDuarte 24b5dfcb4d Core/BattlegroundIC: Removed 1 hack:
* Parachute spell is now blizzlike
* Also restored "The battle will begin in 2 minutes."

(cherry picked from commit 8a4afad63ac97b39f6746d466f3166eeef62e711)

Conflicts:
	sql/updates/world/2015_05_01_00_world.sql
	src/server/game/Miscellaneous/Language.h

Rename 2015_05_01_00_world.sql to 2015_06_13_00_world.sql

(cherry picked from commit 74eeefa5be163a55489f91c05d7dfd1cb624c78d)
2015-06-26 01:24:21 +01:00
Duarte Duarte a8d8976e2c Merge pull request #14723 from TrinityCore/findmysql-update
Update FindMySQL.cmake
(cherry picked from commit fb4a9823c41b31158f6b5d68fc2ffc1608051984)
2015-06-26 00:52:52 +01:00
DDuarte 80695181b9 Core/LootMgr: Remove dead validation code from LoadLootTable
CID 1288389 Operands don't affect result

(cherry picked from commit 47a119e4fa617319b283e7c3824241bc0b6775fb)
2015-06-26 00:51:16 +01:00
DDuarte ae64c11b28 Core: Fix multiple Coverity issues
(cherry picked from commit b8c681c776d7918e7b3f2a89422509a87bcb5da2)

Conflicts:
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Server/Packets/CharacterPackets.h
	src/server/game/Server/Packets/MovementPackets.h
	src/server/game/Spells/SpellInfo.cpp
2015-06-26 00:49:38 +01:00
DDuarte 08b8dd10d1 Core/GOs: Correct type of lowGuid when loading gameobject_addons
Coverity IDs: 1302436 1302437 1302438

Issue introduced in 95b5e35745
2015-06-01 02:09:45 +01:00
DDuarte 1e54097084 Core/Scripts: Corrected argument types in GetCreatureEntry/GetGameObjectEntry ZoneScript hooks
(cherry picked from commit b0c4268a6b0ed1fffeb51c7542c7991399b18284)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp
2015-06-01 00:44:11 +01:00
Duarte Duarte be2fb616c7 Update worldserver.conf.dist
Fix typo in ClientCacheVersion
(cherry picked from commit fc85f0e30fed383515f3d519dcef2cb87e3ee854)
2015-06-01 00:34:38 +01:00
DDuarte cb9ef69732 Core/Movement: Fix a typo in FlightPathMovementGenerator::InitEndGridInfo()
Added in 916ce6f4f3
Thanks @Rochet2 for finding it
2015-05-24 14:52:20 +01:00
Duarte Duarte 90e2b7266b Merge pull request #14674 from jaredjones/patch-1
CMake OS X: Fixed Debug Mode for Xcode
(cherry picked from commit b96e70af71a1cc87a33a79c71618697cd8f7ca9f)
2015-05-19 19:29:01 +01:00
Duarte Duarte f4c1a8fb2d Merge pull request #14454 from ariel-/cd
Port Core/Spells: Cooldown updates (6.x branch)
2015-05-19 18:52:05 +01:00
DDuarte 916ce6f4f3 Fix build after recent cherry-picks
- Rename fields in TaxiPathNodeEntry to match 6.x names
- Add LowType to ObjectGuid
2015-05-19 12:30:06 +01:00
Duarte Duarte d7608984cb Merge pull request #14667 from thelextor/patch-1
[4.3.4]Fix building with Cmake
2015-05-08 11:04:43 +01:00
Duarte Duarte c9e699961e Merge pull request #14540 from tkrokli/npc_mootoo_the_younger
Fix $n bug in NPC text for quest 11664 Escaping the Mist
2015-04-12 14:29:48 +01:00
Duarte Duarte 13293f8887 Merge pull request #14511 from Exodius/thunderspike
Core/Scripts: Remove The Thunderspike script
2015-04-06 20:14:16 +01:00
DDuarte 606c443cb0 Revert "Merge pull request #14424 from Rushor/Rampart"
This reverts commit 22c0007b42, reversing
changes made to 20bc2c51f6.
2015-04-03 20:59:15 +01:00
Duarte Duarte 20bc2c51f6 Merge pull request #14083 from Gooyeth/3.3.5_sample_satisfaction
Core/Spells: Fixed Sample satisfaction not entering combat
2015-04-03 18:32:02 +01:00
Duarte Duarte 965ed68470 Merge pull request #14426 from tkrokli/SetQuestSlotState
[Core/Quest] Update quest Objective status Client side
2015-03-22 22:12:02 +00:00
Nayd 2774d03be0 Update world_database.sql 2015-03-22 20:02:52 +00:00
Nayd 922be41916 SQLs: Re-add two sql files (236e43443c & 0f6515750d) 2015-03-21 22:16:03 +00:00
Nayd 360075129e TDB 335.58 - 2015/03/21 2015-03-21 22:06:46 +00:00
Nayd c9fa26f731 Rename SQL files
Preparations for TDB release
2015-03-21 21:12:58 +00:00
Nayd 2ac40775a2 Core/Spells: Implement HasAttribute() helper for SpellInfo for easier readability
Original code by @Shocker (6.x branch)
2015-03-18 23:16:39 +00:00
Duarte Duarte 769acfbd02 Merge pull request #14370 from Kittnz/realm_achievement
Core/Condition: Realm Achievement condition
2015-03-17 12:42:35 +00:00
Nayd 0ebc15e6f4 Core/DBLayer: Remove references to table character_currency (6.x only)
Ref 170bc318b3
2015-03-15 15:50:05 +00:00
Nayd dbcfa3b120 SpellAuras.cpp: typo fix 2015-03-15 14:09:00 +00:00
Duarte Duarte f2994a6fe7 Merge pull request #14325 from danlapps/4.3.4
Update base character sql file
2015-03-12 23:43:38 +00:00
Duarte Duarte 2fe8885463 Core/Spells: Fix a float division issue in EffectLeapBack
Ref Coverity CID 1227511

(cherry picked from commit 709275eecbbe073cd9b9170debfcef476ef66a6c)

Conflicts:
	src/server/game/Spells/SpellEffects.cpp
2015-02-22 06:10:16 +00:00
Duarte Duarte 958999ff5c Core/Server: Catch exceptions in int main()
The exceptions is rethrown on debug mode.

Ref Coverity CID 1010213, 1022574, 1227501, 1227502,
1227503, 1227504, 1227505, 1254536 and 1254612

(cherry picked from commit e68ca82d4d039a401d03de145111b0a738bb9dd7)

Conflicts:
	src/server/bnetserver/Main.cpp
2015-02-22 06:09:01 +00:00
Duarte Duarte a324ee8a22 Typo 2015-02-22 06:06:58 +00:00
Duarte Duarte a6505dd46a Merge pull request #14103 from Epicurus4/6.x
Added a player searcher
(cherry picked from commit b7052d2ed735dca233b91c32f762b4156543aa97)
2015-02-22 05:51:26 +00:00
Duarte Duarte a3bc75b7b9 Merge pull request #14098 from ariel-/arenacd
Arena Spells Reset Cooldown micro correction
2015-02-11 18:40:03 +00:00
Duarte Duarte f961c06612 Merge pull request #14106 from Noeliel/3.3.5
Scripts/ScarletEnclave: Add missing WorldObject parameter for Talk() ove...
2015-02-11 15:18:28 +00:00
Duarte Duarte 1d627ca1ea Merge pull request #13963 from tkrokli/3.3.5
Fix Cooldown for Raise Dead (Ghoul)
2015-02-11 15:17:01 +00:00