Commit Graph
53 Commits
Author SHA1 Message Date
Shauren 259a29c093 Tools/Extractors: Mmap extractors no longer depend on shared and MySQL libraries 2013-01-22 18:40:32 +01:00
Vincent_Michael 65cd79dc77 Core/Misc: Update headers to 2013 2013-01-14 17:42:06 +01:00
Spp 5f15600e7a Core/Build: Fix linking and sooo many compile warnings 2013-01-09 13:13:39 +01:00
Vincent_Michael b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
2013-01-07 16:57:39 +01:00
blub 9ad1857e59 Merge pull request #8826 from joschiwald/mmaps_disable
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
2013-01-07 07:52:35 -08:00
Nay d0e4e20265 Merge pull request #8825 from joschiwald/vmapspelligno
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
2013-01-07 07:36:40 -08:00
Vincent_Michael 62adbdab99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
2013-01-01 23:12:21 +01:00
Vincent_Michael cc65aba789 Update copyright note for 2013.
Happy new year.
2013-01-01 00:41:01 +01:00
joschiwald 08f62d8313 Core/MMaps: use DisableMgr to disable pathfinding on a specific map 2012-12-30 21:09:21 +01:00
joschiwald 22896bd7a4 Core/VMaps: drop "vmap.ignoreSpellIds" in config, this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS 2012-12-30 18:52:32 +01:00
kaelima 0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h
2012-12-21 00:00:16 +01:00
Spp 2251d1bfae Core/Misc: Set mode 0644 for files 2012-11-27 13:03:12 +01:00
Nay b1c4118a33 Merge remote-tracking branch 'origin/master' into mmaps 2012-09-11 01:13:41 +01:00
Spp 358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
kaelima a2d533752c Core/MMaps: Add several safety checks to confirm a valid path generation.
- Address some issues in TargetMovementGenerator. Thanks Chevron
2012-09-07 04:21:11 +02:00
Subv ccdca77740 Core/Mmaps: Fixed unloading mmap tiles, the x and y were swapped. thanks to MaNGOS for original implementation, and thanks to @Chevron for noticing. 2012-09-05 16:05:26 -05:00
Subv 937518181f Core/Mmaps: Fixed build after last merge 2012-08-24 11:38:39 -05:00
Subv dc95ce61b4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
	dep/PackageList.txt
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
2012-08-22 17:26:53 -05:00
Spp 55ce180f28 Core/Logging: Add Asyncronous logging with Loggers ("What to log") and Appenders ("Where to log") system. Will allow to select to full log some parts of core while others are not even logged.
- Logging System is asyncronous to improve performance.
- Each msg and Logger has a Log Type and Log Level assigned. Each msg is assigned the Logger of same Log Type or "root" Logger is selected if there is no Logger configured for the given Log Type
- Loggers have a list of Appenders to send the msg to. The Msg in the Logger is not sent to Appenders if the msg LogLevel is lower than Logger LogLevel.
- There are three (at the moment) types of Appenders: Console, File or DB (this is WIP, not working ATM). Msg is not written to the resource if msg LogLevel is lower than Appender LogLevel.
- Appender and Console Log levels can be changed while server is active with command '.set loglevel (a/l) name level'

Explanation of use with Sample config:

Appender.Console.Type=1       (1 = Console)
Appender.Console.Level=2      (2 = Debug)

Appender.Server.Type=2        (2 = File)
Appender.Server.Level=3       (3 = Info)
Appender.Server.File=Server.log

Appender.SQL.Type=2           (2 = File)
Appender.SQL.Level=1          (1 = Trace)
Appender.SQL.File=sql.log

