Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,806 Commits 4 Branches 146 Tags
0fbcdca05e01c847b06860a447f65520d398fc6a
Commit Graph

573 Commits

Author SHA1 Message Date
Aokromes
0fbcdca05e Core/Collision: Replaced phasemask with proper phases in GameObject c… 
…ollision calculation
 2017-05-06 01:55:17 +02:00
Aokromes
adae2fec26 Ensure that all actions are compared to fixed point in time (ie. world update start) 2017-04-14 15:02:49 +02:00
ariel-
c17fa0bcc5 Core/Instance: stop updating the instance resettimes based on creature respawns 2017-04-14 13:50:13 +02:00
pete318
4d65596f0d Only read and delete from corpse table for current map instance. Not for 
all. Prevents assert stop upon entering an instance on second character
after first one is a corpse in the same dungeon on different instance ID.
 2017-04-01 19:41:03 +01:00
ariel-
66c0c634ad Core/AI: Build fix 
- Stop exposing DoublePosition constructor versions, they're only used for internal representation
- Moved IsInBounds function to public scope
 2017-04-01 07:06:53 +02:00
ariel-
d3151fed8c Core/AI: AreaBoundary refactor 
- Added an auxiliary function IsInBounds to base CreatureAI
- Changed container to vector. Set had no sense because we're storing new pointers, they have different addresses even if the boundary is the same
 2017-04-01 07:06:35 +02:00
sevi
d4c703a2e2 Core/Instance: implement the combat resurrection limit. 
Cherry Pick from 948146f3ee

