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
Spp
1e246cb66c
Fix build (gcc) and fix warnings
2012-02-22 09:15:57 +01:00
Subv
8660f20703
Merge pull request #5290 from kandera/fix_blink
...
fix blink making you fall under ground when blinking into water (needs c...
closes #5289
2012-02-18 04:36:23 -08:00
Kandera
e277588689
fix blink making you fall under ground when blinking into water (needs correct liquid level calculations)
2012-02-17 14:25:08 -05:00
leak
ba4d1c36f1
Core/Maps: Remove redundant if()
2012-02-16 16:17:56 +01:00
Spp
03c34ee507
Fix a lot of warnings
2012-02-16 13:56:28 +01:00
Subv
f8df838db9
Fixed build, thanks Amit86 for noticing
2012-02-14 13:47:35 -05: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 <[email protected] >
2012-02-14 12:46:26 -05: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
kaelima
03b2717931
Core/Map:
...
- Fixed crash when a player was disconnected during a transfer to another map.
- Only call OnPlayerLeaveMap if player is removed from map. (Ty QAston)
2012-02-10 12:43:13 +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
Drake Fish
d052d4f551
4.2.2 More opcodes, enable handlers and update structure for SMSG_INSTANCE_LOCK_WARNING_QUERY and SMSG_COMPLAIN_RESULT
...
Ref #4824
2012-01-22 05:28:31 +00: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
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
megamage
ce0dfa88a6
Revert "Temp fix for *nix build."
...
It builds in *nix without this patch.
This reverts commit e84fffe588 .
2011-12-22 10:15:17 -05:00
megamage
e84fffe588
Temp fix for *nix build.
2011-12-22 08:57:16 -05: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
Shauren
b4df932e71
Core/Dungeon Finder: Implemented Luck of the Draw buff
2011-12-18 22:09:03 +01:00
Nay
9f635ca906
Merge branch 'master' into 4.x
2011-12-18 15:10:54 +00:00
Shauren
23a5c5e855
Core/Maps: Removed some incorrect checks in GetHeight, flying creatures should now fall correctly when killed
2011-12-13 18:19:25 +01: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
Machiavelli
fe69bd654a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
...
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
2011-12-06 12:01:51 +01:00
megamage
cde7ea260e
Make AddToMap return bool.
2011-11-28 13:23:20 -05:00
megamage
49b2407077
Add an ASSERT to find out the reasons of some crashes.
2011-11-28 11:32:52 -05:00
Rat
7fdefceb43
Core/Packets: updated update_object structure
...
Welcome ingame!
2011-11-27 16:06:29 +01:00
Rat
05880cc748
Core/DataStores:
...
-dropped dbcstring/db2string, use simple nonconstant char* (will be useable when loading custom data from db to dbc)
-fixed most dbc string related errors (you can now turn on logging)
2011-11-24 13:43:41 +01:00
Shauren
358b33239a
Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit
2011-11-23 19:17:33 +01:00
megamage
d9e4d991c9
Fix a crash when player is logged out when not in map.
2011-11-12 08:16:52 -05:00
megamage
07cf71fdd4
Some cleanup of add/remove to/from map.
2011-11-11 17:50:26 -05:00
megamage
31a88d4fe5
Fix the crash when removing object from an unloaded grid. Object should always be unlinked from grid no matter if the grid is loaded.
2011-11-10 17:31:45 -05:00
megamage
23b3f16f3a
Add some ASSERT in add/remove obj to/from grid.
2011-11-10 10:18:32 -05:00
Shocker
c2a2a4f713
Merge pull request #3872 from Bootz/master
...
Codestyle clean-up
2011-11-09 02:31:18 -08:00
megamage
462a2b9876
Change more ace_guard to trinity_guard
2011-11-08 10:48:49 -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
megamage
495ef10b0d
Change ObjectAccessor to an ACE_Null_Mutex singleton, since its members have been protected by individual locks.
...
Also make some of its member functions static.
2011-11-07 09:44:09 -05:00
megamage
91f56c181c
More cleanup of grid system.
2011-10-22 10:01:29 -04:00
megamage
80a18b9e56
Some cleanup of grid system.
2011-10-22 09:36:05 -04: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
Liberate
fd45c111b0
Core/Grid: Fix a typo in e0d933fed8. Grids should work correctly again. Thanks Kaelima.
2011-10-18 23:16:33 +02:00
megamage
7231ab959f
Clean up grid system. Get rid of GridLoader. This patch should not change any logic, except the incorrect calculation of the number of loaded corpse (which only affects log).
2011-10-18 14:31:34 -04:00
megamage
ffdfd9252b
More clean up of grid system.
2011-10-18 11:51:30 -04:00
megamage
e27ef59548
Clean up grid system: allow directly creating Cell from x, y.
2011-10-18 11:18:49 -04:00
megamage
e0d933fed8
Use method IsCoordValid() to replace explicit checks.
2011-10-18 11:05:32 -04: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
Spp
bc023c6dfb
Core: Fix some warnings
2011-10-18 12:39:01 +02:00