araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 06:00:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
16,732 Commits 17 Branches 140 Tags
12307c7d06011b3d64271af4bd4dfc08c348d7d2
Commit Graph

46 Commits

Author SHA1 Message Date
Nay 12307c7d06 Whitespace is the root of all evil 2012-08-03 22:39:34 +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
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
leak e28dbe9f88 Core/AuthServer: Streamlined authserver log messages (added client port for easier identification and matching for multiple connections from same IP) 2012-01-24 20:56:16 +01:00
Nay 9c26ce8da5 Merge branch 'master' into 4.x 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
 2012-01-07 17:13:42 +00:00
kiper 8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
leak 73cf793e56 Core/DBLayer: Refactor prepared statement defines Note: 
The new format for the middle section is a 3-letter upper case abbreviation of the sql command being executed (select -> SEL, update -> UPD, etc.)
{DB}_{SEL/INS/UPD/DEL/REP}_{Summary of data changed}
 2011-12-31 20:14:38 +01:00
Supabad 1af4d40be6 4.x simplify Authhandler 2011-12-16 12:55:02 +01:00
kaelima a919265623 Core/DB: Fix character creation in Player::SaveToDB. 
And some misc comments/whitespaces
 2011-11-26 01:53:44 +01:00
Spp bb64e64463 Compile Fix 2011-10-18 17:55:21 +02:00
Spp 9e517c963b Cosmetic: Replace "* )" with "*)" and "* /*" with "* /*" 2011-09-29 09:32:55 +02:00
Spp be12603150 Configuration/ConfigMgr: converted from singleton to namespace with free functions. 2011-09-28 13:00:43 +02:00
Spp af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +02:00
leak 1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
Machiavelli e07e20ffca Core/Log: Implement log masks for debug log level, to allow selective debug output. Update your worldserver.conf. 2011-02-20 20:16:34 +01:00
Machiavelli 957c69de83 Update copyright note for 2011. 
Happy new year.
 2011-01-01 15:01:13 +01:00
silinoron 8b99f28e29 Core/Authserver: Revert a small mistake. Thanks aurimas. 
--HG--
branch : trunk
 2010-12-27 09:19:44 -08:00
silinoron 60c6d462e4 Core/Authserver: Significant cleanup in preparation for a rewrite. 
Dropped support for running as a service on windows; it may be back in some form later.
Otherwise there should be no functional changes.

--HG--
branch : trunk
 2010-12-27 09:02:02 -08:00
Shauren 928443d899 Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming) 
--HG--
branch : trunk
 2010-12-23 23:25:44 +01:00
click 5180ed0383 Core/AuthServer: Fix the previous commit (it might help to actually fetch what we want to work on as well) 
--HG--
branch : trunk
 2010-12-21 05:57:53 +01:00
click 2f80f1b2f8 Core/AuthServer: Allow reauthentication to the authserver on realm logout. Thanks to .. someone (webmaster?) 
Fixes issue 4191.

--HG--
branch : trunk
 2010-12-21 05:50:19 +01:00
silinoron b8bf37264b Core/Authserver: Cleanup. 
--HG--
branch : trunk
 2010-12-04 11:19:41 -08:00
click b6e50110ac Core/Authserver: Clean up authserver base code a bit + follow codingstyle 
--HG--
branch : trunk
 2010-11-16 14:29:01 +01:00
click f0c4241ea4 Remove the accidental additions of CRLF-crap from the header updates 
--HG--
branch : trunk
 2010-10-07 15:35:36 +02:00
click 8ea4b32fab Update copyright headers (following the same standard in all files = good) 
--HG--
branch : trunk
 2010-10-07 12:41:56 +02:00
click 461590832a Core: Generic cleanup (tab2spaces/whitespace removal) 
--HG--
branch : trunk
 2010-09-25 22:03:57 +02:00
Machiavelli 3c6dc32030 Core/DBLayer: 
- Rewrite Field class to be able to store both binary prepared statement data and data from adhoc query resultsets
- Buffer the data of prepared statements using ResultSet and Field classes and let go of mysql c api structures after PreparedResultSet constructor. Fixes a race condition and thus a possible crash/data corruption (issue pointed out to Derex, basic suggestion by raczman)
- Conform PreparedResultSet and ResultSet to the same design standards, and using Field class as data buffer class for both
* NOTE: This means the fetching methods are uniform again, using ¨Field* fields = result->Fetch();¨ and access to elements trough fields[x].
* NOTE: for access to the correct row in prepared statements, ¨Field* fields = result->Fetch();¨ must ALWAYS be called inside the do { }while(result->NextRow()) loop.
* NOTE: This means that Field::GetString() returns std::string object and Field::GetCString() returns const char* pointer.