I change this a bit, so that this is works right for 4.3.3 Patch. (Here isn't add charges after a specific time. Groups have from begin 1 or 3 Charges for Resurrection.)
 2017-03-19 01:55:40 +01:00
Aokromes
41c30413c9 Core/Misc: Minimize branch differences 2017-03-13 09:52:07 +01:00
Aokromes
f430d2fd31 Core/Misc: added loading error message for SCRIPT_COMMAND_PLAY_ANIMKIT 
SMSG_PLAY_ONE_SHOT_ANIM_KIT can now be used in waypoint_scripts
 2017-02-19 09:46:43 +01:00
Aokromes
0b31236470 Update MapScripts.cpp 2017-02-19 09:01:10 +01:00
Shauren
9d4a1ddc10 Core/Maps: Adjusted WorldObject::GetGridActivationRange() to never be less than map visibility distance for active objects to ensure equal ranges for activation/deactivation of grids 
Updates #19072
 2017-02-10 05:26:38 +01:00
Rushor
042633b10e Game/Mapscripts: Implement SCRIPT_COMMAND_MOVEMENT 2017-02-10 05:24:53 +01:00
Aokromes
8bb777ef5c Few small optimizations here and there 2017-02-01 16:51:21 +01:00
Shauren
dc2deb8602 Core/Vmaps: Changed error message when loading outdated vmaps 
Closes #18431
Closes #18857
 2017-01-23 00:17:17 +01:00
HelloKitty
927a73a7ef Core/Vmaps: Stop M2s from occluding for spellcast LoS 
Closes #18528
 2017-01-21 14:45:30 +01:00
Aokromes
719a317a67 Update copyright note for 2017 2017-01-02 07:26:38 +01:00
ariel-
02ba07dee0 Core/Misc: fix interaction of spells like Shadowmeld with Threat reducing effects 
- SPELL_AURA_MOD_TOTAL_THREAT should be temporary and not added/subtracted from total, only computed
- Cleanup of reference related code
- Kill getLast() and reverse iterator obsevers, LinkedList iterator can't be used as a standard reverse_iterator (ie with operator++). They weren't used anyways
 2016-10-21 09:14:38 +02:00
Aokromes
c9965c331a Core/Maps: Fix compile on windows 
By ConradBunton
 2016-09-27 20:24:44 +02:00
treeston
3d82e5771d Map/InstanceMap: Ease up on a somewhat overzealous error message regarding instance saves. 2016-09-22 03:10:06 +02:00
Treeston
226762216a Map/Instances: Greatly simplify PermBindAllPlayers logic. (#17940) 2016-09-18 07:38:06 +02:00
treeston
e5bb91c364 Maps/Boundary: Some code style clean-up in AreaBoundary code, as well as adding an additional utility overload to IsWithinBoundary (Position const&). 2016-09-14 14:34:28 +02:00
treeston
bb9b7582ee Core/Maps: Add override to allow InstanceMap const* -> InstanceScript const*. 
Also tighten const-ness on CanSpawn method of CreatureScript.
 2016-09-09 19:59:50 +02:00
Shauren
f1c84639b5 Core/Misc: Warning fixes (/W4) 
(cherry picked from commit c9ba5ce591)
 2016-08-10 06:41:59 +02:00
Aokromes
436cdfd7c9 Core/Game: Move scheduled map scripts counter methods into MapManager 
* Since those have nothing to do with core scripts and are
  not wished inside the ScriptMgr
 2016-08-10 06:40:03 +02:00
Aokromes
5302d9112b Core/Game: Converted the game library to a shared library. 
* There is still the possibility to static link against game.
 2016-08-08 20:11:29 +02:00
Aokromes
9d7bd6ca62 Core/Misc: Even better description for logs 2016-07-20 18:30:14 +02:00
jackpoz
d9f485273c Core/VMaps: Fix some vmap height edge cases 
Fix Map::GetWaterOrGroundLevel() checking dynamic object only in phase 1 instead of current Unit phase.
Improve DynamicMapTree::getHeight() dynamic object check by casting the ray at +0.5f from the passed Z coordinate, this value will be tuned to improve even more the results.
 2016-07-20 15:45:05 +02:00
Aokromes
6ca223187b Compile fix 2016-07-19 15:46:44 +02:00
Aokromes
9c1b965136 Core/Misc: MSVC warning fixes 2016-07-19 12:40:58 +02:00
r00ty-tc
527654b512 [Core/Maps] Activate creatures and objects during opening cinematics 
As well as other flyby cameras (like sunwell etc)

Requires re-running map extractor to extract camera m2 files from data
files. These are very small.
 2016-05-18 21:31:07 +01:00
Aokromes
95018939a8 Core/Maps: Implement optional pre-loading of maps. 2016-05-16 22:24:58 +02:00
Aokromes
303082546b Sync with 3.3.5a core 2016-05-03 12:50:49 +02:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
ccrs
6a339ed5c9 Core/TempSummons: avoid use MoveInLineOfSight before InitSummon 2016-03-01 21:20:47 +01:00
ariel-
bb6089bb8c Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing) 
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e)
 2016-02-21 08:16:32 -03:00
ariel-
8bc477a2de Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	sql/updates/world/2016_01_26_00_world.sql
	sql/updates/world/2016_01_31_00_world.sql
	sql/updates/world/2016_02_07_00_world.sql
	src/server/authserver/Server/AuthSession.cpp
	src/server/database/Database/Implementation/LoginDatabase.cpp
	src/server/database/Database/Implementation/LoginDatabase.h
	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
	src/server/game/AI/ScriptedAI/ScriptedCreature.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Networking/AsyncAcceptor.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/adt.h
	src/tools/mmaps_generator/MapBuilder.cpp
 2016-02-21 07:02:53 -03:00
Shauren
ff45a422c5 Warning fix. 2016-02-12 20:45:09 +01:00
Shauren
fa3f106693 Core/Maps: Use map.dbc zone fallback if no area is found in grid files, not only if grid files don't exist 
Closes #16583
Closes #16584

Extracting new maps is NOT needed.
 2016-02-12 20:39:25 +01:00
treeston
62aff401f6 Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392) 2016-02-10 22:23:39 +01:00
Shauren
89d8d50b2e Core/Maps: Moved min height calculation to worldserver for more precise results 
Closes #16530
 2016-02-10 21:25:28 +01:00
