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
QAston
f09b5a6bea
Core/Db/Conditions:
...
-Drop condition CONDITION_SPELL_SCRIPT_TARGET, use other condition types instead
-Change CONDITION_SOURCE_TYPE_SPELL_SCRIPT_TARGET to CONDITION_SOURCE_TYPE_SPELL_IMPLICIT_TARGET:
--allow using this condition for more spell implicit target types (not just ENTRY)
--SourceGroup value for this src type is now effMask and it's now required
Core/Spells: Unify the way implicit targets are handled, fully implement some partially implemented target types, fix some minor bugs found on the way, general improvements and cleanup.
2012-02-21 20:17:45 +01:00
Subv
ff9830c18d
Core/Spells: Blink wont be able to trespass solid objects anymore (walls/doors)
...
Refactored some code
Signed-off-by: Subv <[email protected] >
2012-02-11 19:23:18 -05:00
Subv
9791bb599a
Merge pull request #5160 from TrinityCore/dynamic_vmaps
...
Added Dynamic Vmaps, RE-EXTRACT YOUR VMAPS
2012-02-09 11:17:05 -08: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
QAston
012be16796
Merge pull request #4726 from ille/baa2252bd31718e93ccc3e97aa81afeecb5ec9c3
...
Core/GameObject: implement stealth/invisibility for traps
2012-02-09 09:38:13 -08:00
Shocker
04f38855ab
Core/Misc: Rename UNIT_STAT_* enums to UNIT_STATE_*
2012-02-03 19:12:41 +02:00
Shocker
08be716ef8
Core/Misc: Rename UNIT_STAT_* enums to UNIT_STATE_*
2012-02-03 19:02:17 +02:00
Subv2112
953587abdb
Fixed build
2012-02-02 13:15:44 -05:00
Subv2112
8dc75e7091
Codestyle: Converted some casts to their respective ToClass()
2012-02-02 13:03:54 -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
Subv2112
f525087538
Core/Movement: Correctly fixed flying npcs falling to ground, no more glitches with this
...
Signed-off-by: Subv2112 <[email protected] >
2012-01-29 15:28:19 -05:00
Shauren
bdd02e763b
Core/Objects: Fixed visibility of gameobjects and fixed client crash when logging in a character that had currencies (honor points)
2012-01-20 20:31:59 +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
ille
baa2252bd3
implement objectdetection
2012-01-08 18:22:46 +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
elecyb
6b35b76fba
Core/Spells: Some corrections after 65aca2b806, this should fix the console spam
2012-01-03 16:34:05 -03:00
elecyb
993c4e748f
Core/Spells: Update nearby visible objects for new viewpoints, fix spells with Far Sight and Bind Sight effects.
2012-01-02 16:33:14 -03:00
kiper
8299627ed9
Update headers for 2012. HAPPY NEW YEAR!!!
2012-01-01 00:32:13 +01:00
Spp
c1513b2c05
Warning fixes
2011-12-28 11:00:27 +01:00
Spp
fa9daaf95b
Merge branch 'master' into 4.x and some warning fixes
2011-12-27 10:15:27 +01:00
kaelima
4ef82117d1
Server/Protocol:
...
- Added a bunch of opcodes (from wpp, ty Nay and Spp)
- Accepted handler for some confirmed structures
- Some updates in SMSG_UPDATE_OBJECT (although useless without splines)
2011-12-21 03:25:24 +01:00
megamage
8cf2062c1f
Update grid system. Try to fix some crashes and transport passengers (now they are despawned after a while).
2011-12-20 17:07:09 -05:00
Machiavelli
b1c8226d58
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2011-12-10 15:21:55 +01:00
kaelima
11fb0beaf0
Core/Misc: Fixed some duplicate checks for player typeid in Unit::Kill and Spell::EffectSummonDeadPet. Also some random cleanup
2011-12-10 13:48:41 +01:00
Rat
7fdefceb43
Core/Packets: updated update_object structure
...
Welcome ingame!
2011-11-27 16:06:29 +01:00
Nay
0bc3b2d50e
Core/Object: Update Update_type enum, remove BuildMovementUpdateBlock and write the correct (?) number of bits in BuildMovementPack
...
TODO: Send map before count
2011-11-27 13:47:56 +00:00
megamage
9e3b4fe409
Cleanup before deleting objects when unloading grid. Fix #3922 .
2011-11-11 14:11:58 -05:00
Bootz
d1334624da
Core: Codestyle clean-up
...
"pl"->"player"
Note: codestyle methods needs maintained, Player* player.
still to do properly clean-up chat.cpp.
2011-11-07 11:18:00 -06:00
Bootz
f75ec5ba2b
Core: Codestyle clean-up
...
"plr"->player
Note: codestyle methods needs maintained, Player* player.
2011-11-07 11:06:39 -06:00
kaelima
be0b2fcf97
Core/Grid:
...
- Simplified CellArea calculation (Original author: SilverIce)
- Removed unused code in Cell class (Original author: SilverIce)
- Improve some Visit functions.
2011-10-19 17:40:44 +01:00
megamage
c29ff41001
Rename some classes in grid system.
...
Note: The naming of classes is still confusing. "cell" usually refers to class "Grid", and "grid" usually refers to class "NGrid". But it requires a lot of changes to clean this up.
2011-10-18 10:53:34 -04:00
megamage
c8251bc619
Remove some "_" from private methods as required by TC standards. Thanks to Shauren for pointing out.
2011-10-13 17:01:55 -04:00
megamage
bcc55489f8
More cleanup of CanSeeOrDetect
2011-10-13 14:02:07 -04:00
megamage
5912e2444d
Some cleanup of CanSeeOrDetect code.
2011-10-13 13:26:27 -04:00
megamage
3ba22d0d06
Rename Map::Add to Map::AddToMap, Map::Remove to Map::RemoveFromMap for better management.
2011-10-10 17:39:34 -04:00
Shauren
da54fb92d5
Core/Movement: Fixed knockback visibility for other players (no more "teleport") and knockback strength from creature spells (this does not fix knocking creatures back)
2011-09-30 18:24:12 +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
Havenard
c298d09417
Reimplement WorldObject::IsInBetween() to work as intented.
...
Closes #2163 and #1329
2011-09-20 17:48:13 -03:00
Spp
af05915b9e
[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)
2011-09-15 14:12:57 +02:00
Spp-
aa85553bfd
Core: Crash fix (TemporarySummon), remove some warnings and some other minor changes
...
- "const uint64" and "uint64 const" --> uint64
- Add some info in LFGDungeonEntry
- Move some definitions from ".h" files and move to ".cpp"
2011-08-30 13:46:36 +02:00
Shauren
3be7485020
Yet another missed change, i should probably start reading what i change...
2011-08-30 12:58:10 +02:00
Shauren
d8fcc9ef46
Core/Objects: Properly clear update mask after sending update packets, thanks Havenard for pointing it out
...
Closes #2799
2011-08-30 12:38:41 +02:00
Shauren
8c707a13de
Core/Objects: Changed how update fields changes are identified, no longer storing old value to compare with new. Instead fields are now simply marked if changed. This means that even if a field changes back to its original value, packet will be sent anyway (client expects it for some fields like shapeshift)
2011-08-28 18:31:37 +02:00
Shauren
b94a6f63c5
Core/Auras: If the creature whose model is used for SPELL_AURA_TRANSFORM is a trigger, apply trigger model rules to the creature as well
2011-08-28 17:36:02 +02:00
Shauren
f03ef48b3e
Core/Object: Removed incorrect code (never affected anything)
2011-08-13 11:44:51 +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
Machiavelli
0711746b57
Core/Visibility: Send object destroy packets to dead players. Fixes persistent visuals of no longer existing entities while dead.
...
Closes #2458
2011-07-31 21:58:28 +02:00