Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,073 Commits 4 Branches 146 Tags
5b1ea3e4e5476bb13eedf5dece641a030e23e0e3
Commit Graph

28073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aokromes
5b1ea3e4e5 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2016-03-04 07:52:34 +01:00
Aokromes
dec2d5216c DB/Misc: 3.3.5a fixes 2016-03-04 07:51:56 +01:00
ariel-
d44dd09737 Core/Auras: Should not remove other targets' aura if it keeps on same phase than caster 
Closes #42
 2016-03-03 01:57:46 -03:00
ariel-
5df10956c0 Core/Misc: Fix crash in .reload creature_template 2016-03-03 01:36:03 -03:00
Aokromes
01cecad74b DB/Misc: remove 3.3.5a only fix 2016-03-01 22:29:16 +01:00
Aokromes
e0887159e5 DB/Misc: 3.3.5a fixes 2016-03-01 07:31:42 +01:00
Aokromes
a10b5cf3fe DB/Misc: Fix import 
TODO: remember the new table for commits containing spell_dbc
 2016-02-22 17:40:54 +01:00
Aokromes
4f31852049 DB/Misc: 3.3.5a fixes 2016-02-22 16:01:46 +01:00
ariel-
35aa198984 Core/Scripts: Fix startup errors 2016-02-21 20:32:48 -03:00
ariel-
2de8d6b4bb Core/Misc: fix warnings 2016-02-21 19:00:28 -03:00
Aokromes
c1dc9affcf DB/Misc: Fix some startup errors 2016-02-21 22:33:57 +01:00
Aokromes
963998dbe2 DB/Misc: Fix some startup errors 2016-02-21 22:16:13 +01:00
Killyana
01bd599eb2 DB/Creature: Add missing spawns on Azuremyst Isle 2016-02-21 16:54:44 +01:00
ariel-
b7c914b27e Core/Tools: fix build 2016-02-21 08:23:47 -03:00
ariel-
bb6089bb8c Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing) 
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e)
 2016-02-21 08:16:32 -03:00
ariel-
8bc477a2de Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	sql/updates/world/2016_01_26_00_world.sql
	sql/updates/world/2016_01_31_00_world.sql
	sql/updates/world/2016_02_07_00_world.sql
	src/server/authserver/Server/AuthSession.cpp
	src/server/database/Database/Implementation/LoginDatabase.cpp
	src/server/database/Database/Implementation/LoginDatabase.h
	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
	src/server/game/AI/ScriptedAI/ScriptedCreature.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/DataStores/DBCStores.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/Globals/ObjectMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Networking/AsyncAcceptor.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/adt.h
	src/tools/mmaps_generator/MapBuilder.cpp
 2016-02-21 07:02:53 -03:00
Aokromes
a13734777f DB/Misc: Fix import 2016-02-21 07:11:28 +01:00
Aokromes
ff5a27c55f DB/Misc: 3.3.5a fixes 2016-02-21 07:06:14 +01:00
Naios
ae1a5c6c2b Core/Updater: Use a different method for file reading 
* Current method causes issues under CentOS 6 and could possibly
  lead to cutted buffer content when reading in textmode.
* Closes #16209
 2016-02-20 20:18:42 +01:00
Aokromes
4cd937140b Merge pull request #16038 from tkrokli/grammar_and_spelling_corrections_335 
[3.3.5] Core/Logs: English text corrections
 2016-02-20 13:23:35 +01:00
Shauren
e60f575ac8 Core/Misc: Fixed a crash happening when a db string array was NULL 
Closes #15670
 2016-02-20 13:13:29 +01:00
Shauren
b2e03a7448 Core/Networking: Rewrite networking threading model 
Each network thread has its own io_service - this means that all operations on a given socket except queueing packets run from a single thread, removing the need for locking
Sending packets now writes to a lockfree intermediate queue directly, encryption is applied in network thread if it was required at the time of sending the packet

(cherry picked from commit 97a79af470)
 2016-02-20 13:08:03 +01:00
tkrokli
9e4cc26312 [3.3.5] Core/Logs: English text corrections 
This is an attempt to proofread standard error messages and system messages
from both core and DB. The corrections span typos, grammar and punctuation.

Because some of these messages can have multiple meanings depending on context,
this PR will stay in "WIP" status until the corrections have been validated and approved.

You are welcome to suggest improvements and files not yet included in this list.

Thanks to @Kinzcool for suggesting this line of work. :)
 2016-02-20 10:05:04 +01:00
treeston
d4184065b6 I don't like drycoding. It's coarse and rough and irritating and it gets everywhere. 2016-02-20 03:20:43 +01:00
treeston
ab194d5ae3 Incorrect AI aggression as a consequence of the LineOfSight change, episode three, revenge of the special AIs. Also, hopefully the last. No original trilogy please. 2016-02-20 03:13:11 +01:00
Shauren
e4dfbb60fd Rename 2016_02_15_01_world_335.sql to 2016_02_19_01_world_335.sql 2016-02-19 15:03:21 +01:00
Shauren
2ee36facad Merge pull request #16622 from P-Kito/3.3.5 
[3.3.5] Core/Spells: Fix Glyph of Arcane Shot
 2016-02-19 15:02:17 +01:00
