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
19,903 Commits 4 Branches 146 Tags
895a4dd35286aed905c19ae0583d762e8d693256
Commit Graph

41 Commits

Author SHA1 Message Date
Vincent_Michael
71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Nay
fab33f0774 SQLs: Rename some old SQL files to match standards 2013-02-17 21:11:45 +00:00
Nay
2277f6db44 TDB 434.04 2013-02-15 17:10:24 +00:00
Nay
82ff367be8 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-02-15 17:07:50 +00:00
Nay
e685b7bd9e TDB 335.51 - 2013/02/14 
Ref #8947
Closes #9077
 2013-02-15 17:00:09 +00:00
Nay
3a4bb8fae0 TDB 434.03 2013-01-23 05:10:56 +00:00
Spp
d75222feca Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	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_venoxis.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/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-01-14 11:04:03 +01:00
Nay
d4398eaafe TDB 335.50 - 2013/01/14 2013-01-13 18:53:32 +00:00
Spp
7f061fc57f Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2012-11-19 10:09:58 +01:00
Nay
4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00:00
Nay
a95511f35e (TDB 335.49) Also move 4.x-only SQLs to the old directory 2012-09-15 21:18:23 +01:00
Nay
06f96f47e7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql
 2012-09-15 21:13:35 +01:00
Nay
0d3554d4bf TDB 335.49 - 2012/09/15 2012-09-15 21:03:40 +01:00
Nay
874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
 2012-09-03 16:11:46 +01:00
Nay
a465a43da0 SQL: Move all world sql updates to /old/ directory. Base DB is available in https://github.com/TrinityCore/TrinityCore_4.3.4_DB_Alpha 
From now on, this repository should only contain core related sqls
Aforementioned repository will be synced with this one from time to time and will include DB related content
 2012-08-16 00:07:29 +01:00
Nay
fcb57d6373 SQL: Proper directory and file ending for sql 2012-07-16 21:35:38 +01:00
unknown
41b524117b Fix for wretched mobs in mgt 2012-07-16 22:03:17 +02:00
Shauren
a9d3940738 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-14 19:03:03 +02:00
Nay
da9865b683 TDB 335.11.48 - 2012/07/12 2012-07-12 00:16:13 +01:00
kaelima
3d14384c32 Merge git://github.com/TrinityCore/TrinityCore into 4.x 
Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.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/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt
 2012-05-30 08:01:02 +02:00
Nay
9474902479 TDB 335.11.47 - 2012/05/19 2012-05-19 14:27:24 +01:00
Spp
5cff9e0716 Merge branch 'master' into 4.x 
Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
 2012-02-23 13:06:35 +01:00
Nay
84268be882 TDB 335.11.46 - 2012/02/13 2012-02-12 23:50:16 +00:00
Nay
4d6bd47f4e DB: 4.x database should be TDB *45* + all SQLs in sql/updates/world 2012-01-31 13:37:21 +00:00
Spp
37b66384f3 Merge branch 'master' into 4.x 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
 2012-01-31 11:49:53 +01:00
Nay
87761580aa SQLs: Proper filenames for old SQLs 
(Obviously you do not have to re-import these)
 2012-01-19 18:01:06 +00:00
Nay
c0d2013b78 DB: 335.11.45 2012-01-07 21:48:40 +00:00
Nay
9447478630 DB: TDB 43: Move SQL updates to the old directory 2011-11-23 22:31:44 +00:00
Nay
accae0ce50 TDB 335.11.43 
Move SQL updates to the directory old.
 2011-10-29 00:20:56 +01:00
Nay
1faea1f98e DB: Move SQL updates to old directory. Uploaded full DB 42. 2011-08-27 03:57:06 +01:00
Nay
425efd876e SQL: Fix an sql error on commit 4c23eb9fe2. Thanks StewieGriffin 2011-06-18 00:02:51 +01:00
Nay
9be16be7b3 DB: TrinityDB revision 41: move SQL updates to the old directory 2011-06-17 23:46:57 +01:00
Nay
e6e3174d9a DB/SQL: No tabs nor CR line feeds 2011-05-18 15:51:42 +01:00
Nay
4696bcd786 DB: TrinityDB revision 40: move SQL updates to the old directory 2011-05-09 21:36:14 +01:00
Nay
67f0edc0be SQL: move all SQL that is now included in the latest full DB to the "old" dir. 2011-04-02 12:44:28 +01:00
Nay
8458153b69 SQL: Rename files; it should fix batch scripts to import SQL files behavior. 
New format: <year(4)>_<month(2)>_<day(2)>_<incremental(2)>_<db>_<table/content>.sql
 2011-03-27 22:19:33 +01:00
click
75bf08c081 Core/SQL: Fix naming of an old updatefile to reflect correct database relation 2011-03-27 00:44:14 +01:00
Nay
cdf9a7401c SQL: move all SQL that is now included in the latest full DB to the "old" dir. 2011-03-05 01:48:21 +00:00
runningnak3d
01a80ec8d6 SQL: move all SQL that is now included in the latest full DB to the 
"old" dir.
 2011-02-11 15:48:24 -07:00
Nay
f81cfca7bd SQL: Any content SQL should be able to be re-imported without errors; Fix an import error in world_scripts_full; 
P.S Full DB will be available soon
Closes #586
 2011-02-07 21:52:14 +00:00
runningnak3d
0a5d8711e5 Misc: Restructuring directory layout to accomodate the fact that we will 
be pushing DB content. We will no longer have a seperate DB repo.
 2011-02-02 07:50:21 -07:00