Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,178 Commits 4 Branches 146 Tags
65bb5690a883fe4e7e8f674c0ecf485cd2cd5f8f
Commit Graph

140 Commits

Author SHA1 Message Date
Ovahlord
65bb5690a8 Core/LFG: added new field to lfg_dungeon_rewards to specify if the first reward shall reset weekly or daily 2018-04-18 20:44:39 +02:00
Ovahlord
d9b12217c4 Core/LFG: implement weekly reward counter to limit the first dungeon rewards 
* all default random rewards can be rewarded 7 times per week
* raid finder first reward can be rewarded once per week
* if completionsPerWeek = 0 the currency caps will limit the first rewards otherwise first rewards can be always rewarded
* random Cataclysm normal dungeons will now reward 140 Justice points instead of 150
* second reward for random Cataclysm normal dungeons will now reward gold only (need to verify this)
 2018-04-18 15:16:06 +02:00
Ovahlord
9e54d80bd1 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-04-15 10:33:06 +02:00
Aokromes
2d9c0d01e2 TDB 4.3.4.29 2018/04/15 2018-04-15 10:16:53 +02:00
Gooyeth
85a21dfbf0 Delete 9999_99_99_99_characters.sql 2018-04-06 07:55:24 +02:00
Aokromes
4da3cbf3aa improved fix 2018-04-06 07:49:59 +02:00
Aokromes
53690d1f7f Core/Spells: don't save Magma aura. 2018-04-06 07:47:30 +02:00
Ovahlord
2cfdd3cbe0 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/AI/CoreAI/PetAI.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
#	src/server/game/DungeonFinding/LFGMgr.h
#	src/server/game/DungeonFinding/LFGQueue.h
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Entities/Pet/Pet.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Globals/ObjectMgr.h
#	src/server/game/Groups/Group.cpp
#	src/server/game/Groups/Group.h
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/Guild.h
#	src/server/game/Handlers/GuildHandler.cpp
#	src/server/game/Handlers/LFGHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Handlers/NPCHandler.cpp
#	src/server/game/Instances/InstanceScript.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/Map.h
#	src/server/game/Maps/ZoneScript.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/game/Weather/Weather.cpp
#	src/server/game/Weather/WeatherMgr.cpp
#	src/server/scripts/Commands/cs_reload.cpp
#	src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
#	src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
#	src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
#	src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
#	src/server/scripts/Spells/spell_dk.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_mage.cpp
#	src/server/scripts/Spells/spell_pet.cpp
#	src/server/scripts/Spells/spell_shaman.cpp
#	src/server/scripts/Spells/spell_warrior.cpp
 2018-03-28 12:35:52 +02:00
ariel-
5ff847159c Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources 2018-03-28 04:41:59 -03:00
Ovahlord
9fd0f9f511 Core/Players: implement seasonal currency counter for purchasing conquest pvp gear 2018-03-18 14:58:04 +01:00
Ovahlord
a85bebf771 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-03-17 00:44:49 +01:00
Aokromes
0a37b6e2f9 TDB 4.3.4.28 2018/03/16 2018-03-16 22:40:08 +01:00
Ovalord
c9b5bf9534 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-02-18 20:55:31 +01:00
Aokromes
6f014c638c TDB 4.3.4.27 2018/02/16 2018-02-16 04:47:06 +01:00
Ovalord
3d0cb79d02 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	sql/old/4.3.4/world/25_2018_01_15/2017_12_27_00_world.sql
#	sql/old/4.3.4/world/25_2018_01_15/2017_12_27_01_world.sql
#	sql/old/4.3.4/world/25_2018_01_15/2017_12_27_02_world.sql
#	sql/updates/world/4.3.4/2017_12_27_00_world.sql
#	sql/updates/world/4.3.4/2017_12_27_01_world.sql
#	sql/updates/world/4.3.4/2017_12_27_02_world.sql
#	sql/updates/world/4.3.4/custom_2017_12_19_00_world.sql
#	sql/updates/world/4.3.4/custom_2017_12_19_05_world.sql
#	sql/updates/world/4.3.4/custom_2017_12_22_01_world.sql
 2018-01-20 02:26:58 +01:00
Aokromes
730de2b8b1 TDB 4.3.4.26 2018/01/15 2018-01-15 17:22:54 +01:00
Ovalord
b7c15093a6 Core/Pets: merged funjoker's new Pet Slot system 
* fixed packets and handling for stable master
* fixed Control Pet / Demon handling
* corrected wrong trainer spell for the Control spells
* Added base support for Assist behaivior
* corrected action bar layout
* Hunter Pets will now have the same level as their tamer (patch 4.1 change)
* corrected health stats for pets
 2018-01-07 02:00:31 +01:00
