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
28,324 Commits 4 Branches 146 Tags
9866c77dad01ecf619a8a137004e679941c2f8a6
Commit Graph

13285 Commits

Author SHA1 Message Date
Aokromes
9866c77dad Core: Fix build 2016-05-05 06:34:48 +02:00
Shauren
049d20fdb7 Core/Networking: Added new AsyncRead method to Socket class allowing to pass a custom completion handler 
(Partially cherry-picked from f123c39659)
 2016-05-05 03:41:02 +02:00
RelevantJesse
c9e27cca44 Update PetAI.cpp 
Pulled check for IsReady to outside of the IsPositive check

(cherry picked from commit a71ea54a3a)
 2016-05-05 03:40:44 +02:00
MitchesD
c5d2ece2fe Core/Misc: fix build 
(cherry picked from commit ce5def332f)
 2016-05-05 03:40:27 +02:00
Shauren
702d19039e Core/Debugging: Make abort() less bad on windows by forcing crash log generation 
(cherry picked from commit dea7d429ab)

# Conflicts:
#	src/server/bnetserver/Main.cpp
 2016-05-05 03:40:04 +02:00
Shauren
fe64bdddb3 Core/Logging: Force synchronous logging after io_service shutdown - fixes logging on worldserver shutdown 
(cherry picked from commit a0b2be6c1d)
 2016-05-05 03:35:07 +02:00
Shauren
9d4e537a62 Core/PacketIO: Requeue packets handled with STATUS_LOGGEDIN received before player is fully loaded in one step after packet processing loop - reduces used locks from 3 per packet to 1 per packet 
(cherry picked from commit 8086a39210)
 2016-05-05 03:34:42 +02:00
Shauren
07ba043eae Warning fix 
(cherry picked from commit 983635458b)
 2016-05-05 03:34:21 +02:00
Shauren
3be8fba942 Core/Misc: Removed unneccessary boost/asio/buffer.hpp include 
(cherry picked from commit 01be486f2f)
 2016-05-05 03:33:40 +02:00
Shauren
c2abc2df38 Core/Logging: Include more info in bad realm log 
(cherry picked from commit a6dd6d7841)
 2016-05-05 03:32:43 +02:00
Andrew Letson
ee28593572 AHBot item class modifiers 
Adds missing modifiers to worldserver.conf

(cherry picked from commit e5c9997362)
 2016-05-05 03:32:14 +02:00
Aokromes
73090c97ec Core/Misc: 3.3.5a ports 2016-05-05 03:31:31 +02:00
Aokromes
77ea570937 Core/Misc: Fix warning 2016-05-05 03:13:58 +02:00
Aokromes
e472578780 Core/Misc: Fix warning 2016-05-05 03:00:40 +02:00
Aokromes
4af1006aba Core: try to compile fix 2016-05-04 17:50:30 +02:00
Aokromes
44814b0dc7 Core: try to compile fix 2016-05-04 17:37:08 +02:00
Aokromes
b7b5341fdf Core: more 3.3.5a ports 2016-05-04 17:32:40 +02:00
Aokromes
eb6fb8046b Core: more 3.3.5a ports 2016-05-04 17:29:32 +02:00
Aokromes
34cd349967 Core: more 3.3.5a ports 2016-05-04 17:21:52 +02:00
Aokromes
86273d44c8 Core: more 3.3.5a ports 2016-05-04 17:15:27 +02:00
Aokromes
78d1dfd11a Core: more 3.3.5a ports 2016-05-04 17:13:24 +02:00
Aokromes
2f8205e012 Core: more 3.3.5a ports 2016-05-04 15:17:29 +02:00
Vincent-Michael
dd02d8b004 Scripts: Added missing overrides 
(cherry picked from commit 00b4e8b6cc)

Conflicts:
	src/server/scripts/Kalimdor/zone_desolace.cpp
 2016-05-04 03:04:51 +02:00
Vincent-Michael
f42e6647e4 Core/Commands: Added transport position for command .gps 
(cherry picked from commit 9c99a1d0c7)
 2016-05-04 02:59:13 +02:00
