Carbenium
b82a072b25
Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4
...
Conflicts:
dep/cppformat/CMakeLists.txt
dep/cppformat/ChangeLog.rst
dep/cppformat/format.cc
dep/cppformat/format.h
dep/cppformat/posix.cc
dep/cppformat/posix.h
sql/updates/world/2015_03_16_02_world.sql
sql/updates/world/2015_03_16_03_world.sql
sql/updates/world/2015_03_16_04_world.sql
sql/updates/world/2015_03_16_05_world.sql
sql/updates/world/2015_03_16_06_world.sql
sql/updates/world/2015_03_17_00_world.sql
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/worldserver/CMakeLists.txt
2015-07-21 23:46:56 +02:00
Carbenium
f7f6eae247
Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_16_00_world.sql
sql/updates/world/2015_03_16_01_world_335.sql
2015-07-21 23:35:43 +02:00
Carbenium
17bed260e3
Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_14_00_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
2015-07-21 23:27:27 +02:00
Carbenium
67d616c195
Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_01_00_world.sql
src/server/game/Server/WorldSocket.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
2015-07-21 23:20:40 +02:00
Carbenium
78da5d8e7e
Merge commit '2478bbcdb8f44c575714ae2f45aeef4a37556fc2' into 4.3.4
...
Conflicts:
sql/updates/world/2015_02_12_00_world.sql
sql/updates/world/2015_02_12_01_world.sql
sql/updates/world/2015_02_12_02_world.sql
sql/updates/world/2015_02_12_03_world.sql
sql/updates/world/2015_02_12_04_world.sql
sql/updates/world/2015_02_12_05_world.sql
sql/updates/world/2015_02_12_06_world.sql
sql/updates/world/2015_02_12_07_world.sql
sql/updates/world/2015_02_12_08_world.sql
sql/updates/world/2015_02_12_09_world.sql
sql/updates/world/2015_02_12_10_world.sql
sql/updates/world/2015_02_13_00_world.sql
sql/updates/world/2015_02_13_02_world.sql
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
2015-07-21 22:07:47 +02:00
Carbenium
7d5d040948
Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_02_06_13_world_335.sql
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
2015-07-21 21:45:04 +02:00
Carbenium
79eb80dcba
Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4
...
Conflicts:
README.md
sql/base/auth_database.sql
sql/updates/world/2014_12_27_01_world_335.sql
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Spells/spell_hunter.cpp
2015-07-21 20:05:44 +02:00
Carbenium
c0ee4ceac4
Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Accounts/RBAC.h
src/server/scripts/Commands/cs_modify.cpp
2015-07-21 19:02:53 +02:00
Carbenium
68fd138476
Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4
...
Conflicts:
sql/updates/world/2014_10_27_00_world.sql
sql/updates/world/2014_10_27_01_world_335.sql
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
2015-07-21 18:30:05 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
Carbenium
03176662d1
Merge pull request #14317 from Naios/typesafelog
...
Type safe logging
(cherry picked from commit cc0c9add5a3f3a17e19029ddcaa7e711040f4fc5)
Conflicts:
src/server/bnetserver/CMakeLists.txt
src/server/game/Server/WorldSocketMgr.cpp
src/server/shared/Logging/AppenderDB.cpp
src/server/worldserver/CMakeLists.txt
2015-03-18 02:59:40 +01:00
Naios
a38945a3b3
Core/Log: Fix some issues detected by static analysis.
...
* Either inefficient or wrong usage of string::find(). string::compare() will
be faster if string::find's result is compared with 0, because it will not scan the whole string.
If your intention is to check that there are no findings in the string,
you should compare with std::string::npos.
* C-style pointer casting detected. C++ offers four different kinds of casts as replacements:
static_cast, const_cast, dynamic_cast and reinterpret_cast.
(cherry picked from commit 8882a6ca78e90d2980a3cd8d53acea9d2137f8b8)
2015-03-18 01:13:46 +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
joschiwald
170bc318b3
Core/Player: fixed some leftovers in db after player delete
...
* character_arena_stats
* character_battleground_random
* character_cuf_profiles
* character_currency
* character_stats
* character_void_storage
(cherry picked from commit 2955a1f595be8ba510260e5a84b53663f2300fff)
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
2015-03-15 13:06:49 +00:00
leak
147a959f51
CMake: Remove unused source reference
2015-03-09 14:53:23 +01:00
click
d5718f3372
Core: WARN instead of INFO - this is actually something we'd want to be informed of...
2015-03-08 06:17:32 +01:00
jackpoz
43f74fd8cf
Shared/Logs: Add support to .server set loglevel command after 003d67708b
...
Update the lowest log level when using ".server set loglevel" command.
2015-03-03 21:11:08 +01:00
jackpoz
003d67708b
Shared/Logs: Improve log performances
...
Improve Log::ShouldLog() performances by saving the lowest log level across all loggers and discarding any log with lower level than that.
2015-03-02 22:32:36 +01:00
Shauren
e52b46abba
Core/Crypto: Fixed output of BigNumber::AsByteArray when generated array is shorter than requested size
2015-03-01 14:16:16 +01:00
jackpoz
fd844e3d7e
Core/CrashHandler: Fix char[] without '\0' handling
...
Fix char[] without a NULL character '\0' in the array reading over the char[] bounds
2015-02-27 21:31:30 +01:00
Intel
b911356bad
Core/Networking: Fixed IOCP define for linux
...
(cherry-picked from commit 518c744336fe7306a034beb46289d5009b959e7d)
2015-02-25 23:30:54 +00:00
jackpoz
62001360dd
Shared/Database: Improve dead-lock error handling
...
Improve dead-lock error handling by making sure only 1 thread at time retries to execute a transaction so they don't keep dead-locking each other.
2015-02-12 22:48:57 +01:00
Nayd
c66bd709f1
Fix build
2015-02-04 19:44:34 +00:00
jackpoz
d4db0c15c7
Shared/Database: Fix transactions not being recommitted on dead-lock error
...
Fix transactions not being recommitted on dead-lock error (error code 1213) because of calling http://dev.mysql.com/doc/refman/5.0/en/mysql-errno.html after sending the ROLLBACK command. This way the returned error code was related to the ROLLBACK command, not the failed transaction.
2015-02-04 19:42:39 +01:00
jackpoz
7b05b0cb81
Core/Misc: Fix static analysis issues
...
Fix some static analysis issues reported by Coverity
(cherry picked from commit 89c535cf2a960ccc03cd1a032310984f9b4e1d47)
Conflicts:
src/server/game/Entities/Player/Player.cpp
2015-02-02 01:45:38 +00:00
jackpoz
4c0476bfd7
Core/Misc: Properly sanitize ReputationSpillover data
...
Fix an issue added in 024b57bb74 that didn't properly skip ReputationSpillover rows with invalid data.
Fix also a static analysis issue reported by Coverity.
(cherry picked from commit 95b1204798d3ab2a141f81b294b064255c335b8a)
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
2015-01-31 22:24:12 +00:00
Vincent-Michael
f3e86d3e68
Update copyright note for 2015
...
Happy new year
Conflicts:
src/server/bnetserver/Authentication/AuthCodes.h
src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
src/server/bnetserver/Packets/AchievementPackets.h
src/server/bnetserver/Packets/AuthenticationPackets.cpp
src/server/bnetserver/Packets/AuthenticationPackets.h
src/server/bnetserver/Packets/BitStream.cpp
src/server/bnetserver/Packets/BitStream.h
src/server/bnetserver/Packets/CachePackets.cpp
src/server/bnetserver/Packets/CachePackets.h
src/server/bnetserver/Packets/ChatPackets.h
src/server/bnetserver/Packets/ConnectionPackets.cpp
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/bnetserver/Packets/FriendsPackets.cpp
src/server/bnetserver/Packets/FriendsPackets.h
src/server/bnetserver/Packets/PacketManager.cpp
src/server/bnetserver/Packets/PacketManager.h
src/server/bnetserver/Packets/Packets.h
src/server/bnetserver/Packets/PacketsBase.cpp
src/server/bnetserver/Packets/PacketsBase.h
src/server/bnetserver/Packets/PresencePackets.cpp
src/server/bnetserver/Packets/PresencePackets.h
src/server/bnetserver/Packets/ProfilePackets.h
src/server/bnetserver/Packets/SupportPackets.h
src/server/bnetserver/Packets/WoWRealmPackets.cpp
src/server/bnetserver/Packets/WoWRealmPackets.h
src/server/bnetserver/Realms/RealmList.cpp
src/server/bnetserver/Realms/WorldListener.cpp
src/server/bnetserver/Realms/WorldListener.h
src/server/bnetserver/Server/ComponentManager.cpp
src/server/bnetserver/Server/ComponentManager.h
src/server/bnetserver/Server/ModuleManager.cpp
src/server/bnetserver/Server/ModuleManager.h
src/server/bnetserver/Server/Session.cpp
src/server/bnetserver/Server/Session.h
src/server/bnetserver/Server/SessionManager.cpp
src/server/bnetserver/Server/SessionManager.h
src/server/game/Accounts/BattlenetAccountMgr.cpp
src/server/game/Accounts/BattlenetAccountMgr.h
src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
src/server/game/Entities/AreaTrigger/AreaTrigger.h
src/server/game/Entities/Item/ItemTemplate.cpp
src/server/game/Guilds/GuildFinderMgr.cpp
src/server/game/Guilds/GuildFinderMgr.h
src/server/game/Handlers/GuildFinderHandler.cpp
src/server/game/Handlers/VoidStorageHandler.cpp
src/server/game/Movement/MovementStructures.cpp
src/server/game/Movement/MovementStructures.h
src/server/game/Movement/PathGenerator.cpp
src/server/game/Server/BattlenetServerManager.cpp
src/server/game/Server/BattlenetServerManager.h
src/server/game/Server/Packet.cpp
src/server/game/Server/Packet.h
src/server/game/Server/Packets/AchievementPackets.cpp
src/server/game/Server/Packets/AchievementPackets.h
src/server/game/Server/Packets/AuctionHousePackets.cpp
src/server/game/Server/Packets/AuctionHousePackets.h
src/server/game/Server/Packets/AuthenticationPackets.cpp
src/server/game/Server/Packets/AuthenticationPackets.h
src/server/game/Server/Packets/BattlegroundPackets.cpp
src/server/game/Server/Packets/BattlegroundPackets.h
src/server/game/Server/Packets/ChannelPackets.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/CharacterPackets.cpp
src/server/game/Server/Packets/CharacterPackets.h
src/server/game/Server/Packets/ChatPackets.cpp
src/server/game/Server/Packets/ChatPackets.h
src/server/game/Server/Packets/ClientConfigPackets.cpp
src/server/game/Server/Packets/ClientConfigPackets.h
src/server/game/Server/Packets/CombatLogPackets.cpp
src/server/game/Server/Packets/CombatLogPackets.h
src/server/game/Server/Packets/CombatPackets.cpp
src/server/game/Server/Packets/CombatPackets.h
src/server/game/Server/Packets/EquipmentSetPackets.cpp
src/server/game/Server/Packets/EquipmentSetPackets.h
src/server/game/Server/Packets/GameObjectPackets.cpp
src/server/game/Server/Packets/GameObjectPackets.h
src/server/game/Server/Packets/GuildPackets.cpp
src/server/game/Server/Packets/GuildPackets.h
src/server/game/Server/Packets/ItemPackets.cpp
src/server/game/Server/Packets/ItemPackets.h
src/server/game/Server/Packets/LootPackets.h
src/server/game/Server/Packets/MiscPackets.cpp
src/server/game/Server/Packets/MiscPackets.h
src/server/game/Server/Packets/MovementPackets.cpp
src/server/game/Server/Packets/MovementPackets.h
src/server/game/Server/Packets/NPCPackets.cpp
src/server/game/Server/Packets/NPCPackets.h
src/server/game/Server/Packets/QueryPackets.cpp
src/server/game/Server/Packets/QueryPackets.h
src/server/game/Server/Packets/QuestPackets.cpp
src/server/game/Server/Packets/QuestPackets.h
src/server/game/Server/Packets/ReputationPackets.cpp
src/server/game/Server/Packets/ReputationPackets.h
src/server/game/Server/Packets/SpellPackets.cpp
src/server/game/Server/Packets/SpellPackets.h
src/server/game/Server/Packets/SystemPackets.cpp
src/server/game/Server/Packets/SystemPackets.h
src/server/game/Server/Packets/TalentPackets.cpp
src/server/game/Server/Packets/TalentPackets.h
src/server/game/Server/Packets/TradePackets.h
src/server/game/Server/Packets/WorldStatePackets.cpp
src/server/game/Server/Packets/WorldStatePackets.h
src/server/game/Server/WorldSocket.cpp
src/server/ipc/CMakeLists.txt
src/server/ipc/Commands.cpp
src/server/ipc/Commands.h
src/server/ipc/ZMQTask.cpp
src/server/ipc/ZMQTask.h
src/server/ipc/ZmqContext.cpp
src/server/ipc/ZmqContext.h
src/server/ipc/ZmqListener.cpp
src/server/ipc/ZmqListener.h
src/server/ipc/ZmqMux.cpp
src/server/ipc/ZmqMux.h
src/server/ipc/ZmqWorker.cpp
src/server/ipc/ZmqWorker.h
src/server/scripts/Commands/cs_battlenet_account.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.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_nalorakk.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
src/server/scripts/Kalimdor/Firelands/firelands.h
src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.h
src/server/shared/Cryptography/Authentication/AuthCrypt.h
src/server/shared/Cryptography/Authentication/PacketCrypt.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
src/server/shared/Cryptography/HmacHash.cpp
src/server/shared/Cryptography/SHA256.cpp
src/server/shared/Cryptography/SHA256.h
src/server/shared/Database/Implementation/HotfixDatabase.cpp
src/server/shared/Database/Implementation/HotfixDatabase.h
src/server/shared/Realm/Realm.cpp
src/server/shared/Realm/Realm.h
src/tools/connection_patcher/CMakeLists.txt
src/tools/connection_patcher/Constants/BinaryTypes.hpp
src/tools/connection_patcher/Helper.cpp
src/tools/connection_patcher/Helper.hpp
src/tools/connection_patcher/Patcher.cpp
src/tools/connection_patcher/Patcher.hpp
src/tools/connection_patcher/Patches/Common.hpp
src/tools/connection_patcher/Patches/Mac.hpp
src/tools/connection_patcher/Patches/Windows.hpp
src/tools/connection_patcher/Patterns/Common.hpp
src/tools/connection_patcher/Patterns/Mac.hpp
src/tools/connection_patcher/Patterns/Windows.hpp
src/tools/connection_patcher/Program.cpp
src/tools/map_extractor/loadlib/DBFilesClientList.h
2015-01-01 00:32:50 +01:00
jackpoz
cdf6c88462
Shared/Networking: Fix buffer overflow in Socket handling
...
Fix a buffer overflow caused by Boost trying to store too much data in a buffer too small.
2014-12-27 14:03:54 +01:00
Nayd
24c173f387
Core: Use the correct function to convert strings to unsigned longs and unsigned long longs
...
Fixes wrong data being inserted into the database (i.e explored zones).
More info in #13493
Fixes #13493
Thanks to @jackpoz for finding the code issue and @Vavehl for an expectional bug report.
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
2014-11-26 02:21:50 +00:00
Nayd
1119558b9e
Core/Networking: Catch possible boost exception in StartNetwork
...
Closes #13557
(cherry picked from commit 3eb120ab507aa65e452d21a63ff500254129c262)
2014-11-16 20:10:23 +00:00
ShinDarth
fd0b961781
Core/Commands: implement .pvpstats command
...
Shows number of battleground victories in the last 7 days
Closes #13460
2014-11-10 22:30:20 +00:00
Rat
8ba89d2311
Core/Phases: implemented new commands:
...
.npc set phase
.npc set phasegroup
- implemented saving creature phasing to database
2014-10-30 16:18:11 +01:00
Rat
b91c8c76b6
Core/Phases: fixed corpse phase deleting
2014-10-30 11:28:10 +01:00
Rat
517369a3df
Core/Phases: more work on corpse phasing
...
- moved all sql queries to prepared statements
- implemented corpse phases saving, loading, cleaning
2014-10-29 21:47:25 +01:00
Rat
9f33e02a85
Core/Phases: removed phaseMask from corpse queries
2014-10-28 20:16:05 +01:00
Rochet2
b53810ea37
AH related fixes
...
Load items from memory instead of DB (may break 3rd party programs)
Fix item suffix search Closes #9196
For AHBot set expired auctions ignored from update process
2014-10-25 11:28:25 +03:00
DDuarte
02842a20b6
Core/Shared: Fix typo in LoginDatabase enum
2014-10-19 03:50:53 +01:00
DDuarte
5bf55eacfd
Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Instances/InstanceScript.h
src/server/scripts/Northrend/isle_of_conquest.cpp
src/server/shared/Database/Implementation/LoginDatabase.cpp
src/server/shared/Database/Implementation/LoginDatabase.h
2014-10-19 00:18:06 +01:00
Heihachi
15a9c6729e
Scripts/Commands: Implement mutehistory command for GM's with requested improvements
...
Closes #13350
2014-10-18 23:34:18 +01:00
ShinDarth
e806fc8a02
Core/Quest: implement Quest Tracker
2014-10-18 18:37:39 +02:00
Vincent-Michael
63d7b348bb
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-10 05:29:06 +02:00
Shauren
b781a4dc33
Core/Logging: Replaced direct calls to GetCounter() in logs with ToString()
2014-10-08 17:59:27 +02:00
Vincent-Michael
689b7f6d56
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-05 03:44:35 +02:00
Vincent-Michael
f989c7182c
Core/Misc: Added support for calculate zoneId/areaId for creature / gameoject table at loading (Slow server startup ca.3-4 sec.)
2014-10-05 01:57:37 +02:00
Shauren
8427e879f1
Core/Authserver
...
* Reorganized packet classes, moved each channel to separate namespace and file
* Added all opcode names for channels: auth, connection and wowrealm
* Documented more fields in LogonResponse
2014-10-04 15:45:33 +02:00
Vincent-Michael
caeb933d9e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-02 22:36:58 +02:00
Shauren
04b6f9111a
Fixed ==25829== Thread #1 : pthread_cond_{signal,broadcast}: dubious: associated lock is not held by any thread
...
==25829== at 0x4C2A1D5: pthread_cond_broadcast_WRK (hg_intercepts.c:891)
==25829== by 0x654A758: std::condition_variable::notify_all() (in /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.17)
==25829== by 0x132305A: ProducerConsumerQueue<SQLOperation*>::Cancel() (ProducerConsumerQueue.h:100)
==25829== by 0x13229A7: DatabaseWorkerPool<WorldDatabaseConnection>::~DatabaseWorkerPool() (DatabaseWorkerPool.h:70)
==25829== by 0x6C6CB21: __run_exit_handlers (exit.c:78)
==25829== by 0x6C6CB74: exit (exit.c:100)
==25829== by 0x6C54EF3: (below main) (libc-start.c:276)
2014-10-02 20:09:08 +02:00
Vincent-Michael
faa4fc1b31
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-09-30 22:33:30 +02:00
jackpoz
5150222f19
Revert "Core/AuctionHouse: Delete expired auctions at startup."
...
This reverts commit a92038feaf which caused items of expired auctions not being mailed back to the owner and leaving those items in item_instance table.
Please refer to the forum for steps to verify the integrity of your database and remove old unneeded rows in item_instance table.
Fixes #12699
2014-09-30 21:25:58 +02:00
DDuarte
9b14efd6f7
Core/ByteBuffer: Call FlushBits() in every append, not only on fundamental types
2014-09-27 22:07:09 +01:00