Ovalord
be1615d5f4 Core/Guilds: implement Guild Challenges 2017-12-21 19:44:57 +01:00
Aokromes
a70cb93038 TDB 4.3.4.25 2017/12/17 2017-12-17 14:47:08 +01:00
Aokromes
0567fb1356 Core/AuctionHouse: Auction bidders 
Save more auction bidders than the highest bidder only
 2017-11-28 09:24:31 +01:00
Aokromes
28eb6cf81a rename files 2017-11-26 08:34:48 +01:00
Aokromes
3ba5756c1c Core/Skills: implement Archaeology 2017-11-26 07:32:16 +00:00
Aokromes
0050692bf1 TDB 4.3.4.24 2017/11/15 2017-11-15 05:27:14 +01:00
Ovalord
c868e10d9b Core/Skills: implement Archaeology 2017-11-09 03:58:28 +01:00
Aokromes
573022898f TDB 4.3.4.23 2017/20/16 2017-10-16 15:05:57 +02:00
Aokromes
450b56d4f7 TDB 4.3.4.22 2017/09/17 2017-09-17 13:49:58 +02:00
Aokromes
c92890d9bd typo fix 2017-07-18 10:06:23 +02:00
Aokromes
8f2793835d TDB 4.3.4.21 2017/07/18 2017-07-18 09:58:59 +02:00
Aokromes
aa1219335b TDB 4.3.4.20 2017/06/18 2017-06-18 20:31:49 +02:00
Aokromes
389ced2d17 TDB 4.3.4.19 2017/05/16 2017-05-16 07:09:41 +02:00
Aokromes
3a247f2bd3 TDB 4.3.4.18 2017/04/16 2017-04-16 09:39:18 +02:00
ariel-
c17fa0bcc5 Core/Instance: stop updating the instance resettimes based on creature respawns 2017-04-14 13:50:13 +02:00
ariel-
20af61b777 DB/Schema: add unsigned to some guid fields in characters 2017-04-09 18:06:54 +02:00
Aokromes
c3ac43344e TDB 4.3.4.17 2017/03/16 2017-03-16 11:40:12 +01:00
Aokromes
8d28b453fd TDB 4.3.4.16 2017/02/11 2017-02-11 06:51:30 +01:00
Aokromes
671dba6e5e TDB 4.3.4.15 2017/01/12 
If you don't have custom things i recomend to drop world database, i have dumped this version with areaid and zoneid
 2017-01-12 09:48:14 +01:00
Aokromes
493dc8ed8f TDB 4.3.4.14 2016/11/06 2016-11-06 17:22:37 +01:00
Aokromes
c36efa65c3 DB/Misc: Rename files 2016-11-02 04:34:13 +01:00
Aokromes
a81a44174b Core/Auras: don't save auras casted by items 
- Drop useless field from DB (itemGuid was being saved, but never used, see Prepared Statements)
- This type of auras (like Water Bucket, Precious Ribbon, etc) will be recasted on login anyways.
 2016-11-02 03:36:16 +01:00
Aokromes
84488a19f0 DB/Misc: TDB 4.3.4-13 2016/09/28 2016-09-28 15:13:28 +02:00
Aokromes
3a8355ecd5 rename file 2016-09-14 15:46:31 +02:00
Aokromes
9182a19aa5 Core/Fishing: implement retail-like fishing skill-up functionality 2016-09-14 15:13:04 +02:00
Aokromes
37d4a0d1c0 Fix travis, now yes 2016-08-29 00:27:16 +02:00
Aokromes
4d4c8492b7 Misc: More sync with 3.3.5a and 6.x branches 2016-08-29 00:03:07 +02:00
Aokromes
d5d8a16084 DB/Misc: TDB 4.3.4-11 2016/08/28 2016-08-28 23:38:11 +02:00
Aokromes
193489f3a7 Core/Players: Split playerBytes fields in characters table 
(cherry picked from commit 2a6f65f)
(i think i don't have broken nothing, loged with fresh created chars and old chars and all looks to be ok)
 2016-07-18 21:14:24 +02:00
Aokromes
3d34eca857 TDB 434 - 2016/03/12 2016-03-12 12:40:12 +01: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
treeston
62aff401f6 Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392) 2016-02-10 22:23:39 +01:00
treeston
6102a7937d Maps/Instances: Implement handling of CMSG_SET_SAVED_INSTANCE_EXTEND 2016-02-10 19:35:11 +01:00