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
39,720 Commits 4 Branches 146 Tags
3db9034f4c9bfe532cb2e32fa3abff01c94de3bf
Commit Graph

948 Commits

Author SHA1 Message Date
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
horn
771aafc499 Core/Calendar: Completely rewrite and fix most of the calendar system 
There are still some issues that need to be fixed, for more info see CalendarHandler.cpp TODO part.
Some unblizzlike behaviour possible, we don't have a lot of sniffs.
Big thanks to @Warpten, he joined my project and helped a lot.

IMPORTANT NOTE: Read / append packed time functions in ByteBuffer.h are not correct, they need to be fixed in order to have event times accurate

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-11-18 22:42:28 +00:00
Spp
ccf593c673 Fix merge conflic and typos in worldserver config file and characters.sql 2012-11-09 09:03:29 +01:00
Spp
35d63a9799 Merge branch 'master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
 2012-11-08 11:25:38 +01:00
Spp
7bd86b6b83 Update characters_database.sql (Missing changes from 58ec4e5319) 2012-11-07 09:49:31 +01:00
Subv
705873091b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
 2012-10-16 21:55:01 -05:00
kaelima
6abc6253a6 DB: Add gm_tickets changes to base character db 2012-10-17 02:56:07 +02:00
Subv
a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
 2012-10-10 10:29:18 -05:00
tibbi
c0e0f1d89b allow glyph1 be null like other glyph slots 2012-10-09 16:58:29 +01:00
Nay
21a4f8e088 Rename SQL and update characters_database.sql 2012-09-10 11:56:37 +01:00
Warpten
917ffc030e Core/Guilds: Implemented GuildFinder. 2012-09-10 12:41:42 +02:00
Nay
5963d02750 SQL: Update characters_database.sql 2012-09-10 00:41:35 +01:00
Nay
7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-09 02:18:58 +01:00
Nay
b03b112327 SQL: Update characters_database.sql 2012-09-08 15:28:00 +01:00
Shauren
6ca7a7b78d Core/Guilds: Implemented basic guild leveling (no player statistics/reputation) 2012-09-07 14:39:19 +02:00
Nay
3b91bf8932 Core: Some comment corrections to previous commit 2012-09-05 19:13:22 +01:00
Nay
db819bbdbe Core/Player: Implement server-side loading/saving of CUF profiles 
CompactUnitFrames / RaidProfiles / GroupUI

There are unknown fields added to DB, received and sent in packets
   that should be renamed
 2012-09-05 19:01:28 +01:00
Nay
3b02ea37ee Corrections to 'Merge pull request #7635' 2012-09-04 01:23:41 +01:00
cyberbrest
ac3de951fc DB/Misc: add character_currency to full db. 2012-09-03 23:19:18 +03:00
cyberbrest
41c5bb3e50 [Core/Misc] change full character db because of currency changes. 2012-09-03 23:07:09 +03:00
Nay
337d07c86c SQL: Add missing changes to character_base.sql 
Thanks to Chevron for reminding
 2012-08-23 18:49:43 +02:00
Shauren
bd4609e829 Core/Guilds: Fixed saving bank withdraw limits for tabs 7 and 8 2012-08-23 12:34:36 +02:00
Nay
a55f00a2ad Update sql/base/auth_database.sql 2012-08-12 04:20:58 +02:00
Nay
82e19b5d9f SQL: Sync auth_database.sql as well 2012-08-08 19:02:43 +01:00
Nay
1d8e558f39 SQL: Correct SQL errors in an auth update file and character_database.sql (thanks Sinzia/Bio) 
Closes #7333
 2012-08-08 18:53:08 +01:00
Nay
a9c37cf76a Fix a typo in characters_database.sql 2012-08-08 12:43:29 +01:00
Nay
7249992e28 DB: Rename characters' void_storage to character_void_storage 
Core: Fix build (/slap subv)
Also proper names for sql files
 2012-08-08 03:42:48 +01:00
Subv
d82266bc0e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level2.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Kalimdor/azuremyst_isle.cpp
	src/server/shared/Logging/Log.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
 2012-08-07 13:44:22 -05:00
Shauren
f8cd39b2ed Core/Players: Improved alcohol handling, weeeeeeeeeeeeeeeee 
Closes #7293
 2012-08-07 17:45:10 +02:00
Nay
940f655a3c Core/VS: Allow to store/retrive random stats items in void storage 
Also set items to soulbound on withdraw
 2012-07-30 18:34:39 +01:00
Nay
c24de2c6d8 Core: Implement Void Storage 2012-07-30 16:39:46 +01:00
Nay
abadc30efc SQL: Missing changes to character_database.sql 2012-07-24 15:29:59 +01:00
Nay
be3735275f DB/Auth: Update gamebuild 2012-07-23 16:25:00 +01:00
Shauren
a9d3940738 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-14 19:03:03 +02:00
NNN666
e757ebf6ba Core/Player: Fix issues with 'ignore this slot' option on equipment manager usage 2012-07-13 16:27:11 +02:00
Shauren
d23ae07f64 Core/Players: Fixed saving/loading glyphs 2012-07-11 00:13:41 +02:00
Shauren
06a4ade88a Core/Achievements: Implemented guild achievements 2012-07-09 11:08:33 +02:00
Shauren
ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
Shauren
73e6eedce8 And missing full sql changes 2012-06-07 23:25:33 +02:00
Nay
8fa351b786 Core/DBLayer: Fix some errors with character DB prepared statements 2012-05-30 14:18:28 +01:00
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
Nay
2d0e5e2e0c Core/Conditions: Add missing code for CONDITION_TITLE 
DB/Char: Add changes to character base
Thanks to manuel and QAston for noticing
 2012-04-08 12:56:18 +01:00
Nay
d155304f84 DB/GOs: Correct some templates and add a missing one (WDB) 
DB/Auth: Add missed change to auth_base.sql
Also fix file endings in some of hte sqls
 2012-04-05 17:38:13 +01:00
Nay
00264e45cf DB/Auth: Increase realmlist.address size to 64 (varchar) 
You might want to verify if the previous size did not truncate your address (it was 15)
 2012-04-01 03:09:02 +01:00
leak
7309ee5621 SQL: Auth db data type cleanup logs, realmcharacters, realmlist, uptime / Storage engine switched to InnoDB Note: 
As for the redundant `uptime`.`startstring` being removed, this page might be of interest how to generate time strings from unix timestamps
http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_from-unixtime
 2012-03-28 19:46:38 +02:00
leak
a01e2a59cd SQL: Auth db data type cleanup account_access, account_banned, ip_banned / Storage engine switched to InnoDB 2012-03-28 16:48:49 +02:00
leak
b21725ecac SQL: Auth db data type cleanup account / Storage engine switched to InnoDB 2012-03-28 16:39:59 +02:00
Nay
8d7f184ee6 DB/Auth: Update auth_database.sql with recent changes 2012-03-26 18:23:05 +01:00
Nay
107a6f2c4b DB/Auth: Update auth_database.sql with recent changes 
DB/GameEvent: Resync Darkmoon, again - by Aokromes
 2012-03-25 21:15:22 +01:00