Treeston
3e250fe4e8 Merge pull request #16633 from Treeston/3.3.5-talentinspect 
Core/Packets: Adjust 'TalentsInspecting' option
 2016-02-19 14:04:18 +01:00
Dr-J
f2ab2464be DB/Quest: Uncommon Scents 
The quests http://www.wowhead.com/quest=24805 and http://www.wowhead.com/quest=24805 are optional breadcrumb quests and this first quest from both faction chains is skippable.
 2016-02-19 01:03:22 +00:00
ariel-
e4c4baa7cb DB/Misc: Fix server startup 
ERROR 1264 (22003) at line 3: Out of range value for column 'AllowableRaces' at row 1
 2016-02-18 20:56:53 -03:00
Kittnz
1516600cef DB/Pets: Fix script names for Egbert & Pandaran Monk 2016-02-18 22:36:31 +01:00
Kittnz
542f5264d3 Core/Pets: Move Egbert & Pandaren Monk into pet_generic.cpp 2016-02-18 21:30:49 +01:00
MitchesD
8e8f597a07 Rename 2016_01_13_99_world.sql to 2016_02_18_01_world.sql 2016-02-18 21:04:11 +01:00
MitchesD
408572c472 Merge pull request #16258 from sirikfoll/feast 
Core/Spells Implemented SpellScripts Needed for Achievement Pilgrim's…
 2016-02-18 21:03:11 +01:00
Treeston
59e59e412f Merge pull request #16637 from P-Kito/lfg_quest 
[3.3.5/6.x] Core/Player: Fix dungeonfinder quests not rewarding
 2016-02-18 20:57:09 +01:00
treeston
1134b5e2f4 Core/Packets: Adjust 'TalentsInspecting' option so it no longer doesn't actually do what it says (but would instead disable talent inspecting completely). 2016-02-18 20:54:59 +01:00
Kittnz
b872565fb6 Apparently it's already 18/02.. 2016-02-18 20:13:21 +01:00
Kittnz
359d9bf140 Rename SQL 2016-02-18 20:11:26 +01:00
Kittnz
2d753cd783 Merge pull request #16132 from henhouse/smitefix 
Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switch…
 2016-02-18 20:07:22 +01:00
Dr-J
67b6f38287 DB/Event: Love is in the Air (Kwee Q. Peddlefeet) 
Script all instances of Kwee Q. Peddlefeet to give option to give Lovely Charm Collector's Kit.  Player does not need quest for this option to be available, gossip menu already existed in db and all but 2 of the Kwee Q. Peddlefeet already had gossip menu set in creature template but no gossip npc flags.
 2016-02-18 16:51:55 +00:00
Dr-J
982e3ef3ef DB/Event: Love is in the Air 
Implement some missing texts and gossips
 2016-02-18 16:08:07 +00:00
Kito
ab2b0f4168 Core/Spells: Fix Glyph of Arcane Shot 2016-02-17 22:58:04 +01:00
Kito
97e0d1bbdf Core/Player: Fix dungeonfinder quests not rewarding 2016-02-17 22:39:14 +01:00
DDuarte
b8bd0053d8 Github issue and pull request templates 
(cherry picked from commit 4944802399)
(cherry picked from commit a624b4523f)
(cherry picked from commit 08e6294c80)
(cherry picked from commit b6b5665158)
 2016-02-17 21:02:23 +00:00
Killyana
1399e705eb DB/Event: Fix all Commoners spawns, models, auras and quests 
Updates #16129
 2016-02-17 18:38:23 +01:00
Henry
5ee2be21bf Scripts/Deadmines: Fix #6624 Mr. Smite's event text, and phase switching. 
* Fixes Mr. Smite announcing to instance once doors have been destroyed.
* Add missing dialogue to encounter phases.
* Now properly runs in front of his chest, kneels down and equips items, stands, and reengages like he's supposed to.
* Fix weapon model for first phase when he switched to double axes.
 2016-02-16 17:07:09 -05:00
treeston
ae58f8e616 Revert "Merge pull request #16535 from Eliminationzx/FixWrongSealOfRighteousnessCalculation" while we figure out more details (see discussion in the PR). 
This reverts commit 1a213bd921, reversing
changes made to 657adc270a.
 2016-02-16 12:34:20 +01:00
Shauren
655fc0135f Core/Auth: Cancel ban expiry check timer on shutdown 2016-02-16 00:16:31 +01:00
Shauren
811c8bbd69 Build fix 2016-02-15 19:40:34 +01:00
Shauren
dfbb3bec56 Core/Auth: Moved expiring bans to background task - no longer blocking queries during login by default running every minute (configurable) 2016-02-15 19:38:53 +01:00