Still experimental and all that jazz, not recommended for production servers until feedback is given.

--HG--
branch : trunk
 2010-09-24 22:16:21 +02:00
Shauren 137cfa4f77 Authserver: Fixed crash when accounts limited to ip tried to login and fixes compile on gcc 4.5, thx Kondziu for pointing it out 
Closes issue #3976.
Closes issue #4011.

--HG--
branch : trunk
 2010-09-17 13:52:46 +02:00
Rat 7bac6c16be Auth/Login: fixes the "cant relog after login failed" bug and fixes a potential security risk 
--HG--
branch : trunk
 2010-09-16 21:00:36 +02:00
Machiavelli e873289828 Core/Authsocket: Fix errorenous authentication failure 
--HG--
branch : trunk
 2010-09-12 17:04:19 +02:00
Machiavelli bb8438c09b Core/DBLayer: Add GetCString method for PreparedResultSet (dynamic copy is responsibility of the high level code) 
--HG--
branch : trunk
 2010-09-12 15:11:08 +02:00
Machiavelli 6a4c798867 Core/DBLayer: Replace all ad-hoc queries in AuthSocket with prepared statements 
--HG--
branch : trunk
 2010-09-12 11:06:26 +02:00
Shocker 90434d0a45 Auth: Typo fix in logon challenge handler, closes issue 3975, thanks 41782992 
--HG--
branch : trunk
 2010-09-12 05:24:48 +03:00
click bf664b7a44 Cleanup/Core: Remove whitespace and tabs 
--HG--
branch : trunk
 2010-09-12 01:40:27 +02:00
Machiavelli 1de7e5bed1 Core/DBLayer: 
* Example implementation of prepared statements with resultset in RealmList and AuthSocket code (selectively)
* Also correct a few bobo´s from previous commit.

--HG--
branch : trunk
 2010-09-11 21:22:15 +02:00
Machiavelli 7982cc0f7d Core/DBLayer: 
- A few prepared statement implementations in authsocket as example.
- Add an ASSERT in MySQLConnection::Execute(PreparedStatement*) to catch faulty created statements

--HG--
branch : trunk
 2010-09-03 01:00:49 +02:00
Machiavelli 0117af4c37 Core/DBLayer: 
- Implement deriviate classes of MySQLConnection for every database type (world, realm, characters)
- Make DatabaseWorkerPool templatized and use the above mentioned classes as parameter
- Implementation of the new types in code
(This is in preparation of prepared statement interface)

--HG--
branch : trunk
 2010-09-02 17:47:50 +02:00
silinoron 08205afcc9 Rewrite much of the GM ticket system 
* Extract storage and manipulation of tickets to TicketMgr (from ObjectMgr)
* Extract ticket commands to TicketCommands.cpp
* Adds support for sending GM responses and GM surveys.
* Fix structure of several ticket-related packets.
* Add support for understanding lag reports.
* Thanks Zor for some of the packet structures, and Cyrax for some sniffs
* Please report any issues encountered via the tracker.

--HG--
branch : trunk
 2010-08-29 20:28:14 -07:00
click 670964803f Core: Fix more warnings, add new function sLog.outStaticDebug() that replaces DEBUG_LOG 
--HG--
branch : trunk
 2010-08-22 01:57:04 +02:00
silinoron c0c9350eeb Send the right data when trying to log in with the wrong password. 
Thanks VladimirMangos.

--HG--
branch : trunk
 2010-08-16 19:28:50 -07:00
XTZGZoReX 18dce8897f * Rename: Sha1Hash -> SHA1Hash. 
--HG--
branch : trunk
 2010-08-08 04:49:04 +02:00
click 3296a944e7 Convert to using ACE for reading configurationfiles, and remove dependency on dotconfpp configuration library and related files 
(patch by astellar - and a thankyou to vladimir for being a russian teddybear)

--HG--
branch : trunk
 2010-07-29 01:22:45 +02:00
Tartalo a5f4e3de94 more cmake fixes. comment collision compilation until fixed 
--HG--
branch : trunk
 2010-06-08 01:20:06 +02:00
XTZGZoReX f27daddd1b * Restructuring authserver and worldserver. 
--HG--
branch : trunk
 2010-06-06 23:08:23 +02:00