Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,495 Commits 4 Branches 146 Tags
5b762e9ff7e665e1236047db9c09ea140a4652bd
Commit Graph

1237 Commits

Author SHA1 Message Date
Carbenium
ab0d8cec6d Core/Quest: Fix loading quests after merge 2015-07-25 01:02:55 +02:00
Carbenium
ad99eb8dfe server starts now successfully. login is possible 2015-07-24 22:15:10 +02:00
Carbenium
293658fb13 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	.gitattributes
	dep/PackageList.txt
	sql/base/characters_database.sql
	sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
	sql/updates/world/2015_07_01_03_world_335.sql
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/GameObject/GameObject.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/QueryHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2015-07-22 02:26:46 +02:00
Carbenium
6dfaec3d97 Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4 
Conflicts:
	.gitattributes
	CONTRIBUTING.md
	sql/updates/world/2015_05_11_04_world.sql
	sql/updates/world/2015_05_27_00_world.sql
	sql/updates/world/2015_05_27_01_world.sql
	sql/updates/world/2015_06_06_01_world_335.sql
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2015-07-22 02:09:32 +02:00
Carbenium
82ea8da720 Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4 
Conflicts:
	.travis.yml
	README.md
	sql/updates/world/2015_04_18_00_world.sql
	sql/updates/world/2015_04_18_05_world_335.sql
	sql/updates/world/2015_04_26_03_world_335.sql
	sql/updates/world/2015_05_09_00_world_335.sql
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellInfo.cpp
 2015-07-22 01:33:48 +02:00
Carbenium
224c7dc6ae Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4 
Conflicts:
	README.md
	sql/updates/world/2015_04_04_00_world.sql
	sql/updates/world/2015_04_04_01_world.sql
	sql/updates/world/2015_04_05_06_world_335.sql
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_account.cpp
	src/tools/map_extractor/System.cpp
	src/tools/vmap4_extractor/adtfile.cpp
 2015-07-22 00:54:34 +02:00
Carbenium
963150dc8e Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
 2015-07-22 00:37:27 +02:00
Carbenium
fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4 
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
 2015-07-22 00:26:09 +02:00
Carbenium
069f4c279b Merge commit 'e96676aeddb4763f6353675724fd6a033d60fbcb' into 4.3.4 2015-07-22 00:08:04 +02:00
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
Shauren
23e4472d14 Core/PacketIO: Removed timezone adjustments from ReadPackedTime - player's session timezone offset should be used there, not server offset 
(cherry picked from commit aa3b05c312)
 2015-07-06 22:25:34 +01:00
Naios
4335611010 Core/Updater: Fix mysql cli password prompt when password is empty. 
* ref: http://community.trinitycore.org/topic/11510-world-server-bug-enter-password-to-update/
 2015-06-30 23:33:07 +02:00
Naios
836ec5a6e6 Core/Utilities: Fix callback invokation when there are no tasks present. 
* thx @joschiwald for noticing.
 2015-06-30 23:29:19 +02:00
Carbenium
adb5d3ea5f Merge pull request #14941 from ShinDarth/db_backports3 
DB/World schema backport: move questItem* fields to *_questitem tables
 2015-06-29 20:03:11 +02:00
ShinDarth
1c0b0f825c DB/World schema backport: move questItem* fields to *_questitem tables 2015-06-29 19:21:00 +02:00
Warpten
aade16a2f4 Scripts/RubySanctum: Updates to Halion. 
* Fixed Living Embers not spawning.
* Meteor Strike is now randomized.

(cherry picked from 1447875cac)

Scripts/RubySanctum: Fix a mathematical mistake.
SQL: Do not use MAX(Id), hardcode it.

(cherry picked from 7a5bc9e1fe)

Scripts/RubySanctum: Correctly spawn Living Embers.

(cherry picked from 7c4b8b0e82)

Scripts/RubySanctum: Remove duplicate code.

(cherry picked from 1d29328769)

Core/Misc: Warning fixes

(cherry picked from dc53dad8a4)
 2015-06-26 01:52:17 +01:00
ShinDarth
f8230a59a9 DB/Characters: Backport schema changes from 6.x branch (renames) 
Closes #14951
 2015-06-26 00:28:32 +01:00
Naios
3d95aba2b3 Core/Utilities: TaskScheduler: add a task validator and on update success callback. 
* makes it possible to block tasks if there is an active spellcast.
* requested by @joschiwald
 2015-06-21 18:19:17 +02:00
Naios
bd661b58fd Core/Updater: Fix a wrong formatter introduced in 0d095109ee 
* thanks @Aokromes for noticing
 2015-06-21 18:13:01 +02:00
Naios
a5b3862bc1 Core/Updater: Add some info about the count of applied updates. 
* some minor improvements
* add a log message when database updates are disabled.
 2015-06-20 14:33:31 +02:00
Naios
151a0f5c5e Core/Shared: Hide the internal shared_ptr of the TaskContext 
* use . operator instead of -> to access the TaskContext now.
* Add TaskContext::IsExpired to check whether the owner has expired.
 2015-06-03 18:24:21 +02:00