Appenders=Console Server      (NOTE: SQL has not been included here... that will make core ignore the config for "SQL" as it's not in this list)

Logger.root.Type=0            (0 = Default - if it's not created by config, server will create it with LogLevel = DISABLED)
Logger.root.Level=5           (5 = Error)
Logger.root.Appenders=Console

Logger.SQL.Type=26            (26 = SQL)
Logger.SQL.Level=3            (2 = Debug)
Logger.SQL.Appenders=Console Server SQL

Logger.SomeRandomName.Type=24 (24 = Guild)
Logger.SomeRandomName.Level=5 (5 = Error)
Loggers=root SQL SomeRandomName

* At loading Appender SQL will be ignored, as it's not present on "Appenders"

* sLog->outDebug(LOG_FILTER_GUILD, "Some log msg related to Guilds")
  - Msg is sent to Logger of Type LOG_FILTER_GUILD (24). Logger with name SomeRandomName is found but it's LogLevel = 5 and Msg LogLevel=2... Msg is not logged

* sLog->outError(LOG_FILTER_GUILD, "Some error log msg related to Guilds")
  - Msg is sent to Logger of Type LOG_FILTER_GUILD (24). Logger with name SomeRandomeName is found with proper LogLevel but Logger does not have any Appenders assigned to that logger... Msg is not logged

* sLog->outDebug(LOG_FILTER_SQL, "Some msg related to SQLs")
  - Msg is sent to Logger SQL (matches type), as it matches LogLevel the msg is sent to Appenders Console, Server and SQL
    - Appender Console has lower Log Level: Msg is logged to Console
    - Appender Server has higher Log Level: Msg is not logged to file
    - Appender SQL has lower Log Level: Msg is logged to file sql.log

* sLog->outDebug(LOG_FILTER_BATTLEGROUND, "Some msg related to Battelgrounds")
  - Msg is sent to Logger root (Type 0) as no Logger was found with Type LOG_FILTER_BATTLEGROUND (13). As Logger has higher LogLevel msg is not sent to any appender

* sLog->outError(LOG_FILTER_BATTLEGROUND, "Some error msg related to Battelgrounds")
  - Msg is sent to Logger root (Type 0) as no Logger was found with Type LOG_FILTER_BATTLEGROUND (13). Msg has lower LogLevel and is sent to Appender Console
    - Appender Console has lower LogLevel: Msg is logged to Console
2012-08-03 14:20:18 +02:00
Venugh 8368112f45 Try to check existance of mmaps folder. 2012-04-09 18:05:35 +02:00
Venugh d6bddc1c94 Core/Mmaps:
* implemented loading part.
2012-04-09 15:11:39 +02:00
Venugh eae627f752 Core:
+ add mmaps files.
+ add the generator for movement.
2012-04-09 14:51:03 +02:00
Shauren a1a7a2d7c0 Core/Players
* Add liquid special aura only if player is in it (not when above)
* Use CastSpell instead of AddAura - checks all dbc conditions on spell
2012-03-07 18:57:47 +01:00
Shauren e5d23103f3 Core/Maps
* Corrected liquid type extraction in maps - MCLQ chunk must be parsed together with MH2O (they stack)
* Fixed liquid detection in WMO objects
* Implemented LiquidType.dbc use, players will now get proper auras in special liquids
* Turned off slime damage by default (Naxxramas uses periodic damage aura for this purpose)
* Implemented liquid type overrides basing on area/zone
* Renamed final temp_gameobject_models to GameObjectModels.dtree (the temporary one produced by vmap extractor remains unaffected)

Note: Map and Vmap re-extraction is required
2012-03-07 13:09:35 +01:00
Subv 4029c23547 Core/Collisions: Reverted a commit about M2 models.
closes #5312 and probably others
2012-03-04 08:23:19 -05:00
Subv c53d722aa2 Core/Collision: Models with flag MOD_M2 (mostly trees, among some other objects) should not be taken into account for LoS checks, this check does not apply to gameobjects (yet)
closes #3495

Signed-off-by: Subv <s.v.h21@hotmail.com>
2012-02-14 18:19:40 -05:00
kiper 8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
Machiavelli 4c3c418511 Core/Misc: Make VMapManager2::acquireModelInstance and releaseModelInstance thread safe
Closes #4086
2011-11-26 19:11:58 +01:00
unknown 8acf07dbab Random minor code cleanup 2011-09-29 22:35:00 +04: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
Spp- 45af1238cf Conditions/DisableMgr: converted from singleton to namespace with free functions. 2011-09-09 14:27:23 +02:00
click 7fe3f55b5e Core: Fix non-PCH build + clean up some sporadic warnings 2011-07-18 14:49:08 +02:00
Lopin e35e4d6e23 Core/Disables: Allow to disable certain vMaps through Disables system. Wiki will be updated soon 2011-07-11 16:14:26 +02:00
leak 1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
Machiavelli e07e20ffca Core/Log: Implement log masks for debug log level, to allow selective debug output. Update your worldserver.conf. 2011-02-20 20:16:34 +01:00
Machiavelli 957c69de83 Update copyright note for 2011.
Happy new year.
2011-01-01 15:01:13 +01:00
Shauren 928443d899 Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)
--HG--
branch : trunk
2010-12-23 23:25:44 +01:00
runningnak3d 3feda9b6af Core/Vmaps: Remove the ability to ignore individual maps from vmap LOS /
height checking. Also add a warning if vmap.enableHeight is disabled. You
*MUST* have all LOS / height checking enabled to have a functional server.
Original patch by: Vladimir

--HG--
branch : trunk
2010-10-08 20:14:12 -06:00
click 613b81f36f REALLY fix the CRLF-crap...
--HG--
branch : trunk
2010-10-07 15:54:07 +02:00
click f0c4241ea4 Remove the accidental additions of CRLF-crap from the header updates
--HG--
branch : trunk
2010-10-07 15:35:36 +02:00
click a67d7c9afd Copyright header updates - part 3... (and some whitespace cleanups)
--HG--
branch : trunk
2010-10-07 14:00:52 +02:00
Spp c3343638cb Core: Remove lots warnings:
- All "'xxx' will be initialized after 'yyy' when initialized here"
- Some "unused variable"
- Some "enumeration value 'xxx' not handled in switch"

--HG--
branch : trunk
2010-08-21 20:08:47 +02:00
click e5b7f6ad01 Add option for search distance to getHeight() functions and make Creature::FallGround() use VMaps properly. (Fix by Lynx3d)
This finally prevents flying creatures from falling to infinity (basically instantly diappearing) in several instances, aswell
as prevent creatures from falling inside larger solid object around the world.

--HG--
branch : trunk
2010-07-27 17:29:33 +02:00
click 45e2a65fad Update VMap3 to "final" release (REEXTRACTION OF MAPS/VMAPS IS REQUIRED!) - thanks to Lynx3d (again)
- add magic-header to .vmtile files
- calculate waterlevels for non-flat surfaces in a more correct way
- make MSVC shut up about float-issues
- change logging around a bit (output function that the respective logentry comes from)
- remove remaining Stormlib leftovers
- set indoor/outdoor check to enabled by default (more blizzlike)

--HG--
branch : trunk
2010-07-09 18:02:46 +02:00
Machiavelli 95ddfbd9e2 Remove some redundant explicit NULL checks for pointers before ´delete´ or ´delete[]´ calls since this check is done implicitly when deleting.
Also fixes a memory leak in .reload creature_template command

--HG--
branch : trunk
2010-06-21 23:20:58 +02:00
Machiavelli cbf7d15947 Add another assert to track down an issue where variable gets infinity value
--HG--
branch : trunk
2010-06-19 23:48:10 +02:00
Xanadu 09923bde06 Fixed win build of vmap assembler, too.
--HG--
branch : trunk
2010-06-19 21:50:34 +02:00
Machiavelli d183d94be8 Fix possible crash in VMapManager sLog.OutXX functions.
--HG--
branch : trunk
2010-06-19 20:51:56 +02:00
Machiavelli 8c8986b2bc Fix usage of uninitialized waypoint array variables in ConfusedMovementGenerator<T>::Initialize and revert 9b1c565510+ad8ce5245e that covered up this problem without fixing it and introduced a faulty LOS calculation.
With thanks to Lynx3d and click, and Aokromes and ritchy for testing.

--HG--
branch : trunk
2010-06-19 17:26:12 +02:00