Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 05:43:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,544 Commits 4 Branches 146 Tags
8e707981e41d374222b422bca4e469a020adfd6d
Commit Graph

147 Commits

Author SHA1 Message Date
Ovahlord
bb66c16e12 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-06-26 21:59:08 +02:00
Aokromes
a24b080639 4.3.4 specific CONTRY to COUNTRY 2018-06-23 21:41:51 +02:00
Gooyeth
300e0717a6 Typo fix contry -> country (#22075) 2018-06-23 21:39:06 +02:00
Aokromes
0c6fe1941f rename files 2018-06-23 02:21:59 +02:00
Ovahlord
50e61f4484 Core/Pets: merged latest pet rework changes 2018-05-28 12:39:11 +02:00
Ovahlord
f0f2413f61 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-05-22 00:21:43 +02:00
Aokromes
f8ac80d4b6 Core/DBLayer: Escape more keywords 2018-05-20 23:28:18 +02:00
Shauren
7489781860 Core/DBLayer: Escape new mysql 8 keywords 2018-05-20 20:02:31 +02:00
Ovahlord
1998dc1287 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.cpp
 2018-05-17 12:44:55 +02:00
Gooyeth
e6d8b0842b Core/Player: Skip the cinematic of the first login if the character is teleported before. (#21776) 2018-04-29 17:46:32 +02:00
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
fb465c6953 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-04-09 07:29:47 +02:00
Gooyeth
3c302f11ce Core/Database: Add columns on *_banned (#21748) 
* Add columns on ban character query

* Add columns on ban account query
 2018-04-06 07:23:29 +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
f6d3b214c2 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/Spells/SpellMgr.cpp
 2018-03-06 13:03:29 +01:00
Aokromes
17bd341fda Core/DBUpdater: Code cleanup 2018-03-05 14:02:05 +01:00
Ovalord
d89bc43f28 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-02-26 02:14:11 +01:00
Aokromes
8ad35cb9fa rename files 2018-02-24 13:50:29 +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
e3423b4298 Core/DBUpdater: Improve message when base SQL file is missing 2018-02-18 18:39:07 +01:00
Jildor
53728216b6 Whitespace cleanup in Transaction.cpp 
Removing white space after commit 54b0b8f5ea
 2018-02-16 01:03:45 +01:00
jackpoz
d1df97db23 Shared/Database: Improve dead-lock error handling 
Improve dead-lock error handling in async transactions by retrying the transaction for up to 60 seconds instead of just 5 times
 2018-02-10 16:16:14 +01:00
Ovalord
683a74f3ea Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-01-14 19:20:08 +01:00
Aokromes
c2861bf887 Core/SAI: Add a 5th parameter to SAI events 2018-01-14 07:56:47 +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
Ovahlord
98fdf72c7b Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld 
# Conflicts:
#	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
 2018-01-02 01:23:06 +01:00
Aokromes
4bd0525edd Update copyright note for 2018 2018-01-01 01:06:19 +01:00
Ovalord
be1615d5f4 Core/Guilds: implement Guild Challenges 2017-12-21 19:44:57 +01:00
Aokromes
38c6eaf2d5 Core/Creature: implement school immunity for creatures in creature_template 2017-12-17 20:47:48 +01:00
Shauren
f7fd109066 Buildsystem: Fixed windows pch build with ninja 
(cherry picked from commit a6e46c1c2e)
 2017-12-14 09:49:56 +01:00
Aokromes
47067814a1 Add missing header 2017-12-14 09:49:53 +01:00
Aokromes
bfcdb96cb3 typo fix 2017-12-10 02:15:07 +01:00
Aokromes
f943ac6d06 Core/updater: Change mirror 2017-12-09 09:36:15 +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
b93430ee08 Misc: More cleanup 2017-11-25 02:25:18 +01:00
Aokromes
1750d83a30 Core/Updater: Update db download location 2017-10-20 01:53:35 +02:00
Shauren
1808fdd7b2 Buildsystem: Minor PCH building changes 
* *PCH.cpp are now only compiled with MSVC, other compilers use custom helper commands to generate the precompiled header
* Don't call the linker for pch helpertargets

(cherry picked from commit 137f5e7887)
 2017-06-25 14:16:31 +02:00
Chazy Chaz
5158cca124 Core/Misc: Update locales_creature_text to simple system 2017-05-04 17:02:32 +02:00
jackpoz
d01f1d31bd Core/Misc: Fix static analysis issues 2017-04-26 05:09:21 +02:00
ariel-
c17fa0bcc5 Core/Instance: stop updating the instance resettimes based on creature respawns 2017-04-14 13:50:13 +02:00
pete318
4d65596f0d Only read and delete from corpse table for current map instance. Not for 
all. Prevents assert stop upon entering an instance on second character
after first one is a corpse in the same dungeon on different instance ID.
 2017-04-01 19:41:03 +01:00
ariel-
22c4d86dfe Core/Database: Prepared statement parameter preallocation (#18999) 
- Pass prepared statement size to the helper class to prevent runtime resizing.
- Rename CheckValidIndex -> AssertValidIndex
- Cached prepared size on the worker pool as it's shared among all connections
- Cached query data only for each connection, done lookup in map instead of possibly creating a new element
- Kill the prepared statement map, and store raw sql string on the MySQLPreparedStatement class
(This info is only used for logging, and there is no need of keeping a second container just for it)
 2017-03-03 01:32:12 +01:00
Shauren
043b4de635 Fixed clang segmentation fault in nopch mode 
(cherry picked from commit 787adc24b2)
 2017-02-05 01:54:34 +01:00
Aokromes
e769592e11 Core/Server: fix duplicated inserts into tutorials table for newly cr… 
…eated characters
 2017-02-01 17:24:06 +01:00
Aokromes
8bb777ef5c Few small optimizations here and there 2017-02-01 16:51:21 +01:00
Aokromes
6ed35a2072 Removed debug leftovers 2017-02-01 03:59:19 +01:00
Aokromes
cc0a2e6dde Build fix 2017-02-01 03:58:18 +01:00