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

138 Commits

Author SHA1 Message Date
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
03c34ee507 Fix a lot of warnings 2012-02-16 13:56:28 +01:00
Subv2112
93d199f043 Core/Collision: Ported dynamic line of sight patch by Silverice from MaNGOS and 
added lots of improvements
Please re-extract vmaps
 2012-02-09 13:58:22 -05: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
Cron
e7f1158d5d Core/Misc: Remove an overdue copyright. 2011-12-20 00:07:42 -05:00
Kapoeira
1e6546e05b Core/AuthServer: Add a missing header block. 2011-12-19 23:07:19 -05:00
Supabad
1af4d40be6 4.x simplify Authhandler 2011-12-16 12:55:02 +01:00
Nay
846870bf6c Merge branch 'master' into 4.x 
Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2011-11-26 03:19:37 +00:00
kaelima
a919265623 Core/DB: Fix character creation in Player::SaveToDB. 
And some misc comments/whitespaces
 2011-11-26 01:53:44 +01:00
Rat
d1affc4340 Initial Commit for client version change to 4.2.2 (14545) 
- added known opcodes (handlers are commented till not updated)
- added bitstream support to bytebuffer
- updated realm auth for 14545
- updated world auth
- fixed char_enum,create,delete handlers
- added DB2 reader
- added opcode logging to debuglogmask (ignores loglevel)
- fixed compile in win64, others not yet tested
- using db2 values for item models at char_enum to prevent client crash

Lots of Thanks to All SingularityCore Members
 2011-11-20 18:28:18 +01:00
Spp
bb64e64463 Compile Fix 2011-10-18 17:55:21 +02:00
Spp
b16d2245bb Cosmetic: Multiple cosmetic changes 
- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '('
- Added missing space after a comma and remove space before comma (with some exceptions)
- Remove trailing spaces
- Convert tab to spaces

Note: Only affects files with extension "cpp" and "h" under /src/server
 2011-09-29 12:43:05 +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
Nay
0b9a5cb37a Buildsystem/Windows: Fix compile in debug mode 2011-08-06 17:21:09 +01:00
click
5b0b53a8c0 Buildsystem/Windows: Fix a typo in the worldserver/authserver .rc files - fixes debug builds on Windows 2011-08-05 23:35:09 +02:00
click
d7715fa4b8 Buildsystem/Windows: Add support for reading commithash and commitdate directly from the executable binaries. 
To view this information, check the "Product Version" field in Properties on the respective daemon.

+ Fix worldserver/authserver .rc file layouts and content (now adheres to MS standards *sighs*)
+ Change .serv info output to show corename followed by the commit date and hash
+ Include showing the versionstring on worldserver startup completion (on Aokromes' request)

Thanks to Paradox for bugging me enough about it and the initial pull-request.
 2011-08-04 22:53:33 +02:00
Spp-
e47b96af3e Core: Append single character to stream as character, not as a string 2011-07-29 14:18:28 +02:00
Derex
d65e1d9a3f Core/Network: Handle running out of file descriptors on linux-based systems (windows-based systems requires additional fixes) 
Signed-off-by: click <click@gonnamakeyou.com>
 2011-06-23 11:14:01 +02:00
leak
1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
click
9762c17833 Core/Buildsystem: Update copyright-headers for 2011, and adjust with the correct teamname as well. 2011-04-27 18:17:00 +02:00
runningnak3d
c41839a243 Core/Authserver: vi change word (cw) FAIL! 2011-04-12 14:33:42 -04:00
runningnak3d
cf5e97003e Core/AuthServer: Some minor text cleanup. 2011-04-12 14:30:18 -04:00
Shauren
2f79b0f266 Core: Removed all double (and more) empty lines 2011-03-21 10:52:14 +01:00
Machiavelli
250bc09ded Core/Log: Also add DebugLogMask config to authserver. Only logical value as of right now is 64 2011-02-20 20:26:55 +01: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
leak
137b079eea Core: Generic cleanup (tab2spaces/trailing whitespace removal) 2011-01-26 01:03:35 +01:00
Machiavelli
bd85914d92 Core/DBLayer: Properly manage mysql library initialization and shutdown in authserver and worldserver. Prevent multiple calls and make it more elegant. 2011-01-13 21:30:37 +01:00
Derex
45459bed23 Core/Netcode: Fix file descriptor leak under linux platforms with ACE dev poll reactor. 
close #15

Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2011-01-09 13:53:25 +01:00
Machiavelli
957c69de83 Update copyright note for 2011. 
Happy new year.
 2011-01-01 15:01:13 +01:00
silinoron
da8d794f4b Core/Authserver: Put code in line with recent singleton changes. 
--HG--
branch : trunk
 2010-12-27 09:27:43 -08: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
click
392c08ecdd Buildsystem: Revert revision 4fb5181d88 (removes -lcrypto from worldserver/authserver linking, this SHOULD be handled -properly- by the OpenSSL-package already. 
--HG--
branch : trunk
 2010-12-27 09:53:22 +01:00
click
a99e12cf0f Buildsystem/Unix: Fix an idiotic split-package behaviour on RedHat-based systems (and possibly some others) 
Closes issue 4380

--HG--
branch : trunk
 2010-12-24 18:04:09 +01: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
leak
4c9cfa6739 Core/Buildsystem: Resolved quoting problem that caused gcc to spam warnings. Patch by click. 
--HG--
branch : trunk
 2010-12-20 02:23:55 +01:00
Machiavelli
f1a73e89b8 Merge 
--HG--
branch : trunk
 2010-12-13 16:13:32 +01:00
Machiavelli
ea29d87dcc Backed out changeset: 8326a2411148 
--HG--
branch : trunk
 2010-12-13 09:18:49 +01:00
leak
e226c4ac34 - Added Perl based conf merger script 
- Removed LogSQL config option until reimplementation on code side
- A bit of cosmetics for .conf files

--HG--
branch : trunk
 2010-12-06 00:24:45 +01:00
Machiavelli
b845b9d0fd Core/DBLayer: 
- Make time format of MaxPingTime consistent between authserver and worldserver. Note that the value is in minutes, update your config files accordingly if needed.
- Remove obsolete atomic uint32 and prevent concurrent calls to vector::size() in DatabaseWorkerPool

--HG--
branch : trunk
 2010-12-05 16:48:47 +01:00