jackpoz
1a5051a9c3 Core/CrashHandler: Make crashhandler tread-safe 
Handle only 1 exception in the whole process lifetime and create only 1 crash report.
 2015-06-01 21:43:57 +02:00
MitchesD
db8fdd94ed Merge pull request #14782 from doctaweeks/fixes-for-6.x 
Minor fixes for 6.x
(cherry picked from commit 0cf0209741)

Conflicts:
	src/server/bnetserver/Main.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
	src/server/game/Battlegrounds/Zones/BattlegroundTP.h
	src/server/game/Chat/Channels/Channel.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.h
	src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
	src/server/shared/Cryptography/SHA256.h
 2015-06-01 00:39:56 +01:00
Naios
da77a90aa9 Shared/Util: Introduce a task scheduler which schedules task with c++11 techniques. 
* Use std::function as callback (methods, lamdas & std::bind).
* Uses std::chrono::duration as duration type (Milliseconds, Seconds...)
  - With c++11 user defined literals we could just write "11s" for example (MSVS 2015, gcc & clang).
* Provides a lot of overloads for easier usage:
  - Static durations or random durations between min and max.
  - Named (with group ids - group id 0 is possible) or anonymous tasks.
  - Asynchronous tasks.
* Is adapted to the current needs of scripting:
  - Repeat tasks through the TaskContext
  - Schedule new tasks from the context.
  - Provides access to the times repeat counter of a task,
    this will help to schedule multi step events (dialogs for example).

See https://gist.github.com/Naios/6d143538abdc3d32fd2b for usage examples.
 2015-05-31 19:32:09 +02:00
glkrlos
fd660d725d Core/Updater: Fix issues when connecting through unix sockets. 
* closes #14766
* closes #14759

Signed-off-by: Naios <naios-dev@live.de>
 2015-05-28 18:30:03 +02:00
jackpoz
ec4b08e3cf Core/CrashHandler: Log STACK_OVERFLOW crashes 
Try to log STACK_OVERFLOW crashes by allocating log buffer on the heap which should still be in a valid state with a stack overflow exception.
This will probably still not produce a complete crash report with details about all stackframes.
 2015-05-23 23:15:56 +02:00
Shauren
ba9e0de36d Core/Misc: Removed gcc specific packing pragma syntax - only unsupported (now) versions required it 
(cherry picked from commit 4c7c2abf03)

Conflicts:
	src/server/bnetserver/Packets/BitStream.h
	src/server/shared/Common.h
 2015-05-19 21:47:48 +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
Shauren
970d7abf97 Core/Networking: Fixed possible msvc debug assertions in vector 
(cherry picked from commit e4abbc0926)
 2015-05-19 11:12:03 +01:00
Shauren
88af3ffc2a Core/Socket: Removed unused synchronous read method 
(cherry picked from commit 59e9bcf0bf)

Conflicts:
	src/server/game/Server/WorldSocket.cpp
 2015-04-29 00:06:19 +01:00
Naios
2592528741 Core/Log: Fix newlines when using dynamic log names 
* thanks @Aokromes for reporting
* also removes an unnecessary std::move
 2015-04-24 19:44:16 +02:00
Daniel M. Weeks
2dda2483a3 Add missing newline 
(cherry picked from commit f48b86fd8a)
 2015-04-15 19:29:38 +02:00
Daniel M. Weeks
5b556fb1cb Remove unnecessary semicolons 
(cherry picked from commit 27923b8d8f)
 2015-04-15 19:29:37 +02:00
Daniel M. Weeks
c25a06f4b6 Fix documentation 
(cherry picked from commit 62ff887236)
 2015-04-15 19:29:36 +02:00
Daniel M. Weeks
67faa0f458 Prevent collisions in GCC attribute definitions 
(cherry picked from commit 6484885600)
 2015-04-15 19:29:35 +02:00
ariel-
e707905764 Port commit 56186319bd (6.x branch) 
Core/Spells: Cooldown updates

Updates #14418
 2015-04-13 12:13:46 -03:00
click
a09eafa104 Core: Whitespace/tab2spaces cleanup 2015-04-10 04:12:06 +02:00
Shauren
62a3edb84a Core/Misc: Warning fixes 
(cherry picked from commit cc4d79495f)

Partial cherry-picked.

Signed-off-by: Naios <naios-dev@live.de>
 2015-04-05 01:20:11 +02:00
Carbenium
67238e2166 Rename variables to fix C++11 keyword collision 
(cherry picked from commit 573cda7b52)
 2015-04-05 00:36:33 +02:00
Naios
de490674ff Core/DBUpdater: Exit clean if a query failed to apply. 
* Fix some \W4 warnings about constructors.
 2015-04-05 00:23:12 +02:00
Naios
85d6ff9570 Core/Log: Remove some unnecessary std::move's. 
* This are r-value references already.
* Thanks @Shauren for noticing
 2015-04-05 00:23:11 +02:00