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,237 Commits 4 Branches 146 Tags
a6a556ce09facff3918a33be6b976e5ccb7e1469
Commit Graph

33 Commits

Author SHA1 Message Date
kaelima
774f3cdc9b Fixed some merging errors, there could be more, but at least it compiles. 2012-05-30 09:22:56 +02: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
Shauren
1b676b1ccf Core/Items: Some work on hotfixes and SMSG_DB_REPLY 2012-01-31 14:02:59 +01:00
Rat
7749359269 Core/ByteBuffer: Implemented ReadXorByte, usefull when reading guid bytes based on bits 2012-01-20 14:25:46 +01:00
Rat
e5bdc6612d Core/Packets: Moved Bit related functions to ByteBuffer from WorldPacket 2012-01-19 12:59:28 +01:00
Gyx
12e879c5b8 Core/Opcodes: Few opcodes from WPP 
+ Some random cleanup
 2012-01-12 14:59:40 +00:00
Rat
07d27cbbf7 Core/ByteBuffer: fixed bitreader, this fixes the "strange movement" bug 2012-01-10 10:22:49 +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
Spp
fa9daaf95b Merge branch 'master' into 4.x and some warning fixes 2011-12-27 10:15:27 +01:00
Shauren
6d1c770d8d Cosmetic changes and typo fixes 2011-11-27 17:46:05 +01:00
Nay
8eac7e3fdc Add missed change to previous commit and fix a typo in BitStream::Empty 2011-11-27 13:55:44 +00:00
Shauren
e8523b1c3c Core/Packets: Simplified ByteBuffer constructor 2011-11-27 14:41:16 +01:00
Shauren
3a855f3f38 Core/PacketIO: Fixed memory leak in HandlePlayerLoginOpcode and cleaned some tabs -> spaces 2011-11-27 12:17:24 +01:00
Rat
ca03e79ce7 Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.x 2011-11-26 20:38:25 +01:00
Rat
e97527c24e Core/Packets: Implemented BitStream helper class 
- added Static BitConverter class
- upgraded the ByteBuffer class for easier usage
 2011-11-26 20:32:32 +01:00
Shauren
e8c3a3ac9c Core/Items 
* Updated ItemTemplate structure to 4.x
* Calculate armor, damage and disenchant loot from dbc files

TODO: Use dbc disenchant ids in disenchant_loot_template
 2011-11-25 23:24:40 +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
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
af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +02:00
Spp-
079f292b15 Core: Some more missing changes from previous commit (Pass by const reference for simple objects replaced with pass by value). Also fix unintended change 2011-08-01 14:51:44 +02:00
Spp-
acd0fc79f6 Core: Pass by const reference for simple objects replaced with pass by value 2011-08-01 14:23:27 +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
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
613b81f36f REALLY fix the CRLF-crap... 
--HG--
branch : trunk
 2010-10-07 15:54:07 +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
QAston
617a56ba29 *Implement spell casting on transports (no more out of range error, etc) 
*Add MO transports to ObjectAccessor storage
*Add functions Position::RelocateOffset and Position::GetPositionOffsetTo to help offset manipulations - BIG thanks to azazelkon for creating formulas!
*Add function to output debug info for MovementInfo and SpellCastTargets
*Throw ByteBufferException on incorrect packGUID read
*Add rfinish function to finish bytebuffer read.

--HG--
branch : trunk
 2010-08-08 20:32:14 +02:00
click
c298bdb662 Remove duplicate "Error:" from some outError messages... 
--HG--
branch : trunk
 2010-07-31 03:12:51 +02:00
Brian
2435b4152d * Nope still won't build yet 
--HG--
branch : trunk
 2010-06-07 09:04:14 -06:00
XTZGZoReX
57f64f1f5a * Restructuring shared. 
--HG--
branch : trunk
 2010-06-06 23:18:57 +02:00