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

433 Commits

Author SHA1 Message Date
Nay
8fa351b786 Core/DBLayer: Fix some errors with character DB prepared statements 2012-05-30 14:18:28 +01:00
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
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
08268d2430 Core/Warden: Update copyright information / More cleanups 2012-02-20 14:31:26 +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
click
5411e1ce52 Core: Clean up whitespace and tabs in the base sourcetree 2012-02-18 16:52:08 +01:00
leak
ca8862a21a Core/DBLayer: Remove unused struct 2012-02-15 19:00:40 +01:00
Subv
8a72aede16 Codestyle: Renamed some variables to fit codestyle, corrected order in structure/class fields to match alignment (they use slightly less memory now) 
Signed-off-by: Subv <s.v.h21@hotmail.com>
 2012-02-14 12:46:26 -05:00
Shauren
1b676b1ccf Core/Items: Some work on hotfixes and SMSG_DB_REPLY 2012-01-31 14:02:59 +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
0fbb86f221 Core/DBLayer: Restore removal and cleanup of respawn times of expired instances 2012-01-30 00:31:06 +01:00
Shauren
ef471da666 Core/Player: Updated talent system for cataclysm 2012-01-29 17:40:14 +01:00
click
e6d5b21778 Core: Fix non-PCH build and remove a few warnings. 2012-01-24 00:24:39 +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
Subv2112
f4075f0f94 Core/LFG: 
Fix priority of the player when its added to the lfg group
        Better implementation of the Dungeon Deserter debuff
        Rewrite the NeedBeforeGreed loot
        Fixed players being shown as Unknown Entity when entering the lfg group
        Some incremental optimizations after original patch
Thanks to Retriman and Paecman for base implementation

Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2012-01-14 17:37:28 +01:00
Machiavelli
dbbac0bdaa Core/Movement: Implement spline movement subsystem. 
Spline movement controls movements of server-side controlled units (monster movement, taxi movement, etc).
Proper implementation of effects such as charge, jump, cyclic movement will rely on it.
However, need improve our states system before.

Technical changes:

* Added linear, catmullrom and bezier3 splines which based on client's algorthims. They can be reused for proper transport position interpolation.
* Precission increased. There are no more position desync issues since client's position calculation formulas used.
* Now possible to move by paths with multiple points, send whole path to client.

--
Original author of research and implementation: SilverIce. Massive kudos.
Original port for Trinity (ref #4629) Chaplain and Venugh
With the following incremental fixes during my review:

- Restore flightmaster end grid pre-loading
- Fix uninitialized Creature::m_path_id
- Add missing trinity_string entries for .movegens command
- Fix a bug in WaypointMovementGenerator that would trigger unexpected pausing at waypoints for various amounts of time

Known issues:
- Errors like WaypointMovementGenerator::LoadPath creature XXX (Entry: YYYYY GUID: ZZZZZZ) doesn't have waypoint path id: 0.
This is caused by bad DB data. This commit didn't "break" it.

Do not forget to re-run CMake before compiling.
 2012-01-14 15:36:07 +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
Gyx
79e7e86384 P7: Small clean-up. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-01-08 11:35:00 +08:00
Nay
9f4bdbe3d7 Core/DB: Fix corpse loading prepared statements (typo introduced in merge) 2012-01-07 17:29:59 +00: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
Shauren
0c2dd2dc7f Core/Events: Fixed crash when loading character_queststatus_seasonal 2012-01-06 14:57:01 +01:00
kandera
46fb199ee1 Core/Quests: Add implementation of seasonal quest reset. uses a new table much like character_queststatus_weekly. fixed typo where WEEKLY was WEKLY. Attempt 2 2012-01-04 07:59:32 -05:00
Machiavelli
e35fd87d3f Merge pull request #4582 from Chaplain/cleanup4 
Core/Utilities: Implement random generator for float values.
NOTE: Actually just casts the outcome of int randgen to float
 2012-01-03 03:52:26 -08:00
leak
73f79c41a1 Core/DBLayer: Couple fixes 2012-01-02 20:29:22 +01:00
Chaplain
29c2dfb1da [Core/Utilities] Implement random generator for float values. 
*for mt and sfmt
 *some codestyle
 2012-01-02 12:38:55 +03:00
leak
ced346076b Merge pull request #4567 from Kiperr/master 
Happy new year!
 2011-12-31 16:13:28 -08:00
leak
cdbeb42e0f Core/DBLayer: Refactor prepared statement defines to new format (char db) 2012-01-01 01:09:38 +01: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
leak
ff8874574f Core/DBLayer: Convert another Execute() query to a prepared statement 2011-12-31 19:51:48 +01:00
leak
b39857a15d Core/DBLayer: Convert PExecute() queries to prepared statements No. 4 2011-12-31 19:06:24 +01:00
Machiavelli
81914422e9 Core/DBLayer: Use column names in prepared statements to prevent avoidable prepare errors 2011-12-31 15:16:38 +01:00
leak
8adac3f246 Core/DBLayer: Convert PExecute() queries to prepared statements No. 3 2011-12-31 00:32:05 +01:00
Nay
bdab38b4cc Merge branch 'master' into 4.x 2011-12-27 15:37:06 +00:00
Spp
fa9daaf95b Merge branch 'master' into 4.x and some warning fixes 2011-12-27 10:15:27 +01:00
Venugh
882ebe2b8e Core/World: Convert Execute to PreparedStatement from Battleground random. 2011-12-27 01:04:12 +01:00
Venugh
cab508b4c8 Convert a Execute to a PreparedStatement. 2011-12-27 00:56:42 +01:00
leak
e646dbb3cd Core/DBLayer: Convert PExecute() queries to prepared statements No. 2 2011-12-27 00:29:48 +01:00
leak
ef17c05dec Core/DBLayer: Convert PExecute() queries to prepared statements No. 1 2011-12-25 18:13:21 +01:00
leak
64a2a29506 Core/DBLayer: Convert Execute() queries to prepared statements 2011-12-25 02:22:10 +01:00
leak
08bd2f1a54 Core/DBLayer: Convert callback queries to prepared statements No. 3 2011-12-25 01:27:44 +01:00
kandera
96f4ba29cd Fix compile error from 2d93bd07ba 2011-12-21 07:18:47 -05:00
Machiavelli
2d93bd07ba Core/DBLayer: More generic implementation of callback chains, instead of using this functionality local to CharacterCreatInfo class. Will be used in other places as well. 2011-12-21 10:22:03 +01:00
Machiavelli
17aeeaa9b5 Core/DBLayer: Fix a silly error in HandleStableSwapPet (synchronous query in async context). Fixes possible loss of pets when swapping. 2011-12-21 09:36:05 +01:00
leak
e1afd79b1e Core/DBLayer: Convert callback queries to prepared statements #2 2011-12-20 09:12:43 +01:00
Machiavelli
8e0be985fd Core/Netcode: Fix a possible infinite loop after 829be0b82 (which was accidentally merged in this morning) 2011-12-19 21:12:35 +01:00
Machiavelli
a06ba9e255 Update src/server/shared/Database/MySQLConnection.h 2011-12-19 11:25:58 +01:00