Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,799 Commits 4 Branches 146 Tags
0b8b2906ffdf3cfcc4409dcc208d8dc939dfba4b
Commit Graph

575 Commits

Author SHA1 Message Date
Aokromes
0b8b2906ff DB/Misc: Update travis file structure 2015-09-08 19:21:19 +02:00
Aokromes
fd49e2109b DB/Misc: Fix travis database 2015-08-11 13:15:04 +02:00
Aokromes
efad70639f DB/Misc: 3.3.5a to 4.3.4 auth database conversor 
(you can still use the same auth db for 3.3.5a)
 2015-07-26 13:58:42 +02:00
Aokromes
ebfee9b3c0 DB/Misc: 3.3.5a to 4.3.4 characters database conversor 2015-07-26 13:05:34 +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
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
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
ShinDarth
47561ab9d3 DB/Characters fix auto updater 2015-06-29 00:09:32 +02:00
ShinDarth
f8230a59a9 DB/Characters: Backport schema changes from 6.x branch (renames) 
Closes #14951
 2015-06-26 00:28:32 +01:00
Nayd
2774d03be0 Update world_database.sql 2015-03-22 20:02:52 +00:00
Nayd
360075129e TDB 335.58 - 2015/03/21 2015-03-21 22:06:46 +00:00
Naios
2bd1c8541d Core/Updates: Add an automatic database update system. Automatically detects new and edited sql updates through file lists and hashing. Detects renames, deletes and is able to create and auto import full databases. * cleanups in main.cpp of world & bnetserver * refactoring in DatabaseWorkerPool.h & MySQLConnection.cpp 
Make sure you re-run cmake, because boost::iostreams was added as dependency.
Maybe you need to install libboost-iostreams1.55-dev on unix as well.

Import every update manual until (included) those INSERT IGNORE updates for each database.

Thanks DDuarte and Shauren for your amazing ideas, help and advises.

In hope that nobody gets a "Your database structure is not up to date..." anymore ,-)

(cherry picked from commit 352012e531)
(cherry picked from commit 1f7f9feafc)

For 3.3.5:
* Synchronized ConfigureBoost.cmake with 6.x, libboost-filesystem1.55-dev also added as dependency!

Signed-off-by: Naios <naios-dev@live.de>
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2015-03-21 20:54:54 +00:00
Lapps
44bf884472 fix build 2015-03-10 20:13:35 -04:00
Lapps
0db1921574 Update base character sql file 2015-03-10 10:07:34 -04:00
Vincent-Michael
7b9bcbea8e SQL: Sync auth database 2014-12-21 20:43:57 +01:00
Nyeriah
c79af3f16f Core/RBAC: Allow setting different default security level roles to different realms 2014-12-10 18:43:14 -02:00
Heihachi
3e03e546d3 Scripts/Commands: mod xp command 
Closes #13476
 2014-11-11 00:45:30 +00:00
ShinDarth
fd0b961781 Core/Commands: implement .pvpstats command 
Shows number of battleground victories in the last 7 days

Closes #13460
 2014-11-10 22:30:20 +00:00
DDuarte
dbf5aa73e5 SQL: Update /dev/world_database.sql 2014-10-30 13:46:06 +00:00
DDuarte
9ad5dce64c SQL: Update /dev/world_database.sql 2014-10-30 13:29:33 +00:00
DDuarte
5bf55eacfd Merge remote-tracking branch 'origin/3.3.5' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h
 2014-10-19 00:18:06 +01:00
Heihachi
15a9c6729e Scripts/Commands: Implement mutehistory command for GM's with requested improvements 
Closes #13350
 2014-10-18 23:34:18 +01:00
Nyeriah
2f016098c2 Scripts/Commands: Implement commands to set and get boss states during run time 
Closes #13186
 2014-10-18 22:05:04 +01:00
ShinDarth
e806fc8a02 Core/Quest: implement Quest Tracker 2014-10-18 18:37:39 +02:00
Shauren
1ef31ba752 Battle.net: Implemented cache stream items 2014-10-13 17:22:24 +02:00
Vincent-Michael
31234c0ca0 SQL: Sync world_database after tdb 335.56 release 2014-09-21 17:09:51 +02:00
Vincent-Michael
2d277bc167 SQL: Update for 4.3.4 2014-09-21 17:07:20 +02:00
Shauren
8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateData.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/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	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/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.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_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-09-20 11:05:30 +02:00
DDuarte
eeaf7ef6fa Revert "SQL: Update dev/world_database.sql" 
This reverts commit 09f9f3b6b1.

I forgot that world_database.sql should only get updated in TDB releases.
 2014-09-19 18:42:09 +01:00
DDuarte
09f9f3b6b1 SQL: Update dev/world_database.sql 2014-09-19 18:18:18 +01:00
Shauren
7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
 2014-09-16 21:50:01 +02:00
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
DDuarte
b9b2a87d42 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-13 13:55:17 +01:00
DDuarte
073221c395 SQL: Update /dev/world_database.sql 
Forgotten change of 27479cf571
 2014-09-13 02:57:05 +01:00
Vincent-Michael
9cb92f93aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp
 2014-08-29 06:24:08 +02:00
Odyssey
8adde791d8 Scripts/Commands: Implement .guild info command 
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 23:04:52 +01:00
Vincent-Michael
cb37e2c9d1 SQL: Sync auth_database 2014-08-28 22:37:46 +02:00
Vincent-Michael
3a248fbfec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
 2014-08-28 21:00:53 +02:00
ShinDarth
b65172910c Core/BattleGrounds: store data about BGs victories 
Enable in worldserver.conf

Closes #12944

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 15:32:38 +01:00
Vincent-Michael
b56e7f2ec6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-27 17:29:34 +02:00
DDuarte
55a501c1ca SQLs: Update /dev/world_database.sql 
Again, do NOT import this file.
 2014-08-27 14:13:51 +01:00
Shauren
4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.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/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
DDuarte
0affa9168c SQLs: Move world_database.sql to dev folder 
Simply because people can't read instruction guides...
 2014-08-04 14:11:03 +01:00
Shauren
903fbb6be7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-29 02:02:38 +02:00
DDuarte
64c8c47622 CI/Travis: Add steps to create databases and import SQLs 
This way the automated build with error if sqls contain errors.
Do NOT import world_database.sql, keep using TDB releases.
 2014-07-28 23:23:27 +01:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Vincent-Michael
79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
 2014-07-09 21:09:47 +02:00