Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,236 Commits 4 Branches 146 Tags
ee06bef31b943fba45d8b018df151f3400e07242
Commit Graph

12 Commits

Author SHA1 Message Date
Nay
4bed1b724f Append _4x to all 4.x sqls. Update/fix auth_database.sql 2012-05-30 12:53:26 +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
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
leak
8e3a4b956e Core/Warden: Base implementation for Warden functionality 
Note: The default config file action for clients failing the checks can be changed for each check via the characters.warden_action table

Credits to TOM_RUS
 2012-02-19 13:51:16 +01:00
leak
f0f68f15a8 DB/Schema: Update auth db base SQL to recent mysqldump format 2012-02-19 13:21:14 +01:00
Gyx
3230fc4d02 P10: Update account expansion default 3 for 4.x 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-10 10:07:22 +08:00
Rat
d2a97e0d26 modified base sql to use 14545 as default game version 2011-11-21 14:25:25 +01:00
Machiavelli
0dcc229071 Core/Commands: Allow muting offline players - the mute will become effective on next player login. 2011-07-27 17:51:57 +02:00
Nay
e6e3174d9a DB/SQL: No tabs nor CR line feeds 2011-05-18 15:51:42 +01:00
silinoron
d6fe4b23e9 Add support for recruit-a-friend XP and reputation multipliers. 
More research needs to be done to implement summoning and granting levels.

--HG--
branch : trunk
 2010-08-17 19:18:09 -07:00
Brian
8353e44611 * Proper naming for auth SQL file 
* Update base SQL file for new installs

--HG--
branch : trunk
rename : sql/updates/3.3.5a_old/8861_realmd_realmlist.sql => sql/updates/3.3.5a_old/8861_auth_realmlist.sql
 2010-07-09 02:33:42 -06:00
Brian
c97247a990 * Renamed some directories in sql/ to more accurately reflect their purpose 
--HG--
branch : trunk
rename : sql/auth_database.sql => sql/base/auth_database.sql
rename : sql/character_database.sql => sql/base/character_database.sql
rename : sql/world_database.sql => sql/base/world_database.sql
rename : sql/tools/CMakeLists.txt => sql/create/CMakeLists.txt
rename : sql/tools/create_mysql.sql => sql/create/create_mysql.sql
rename : sql/tools/drop_mysql.sql => sql/create/drop_mysql.sql
rename : sql/full/CMakeLists.txt => sql/scripts/CMakeLists.txt
rename : sql/full/world_script_texts.sql => sql/scripts/world_script_texts.sql
rename : sql/full/world_script_waypoints.sql => sql/scripts/world_script_waypoints.sql
rename : sql/full/world_scripts_full.sql => sql/scripts/world_scripts_full.sql
 2010-06-09 00:54:15 -06:00