treeston
6102a7937d Maps/Instances: Implement handling of CMSG_SET_SAVED_INSTANCE_EXTEND 2016-02-10 19:35:11 +01:00
Shauren
25cdc5d980 Core/Maps: Parse MFBO adt chunk to properly handle height where player counts as falling under the map 
* This fixes the height at which player is instantly killed when falling from The Frozen Throne
* Set PLAYER_FLAGS_IS_OUT_OF_BOUNDS on players under the map to enable release spirit button while still falling

Note: Extracting new maps is required
(cherry picked from commit 4f78efd463)

# Conflicts:
#	dep/PackageList.txt
#	src/server/game/DataStores/DBCStructure.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/MovementHandler.cpp
#	src/tools/map_extractor/CMakeLists.txt
#	src/tools/map_extractor/System.cpp
#	src/tools/map_extractor/adt.h
#	src/tools/map_extractor/loadlib.cpp
 2016-02-09 18:44:19 +01:00
Shauren
aa432db36d Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing) 
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e)

# Conflicts:
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/Chat/Chat.cpp
#	src/server/game/Conditions/ConditionMgr.cpp
#	src/server/game/DataStores/DBCStores.cpp
#	src/server/game/DataStores/DBCStores.h
#	src/server/game/DataStores/DBCfmt.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Handlers/BattleGroundHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Spells/Spell.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_go.cpp
#	src/server/scripts/Commands/cs_group.cpp
#	src/server/scripts/Commands/cs_lookup.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/tools/map_extractor/System.cpp
#	src/tools/mmaps_generator/TerrainBuilder.cpp
 2016-02-09 18:19:28 +01:00
Shauren
b605f1cc81 Core/Maps: Restored DataDir functionality accidendally removed earlier 
(cherry picked from commit 7e801595f4)
 2016-01-20 08:04:58 -03:00
ariel-
52b60d51e7 Core/Maps: fixed map loading after merge if datadir was different from local 2016-01-19 23:34:36 -03:00
ariel-
9d351b5878 Core/Maps: backport ed75b0649a 
** No reextraction of maps needed **
 2016-01-19 22:25:27 -03:00
ariel-
67bb4c0c3c Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/updates/world/2015_11_09_02_world335.sql
	sql/updates/world/2015_11_09_02_world_335.sql
	sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql
	sql/updates/world/2015_12_16_02_world335.sql
	sql/updates/world/2015_12_16_02_world_335.sql
	sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql
	sql/updates/world/2016_01_02_00_world335.sql
	sql/updates/world/2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_10_05_world335.sql
	sql/updates/world/2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_12_01_world335.sql
	sql/updates/world/2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_12_02_world335.sql
	sql/updates/world/2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_15_00_world.sql
	sql/updates/world/2016_01_17_10_world.sql
	sql/updates/world/2016_01_17_11_world.sql
	sql/updates/world/2016_01_17_12_world.sql
	sql/updates/world/2016_01_17_13_world.sql
	sql/updates/world/2016_01_17_14_world.sql
	sql/updates/world/2016_01_17_15_world.sql
	sql/updates/world/2016_01_18_00_world.sql
	sql/updates/world/2016_01_19_00_world.sql
	sql/updates/world/2016_01_19_01_world.sql
	sql/updates/world/2016_01_19_02_world.sql
	sql/updates/world/2016_01_19_03_world.sql
	src/server/scripts/Spells/spell_paladin.cpp
 2016-01-19 22:24:14 -03:00
treeston
1050b68899 Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270) 2016-01-18 18:35:20 +01:00
treeston
b945d01ee5 Instance boundary follow-up: 
- Stop tools from complaining about leaks.
- Also, list -> vector.
- Fix an ambiguous constructor warning.
- Fix a bug with Gormok and Sindragosa (Fixes #16280).
 2016-01-18 18:08:15 +01:00
ariel-
6a212a6f7f Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 2016-01-15 01:38:11 -03:00