Shauren
3c6e9fe8b6 Core/Auth: Fixed login for accounts with accented characters 
Closes #16770

Conflicts:
	src/server/database/Database/Implementation/LoginDatabase.cpp
 2016-05-04 02:56:53 +02:00
Shauren
ddb85e242a Core/Networking: Fixed DelayedCloseSocket when compiled without TC_SOCKET_USE_IOCP (linux) 
Closes #16769

(cherry picked from commit 0daba931ef)
 2016-05-04 02:52:03 +02:00
Aokromes
9a074db8bf Compile fix 2016-05-03 17:29:59 +02:00
Aokromes
303082546b Sync with 3.3.5a core 2016-05-03 12:50:49 +02:00
Aokromes
0ac5f4a440 Sync with 3.3.5a core 2016-05-03 12:40:27 +02:00
Aokromes
41e7c525f6 Build fix 2016-05-01 16:12:56 +02:00
Carbenium
dd917e4214 Merge branch 'patch-3' into '4.3.4' 
Raid/Baradin Hold: Pit Lord Argaloth

Pit Lord Argaloth should cast one time Fel Firestom at 66% Health and 33% Health. The way it was scripted made boss cast continuosly Fel Firestom from 66% to 0%. Now it is ok.

See merge request !9
 2016-04-30 22:48:49 +00:00
Aokromes
f036d55daa Merge branch 'patch-2' into '4.3.4' 
Zul'Aman/Hexlord : Deleted unused code and improoved for 4.3.4



See merge request !8
 2016-04-30 22:45:35 +00:00
Aokromes
2c44f9ed2c Core/SmartAI: Correct startup log 2016-04-26 02:08:17 +02:00
Girip Dragos
88ba2d4ebd Typo 2016-04-19 22:23:03 +00:00
Aokromes
14042c8104 Core/DataStores: Renamed unknown dbc field 
From 6.x branch
 2016-04-14 17:19:41 +02:00
Aokromes
1b0cc33b3e Core: Name some Spell Effects 2016-04-13 23:57:19 +02:00
Aokromes
e8d994f568 Core/Spells: Implemented spell effects SPELL_EFFECT_UPDATE_PLAYER_PHASE and SPELL_EFFECT_UPDATE_ZONE_AURAS_AND_PHASES 
By Lopfest
 2016-04-13 20:39:21 +02:00
Girip Dragos
e909652eba Everything should be fine now. 2016-04-09 19:21:22 +00:00
Girip Dragos
b6e2285289 My bad. 2016-04-09 19:15:31 +00:00
Girip Dragos
07551d62b0 Raid/Baradin Hold: Pit Lord Argaloth 2016-04-09 19:05:00 +00:00
Girip Dragos
74dfec580c Zul'Aman/Hexlord : Deleted unused code and improoved for 4.3.4 2016-04-08 23:04:48 +00:00
Aokromes
db7358ff69 Core: fixed few coverity issues and warnings 2016-04-05 04:57:34 +02:00
Aokromes
70697c6fce Core: fixed few coverity issues and warnings 2016-04-03 08:04:26 +02:00
Aokromes
30b80d6e82 Core: fixed few coverity issues and warnings 
Partial port of b68b6417f6 by joschiwald
 2016-04-03 07:36:50 +02:00
Aokromes
6b00c75b99 Core/Phase: fixed phase update on area change 
by Lopfest
 2016-03-24 19:13:27 +01:00
Aokromes
ef29f1037e Misc: Fix download db url 2016-03-17 19:05:46 +01:00
ariel-
ccc89900ba Core/Quest: Merge Quest template constructor with 3.3, removed double increment of some vars, remove multiple iterations 2016-03-11 20:08:00 -03:00
ariel-
98a1e712d4 Bnetserver: Fix warning 2016-03-11 20:06:59 -03:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
Dr-J
c9f9e93c22 Remove Lady Jaina Proudmores CPP script from zone_dustwallow_marsh.cpp 2016-03-09 23:31:36 +00:00