27298 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Cernat	a379d12529	[General] Turn Utils::printVersion() into Utils::getVersionInfo()	2021-02-10 02:54:37 +02:00
David Cernat	e1259fdc41	Add OpenMW commits up to 4 Feb 2021 ... # Conflicts: # apps/openmw/engine.cpp # apps/openmw/mwmechanics/npcstats.hpp # apps/openmw/mwrender/globalmap.cpp	2021-02-05 02:16:03 +02:00
psi29a	f8c068ee34	Merge branch 'fix_navmesh_cache_key' into 'master' ... Increase navmesh cache hit rate by fixing key implementation See merge request OpenMW/openmw!584	2021-02-04 15:40:41 +00:00
elsid	68fe6b9114	Use only item size to check whether item fits cache ... Item size has to be counted anyway and there is no reason to check only navmesh data first.	2021-02-04 01:12:59 +01:00
elsid	3a2cea5271	Use raw recast mesh data and off mesh connections for navmesh key ... Serialization into a vector of chars produces inconsistent results that leads to reduced cache hit rate. Using a structured object is a more clear solution and allows to remove serialization and nontrivial key compare logic with more straigt forward structured object comparison.	2021-02-04 01:01:15 +01:00
elsid	ad1f8c1e84	Sort water and off mesh connections for recast mesh ... Inconsisten order of these objects in navmesh cache key leads to cache misses due to key inequality.	2021-02-04 01:00:41 +01:00
elsid	489107c5ee	Count navmesh cache key once in item size ... Key is stored only in NavMeshTilesCache::Item, TileMap uses KeyView with a pointer to a vector.	2021-02-04 00:44:23 +01:00
elsid	88ca4a1db6	Count navmesh cache hit rate	2021-02-04 00:35:24 +01:00
Petr Mikheev	94e8855c8c	Merge branch 'fix_5821' into 'master' ... Fix #5821: NPCs from mods getting removed if mod order was changed Closes #5821 See merge request OpenMW/openmw!577	2021-01-31 09:34:26 +00:00
Petr Mikheev	e83a9cdc89	Merge branch 'pathfinding_fix' into 'master' ... Pathfinding fixes See merge request OpenMW/openmw!576	2021-01-29 23:07:53 +00:00
Petr Mikheev	157b14cdaa	Fix #5821: NPCs from mods getting removed if mod order was changed	2021-01-29 22:53:02 +01:00
Petr Mikheev	9590377f22	Don't ignore Z in path finding if actor can move by Z.	2021-01-29 22:30:20 +01:00
Petr Mikheev	642ca02e35	Shorten almost straight paths only if smooth movement is enabled; reduce angle limit for the shortening.	2021-01-29 22:30:01 +01:00
Andrei Kortunov	b286397dd4	Merge pull request #3045 from akortunov/revert ... Revert fix for 5379	2021-01-29 17:17:28 +04:00
Andrei Kortunov	7b727e4d70	Revert "Remove physics dependency on basenode" ... This reverts commit 165c731492.	2021-01-29 16:51:13 +04:00
Andrei Kortunov	165af1c365	Revert "Some actors are supposed to spawn on a static object that belong to an adjacent cell." ... This reverts commit f031a191b8.	2021-01-29 16:51:05 +04:00
Andrei Kortunov	8019fd594d	Revert "Add changelog" ... This reverts commit f219c5992b.	2021-01-29 16:50:56 +04:00
Andrei Kortunov	f8e8496d36	Revert "Revert a wrong change introduced in MR 546" ... This reverts commit 23137d0c54.	2021-01-29 16:50:39 +04:00
Bret Curtis	9f168eab88	Merge pull request #3044 from akortunov/master ... Avoid null dereference for objects without cells	2021-01-29 13:15:04 +01:00
psi29a	faa800464f	Merge branch 'cs_fix_separate_drop' into 'master' ... OpenMW-CS: Fix separate drop, refactor for code reuse See merge request OpenMW/openmw!574	2021-01-29 11:39:40 +00:00
uramer	ee2f0e7eb3	Fix inconsistent argument name	2021-01-28 23:47:38 +01:00
uramer	eca0d8b7ea	Fix typo in DropMode enum	2021-01-28 22:40:44 +01:00
uramer	edc6d5c3e7	Fix a typo in separate drop binds	2021-01-28 22:22:48 +01:00
uramer	36cd818155	Fix separate drop, refactor for code reuse	2021-01-28 22:10:33 +01:00
Andrei Kortunov	3b9f8b5fa2	Avoid null dereference for objects without cells	2021-01-28 18:37:47 +04:00
Andrei Kortunov	d984d13b1c	Merge branch 'animate_animated_objects' into 'master' ... Unbreak animated objects (regression from !546) See merge request OpenMW/openmw!570	2021-01-28 14:12:24 +00:00
Andrei Kortunov	5382d38b9b	Merge branch 'hit_target_object' into 'master' ... Unbreak targetted spell on objects (#5811) See merge request OpenMW/openmw!569	2021-01-28 14:09:45 +00:00
Andrei Kortunov	74fba6df36	Merge branch 'revert-f917037e' into 'master' ... Revert "Merge branch 'movement_fix2' into 'master'" See merge request OpenMW/openmw!572	2021-01-28 12:58:21 +00:00
elsid	a3ab8dfbb4	Revert "Merge branch 'movement_fix2' into 'master'" ... This reverts merge request !496	2021-01-28 12:48:19 +00:00
fredzio	23137d0c54	Revert a wrong change introduced in MR 546 ... A prerequisite to create physics objects for statics was to remove the dependency on base node (since it doesn't yet exists) for object position. It is still necessary for animation though. Restore the basenode (and the associated FIXME) so that animated objects works properly.	2021-01-27 16:24:11 +01:00
Bret Curtis	b164f1aa17	Merge pull request #3023 from akortunov/grass_intsancing ... Grass instancing	2021-01-27 12:21:24 +01:00
psi29a	699bd257ef	Merge branch 'camera_stats' into 'master' ... Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to a valid file. See merge request OpenMW/openmw!526	2021-01-27 08:04:33 +00:00
Frederic Chardon	7cd7fa2f08	Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to ... a valid file.	2021-01-27 08:04:33 +00:00
fredzio	64475ebedb	Remove a brainfart from precise projectile handling: all non-actor ... non-projectile objects were treated as ground.	2021-01-27 07:15:09 +01:00
Andrei Kortunov	5225ec9e50	Add changelog entry	2021-01-26 22:32:06 +04:00
Andrei Kortunov	e3490c8606	Remove dead code	2021-01-26 22:29:41 +04:00
Andrei Kortunov	24e1dfcddc	Use default argument	2021-01-26 22:29:41 +04:00
Andrei Kortunov	f40e227686	Remove redundant formatting changes	2021-01-26 22:29:41 +04:00
Andrei Kortunov	b975f16e6b	Remove redundant check - groundcover is not present in the CellStore	2021-01-26 22:29:41 +04:00
Andrei Kortunov	d12a0fdcb3	Mark only instances from groundcover files as groundcover objects	2021-01-26 22:29:41 +04:00
Andrei Kortunov	8874e88ff1	Drop fading setting	2021-01-26 22:29:41 +04:00
Andrei Kortunov	1a6c06f7b5	Do not allow to set distance to non-positive values	2021-01-26 22:29:41 +04:00
Andrei Kortunov	859cd0fd0c	Do not use display lists for instanced meshes	2021-01-26 22:29:41 +04:00
Andrei Kortunov	a09f03c850	Drop groundcover materials - they are not used	2021-01-26 22:29:41 +04:00
Andrei Kortunov	36fc573375	Take in account Z direction for stomping	2021-01-26 22:29:41 +04:00
Andrei Kortunov	5124e81348	Use linear interpolation instead of abrupt transitions for groundcover lighting	2021-01-26 22:29:41 +04:00
Andrei Kortunov	14cf0ce1dc	Implement instanced groundcover	2021-01-26 22:29:41 +04:00
psi29a	f917037ead	Merge branch 'movement_fix2' into 'master' ... Fix bug: NPCs don't move if the target is exactly above or exactly below. See merge request OpenMW/openmw!496	2021-01-26 08:30:15 +00:00
David Cernat	eefa94db12	[Client] Allow ClientScriptGlobal to create new global variables	2021-01-26 01:07:35 +02:00
Petr Mikheev	bc2cec86e9	Fix bug: NPCs doesn't move if the target is exactly above or exactly below.	2021-01-26 00:05:28 +01:00