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
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
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
af05915b9e
[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)
2011-09-15 14:12:57 +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
Machiavelli
957c69de83
Update copyright note for 2011.
...
Happy new year.
2011-01-01 15:01:13 +01:00
Shauren
58a9b15443
Core: Fixes some warnings
...
Core/SmartAI: Fixed DamageTaken and DamageDealt hooks
--HG--
branch : trunk
extra : rebase_source : 062f1c68cd1d318d192b294a493db17a1943bee2
2010-12-14 22:45:23 +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
click
1f80c7b3c0
Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly
...
--HG--
branch : trunk
2010-08-08 19:45:53 +02:00
Brian
bc04d7ce25
* Remove the last of the realative paths from #include statements
...
--HG--
branch : trunk
2010-06-08 17:01:03 -06:00
Brian
2435b4152d
* Nope still won't build yet
...
--HG--
branch : trunk
2010-06-07 09:04:14 -06:00
XTZGZoReX
62200e8d02
* Even more restructuring of the game library.
...
--HG--
branch : trunk
2010-06-06 22:55:56 +02:00