Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,047 Commits 4 Branches 146 Tags
13bac539d6c19b366be714c712c1acbcd4d1fb16
Commit Graph

104 Commits

Author SHA1 Message Date
SnapperRy
13bac539d6 Core/Mail: implement a way to specify NPC sender for mails when they should be different from the quest ender (#17601) 
(cherry picked from commit d4e15f1aac)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
#	src/server/game/Quests/QuestDef.h

Rename 9999_99_99_99_world.sql to sql/updates/world/3.3.5/2016_07_19_00_world.sql
(cherry picked from commit 3a77dec6e6)
 2017-02-11 15:19:42 +01:00
SnapperRy
a390604fb2 Core/Quest: implement usage of QUEST_FLAGS_RAID to allow a quest to be completed while in raid. (#17535) 
By @ForesterDev
(cherry picked from commit baf54cff3b)
 2017-02-05 16:38:18 +01:00
SnapperRy
752c789aaf Core/Quest: do not save/load Dungeon Finder/daily/repeatable quests as completed (#17458) 
* Core/Quest: do not save/load Dungeon Finder/daily/repeatable quests as completed
(cherry picked from commit 7905651b07)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-04 23:21:27 +01:00
SnapperRy
101d5ed953 Core/Loading: output error when specified emote id for some quest-related tables is invalid (#17469) 
* Core/Loading: output error when specified emote id for some quest-related tables is invalid
* Apply suggested changes (and kill whitespace)

(cherry picked from commit c853a83dd0)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
 2017-02-04 18:06:26 +01:00
Shauren
d9418ae00a Core/Misc: Fix a few coverity issues 
CID 1360566
CID 1360567
CID 1361723
 2017-01-25 17:40:08 +01:00
vincent-michael
86b98686a9 Update copyright note for 2017 
Happy new year
 2017-01-01 16:23:13 +01:00
Shauren
b5a7235215 Core/Quests: Fixed "Currency Token Test Token 4" appearing in quest rewards 
Closes #18062
 2016-12-01 17:42:19 +01:00
Shauren
af25942aec Core/PacketIO: Updated packets to 7.1.0.22900 2016-10-25 19:29:27 +02:00
Shauren
f99bb81402 Core/Quests: Renamed unknown quest objective field 2016-08-28 17:07:59 +02:00
Shauren
d5fa0e783a Core/PacketIO: Fixed quest rewards 2016-06-28 20:23:09 +02:00
Shauren
2ad96f06f0 Core/PacketIO: Updated quest packets 2016-06-24 23:12:03 +02:00
ShinDarth
cb29fa74d8 Core/Quest: code style: 
- Removed 11 useless for iterations (for each quest loaded)

(cherry picked from commit 4a532a71b6)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
 2016-01-16 13:05:59 +01:00
jackpoz
3f0026d8e7 Core/Quest: Fix issues reported by static analysis 
(cherry picked from commit 1ddf44caf3)

# Conflicts:
#	src/server/game/Quests/QuestDef.cpp
#	src/server/game/Server/WorldSession.cpp
 2016-01-15 20:32:56 +01:00
Vincent-Michael
478cc756eb Update copyright note for 2016 
Happy new year (Again new year with idiots ...)
 2016-01-01 00:34:25 +01:00
Vincent-Michael
2e586bc520 Core: Header cleanup in game/*/*.cpp 2015-07-25 20:18:42 +02:00
DDuarte
678a08c8c5 Core: Fix multiple warnings 
Travis should be building again now
 2015-07-04 02:43:43 +01:00
Kinzcool
4bbbd9540a Core/Quests: Calculate the RewardMoney value with QuestMoneyReward.dbc and defined an unknown field 2015-07-01 17:57:09 -04:00
Shauren
470d2bd458 Core/Quests: Implemented RewardXPMultiplier quest template field 2015-05-29 00:04:23 +02:00
Vincent-Michael
653954c14d Core/Misc: 
- Update LocaleConstant enum
- Update Quest locale system for WoD
- Fix some rnd typo in quest template
 2015-04-10 18:16:00 +02:00
Shauren
cc4d79495f Core/Misc: Warning fixes 2015-03-22 13:47:55 +01:00
Shauren
faa583c784 Core/Maps: Updated map difficulties 2015-01-10 01:35:47 +01:00
Vincent-Michael
ab90f74486 Update copyright note for 2015 
Happy new year
 2015-01-01 00:28:09 +01:00
Intel
0a7caf5a6d Core/Quests: Do not rely on StorageIndex for quest objectives 
Also fixed unsigned columns in quest_template
 2014-12-29 20:58:49 +02:00
Intel
381416d022 Core/Quests: Fixed quest loading from DB and improved error output 2014-12-29 14:07:17 +02:00
Intel
821e253460 Core/Loot: Implemented CMSG_LOOT packet 
Updated Object Dynamic Flags
Cleaned up obsolete code
Sorted packet struct alphabetically
 2014-12-29 03:05:17 +02:00
Intel
a782515246 Core/Quests: Updated Quest System to new Format 
All quest requirements are now in quest_objectives table
quest_template table contains _ONLY_ WDB data and must not be modified
Currently supported objectives are MONSTER, GAMEOBJECT, ITEM, TALKTO, CURRENCY, REPUTATION, MONEY, PLAYERKILLS, AREATRIGGER
 2014-12-28 22:55:53 +02:00
Shauren
6dbb516b65 Core/Items: Refactored ItemTemplate 2014-12-21 13:35:43 +01:00
Shauren
1b0d296da1 Core/DataStores: Refactored "gt" dbc handling. Wrapped these stores in a new GameTable class which will calculate correct dbc entry index based on given row/column as well as read number of rows/columns from client files instead of hardcoded GT_MAX_LEVEL 2014-12-07 01:50:50 +01:00
Vincent-Michael
4a29c73403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-23 16:41:54 +02:00
Ascathor
c644f2f801 Core/Quest: Allow money reward for quests to be modified. 
Added a rate for both regular quest reward and for quest reward given on max level. Defaulted to 1.
 2014-08-22 02:37:50 +02:00
Shauren
909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.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/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-07-19 03:51:11 +02:00
Shauren
7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00
Subv
b44f38ab5d Revert "Core/Quests: Changed QUEST_FLAGS_AUTO_ACCEPT to reflect what it actually does in 4.3.4." 
This reverts commit 9c339d9eeb.
 2014-07-10 13:22:40 -05:00
Subv
664e0a4523 Revert "Core/Build: Fixed the build" 
This reverts commit 83f3d6ec2b.
 2014-07-10 13:22:15 -05:00
Subv
83f3d6ec2b Core/Build: Fixed the build 2014-07-10 09:34:12 -05:00
Subv
9c339d9eeb Core/Quests: Changed QUEST_FLAGS_AUTO_ACCEPT to reflect what it actually does in 4.3.4. 
Fixed Quest::IsAutoAccept.
 2014-07-09 19:17:25 -05:00
Sebastian Valle Herrera
f53045ae5c Core/Quest: 
Fixed self-completing quests without NPCs
no, wait
Fixed self-completing quests without NPCs, and fixed some issues with the AUTOCOMPLETE quest flag
 2014-06-08 00:34:14 +02:00
Vincent-Michael
cfe644b457 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Quests/QuestDef.cpp
 2014-05-11 23:08:54 +02:00
Kinzcool
392e045bda DB: Changed WDBVerified startdard to VerifiedBuild 2014-05-11 03:15:31 -04:00
DDuarte
08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.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/boss_zuljin.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_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.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/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
Vincent_Michael
20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Vincent-Michael
38bb6fe8e7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
 2013-08-30 23:46:24 +02:00
Nay
7ecf4fdec1 Core/Quests: Split Flags and SpecialFlags 2013-08-30 23:08:40 +02:00
Vincent-Michael
738a781468 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
 2013-08-29 20:55:20 +02:00
Nay
62d1ee680b Core/Quests: Drop world.quest_template.RequiredSpellCastX 
These were non-wdb fields that didn't have much use.
Most quests that were using these fields (not many) should still work,
however, if you find any quest that worked before and is now broken
please report it in the issue tracker and it will be promptly fixed.
 2013-08-29 15:36:38 +01:00
Spp
03505a3a42 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_reload.cpp
 2013-02-27 04:08:19 +01:00
Shauren
e3e5d14d52 Core/Quests: Updated quest flags and implemented QUEST_FLAGS_NO_MONEY_FROM_XP - experience reward from quests using this flag is not converted into money at max level. 2013-02-26 16:57:11 +01:00
Spp
aed36a8375 Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ReferAFriendHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2013-01-02 13:30:51 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Nay
91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp
 2012-12-27 17:52:11 +00:00