31544 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
psi29a	ac3c02496c	Merge branch 'terrainselectionoptimize' into 'master' ... Terrain selection optimizations See merge request OpenMW/openmw!1261	2021-10-15 20:46:20 +00:00
Bret Curtis	5f8e487012	Let's get testy! (#3172) ... Let's try to get testing happening. We also disable artefact building for now.	2021-10-15 22:40:26 +02:00
Chris Djali	9c040d1ff7	Merge pull request #3175 from bosvensson1/patch-52 ... removes sky bounds	2021-10-15 20:12:32 +01:00
unelsson	e65a7f10e7	Add changelog	2021-10-15 21:55:09 +03:00
unelsson	14c4bba4a3	Remove unused include	2021-10-15 21:54:00 +03:00
unelsson	28278e9a82	Drawing duplicate lines is faster than iterating through big containers	2021-10-15 21:54:00 +03:00
unelsson	55456a19fc	Only iterate through temporary selection when using toggle	2021-10-15 21:54:00 +03:00
unelsson	46960825ef	Various terrain selection and editmode dragging fixes	2021-10-15 21:54:00 +03:00
unelsson	89a20b6ea5	Call dragEnded instead of pressed also after aborted operation	2021-10-15 21:54:00 +03:00
unelsson	3df9ceda03	Remove measurement code	2021-10-15 21:54:00 +03:00
unelsson	7602d677fa	Terrain selection optimizations, measurements, renderBin change	2021-10-15 21:54:00 +03:00
elsid	f6d1689bb9	Avoid redundant polygon path reallocations ... Use separate variable to store size and make all operations in-place.	2021-10-14 23:48:14 +02:00
elsid	79665cea66	Avoid access to the path vector element out of range ... polygonPath.front() in some cases might reference to a first element of empty vector. Copy the value into a local variable to be able to access later.	2021-10-14 23:46:50 +02:00
psi29a	ed1953b811	Merge branch 'actor_souls_only' into 'master' ... Don't hit the ground Closes #6339 See merge request OpenMW/openmw!1295	2021-10-14 17:15:02 +00:00
Evil Eye	5805c0114a	Don't hit the ground	2021-10-14 17:40:03 +02:00
psi29a	29082ff658	Merge branch 'morrowland_the_musical' into 'master' ... Stop trying to play non-existent music files started by scripts See merge request OpenMW/openmw!1293	2021-10-14 15:25:11 +00:00
psi29a	787da4891c	Merge branch 'actor_souls_only' into 'master' ... Check if the target is an actor before updating magic effects Closes #6339 See merge request OpenMW/openmw!1294	2021-10-14 15:19:16 +00:00
psi29a	89077af3ff	Merge branch 'getters' into 'master' ... Move getters to header in order to allow inlining (performance optimization) See merge request OpenMW/openmw!1289	2021-10-14 15:17:08 +00:00
Evil Eye	bba80b07a2	Check if the target is an actor	2021-10-14 16:49:30 +02:00
Bo Svensson	db3d938ee9	cleans up BSAFile (#3177) ... We currently build a large map of a BSAFile's contents unused by Open MW. We already map archive contents in VFS. With this PR we remove the map from BSAFile and reimplement its only current use in BSATool.	2021-10-14 14:46:44 +02:00
psi29a	e86b9a7b89	Merge branch 'add_comment' into 'master' ... Add comment for MWWorld::Ptr::getType() because it is not obvious. See merge request OpenMW/openmw!1291	2021-10-14 12:44:04 +00:00
psi29a	4cd927b22a	Merge branch 'fix-osg-version-check' into 'master' ... Fix FTBFS against older versions of osg See merge request OpenMW/openmw!1292	2021-10-14 06:02:35 +00:00
Evil Eye	4a6464ea67	Stop trying to play non-existent music files started by scripts	2021-10-13 22:40:07 +02:00
Dan Church	42bd10f356	Fix FTBFS against older versions of osg ... Bring back osg version guard. Drawable::dirtyGLObjects wasn't available until OpenSceneGraph-3.5.10.	2021-10-13 13:55:16 -05:00
Evil Eye	ec6451e93a	Merge branch 'recordtype' into 'master' ... Avoid copying std::string in MWWorld::Ptr::getTypeDescription() See merge request OpenMW/openmw!1290	2021-10-13 17:04:32 +00:00
Bo Svensson	617eec338a	removes version guard (#3173) ... We currently use a version guard to adapt to a change in the number of parameters supplied to osg::TriangleFunctor's operator() template functor. The differing parameter is unused in our code. Crucially, operator() is not an override, so we can just add a default value for the differing parameter. Such a default allows us to apply identical code to both versions of the library without regressing functionality.	2021-10-13 16:12:47 +02:00
Bo Svensson	fc9ab97950	sky.cpp	2021-10-13 10:08:28 +00:00
Petr Mikheev	4e9d691715	Add comment for MWWorld::Ptr::getType() because it is not obvious.	2021-10-12 21:30:37 +02:00
Evil Eye	6b482d0b52	Merge branch 'openmw-tradeglitch' into master	2021-10-12 18:19:19 +02:00
Bo Svensson	b0132be53f	do not dirty unchanged arrays (#3164) ... This PR proposes a simple change to `RigGeometry` `dirtyGLObjects` logic. 1. We will avoid dirtying unmodified arrays. 2. We can drop an osg version guard since `Drawable::dirtyGLObjects` is not nearly as harmful as `Geometry::dirtyGLObjects`. 3. We will avoid crashes in an as yet unfinished future PR concerning `Array` sharing improvements.	2021-10-12 13:47:42 +02:00
psi29a	6ec66edb7c	Merge branch 'soulful' into 'master' ... Fix soul trapping for one shot kills Closes #6337 See merge request OpenMW/openmw!1288	2021-10-12 07:59:44 +00:00
psi29a	67fa8413f3	Merge branch 'physics_heightfield' into 'master' ... Replace float type for arguments to create heightfield with int See merge request OpenMW/openmw!1285	2021-10-12 07:58:34 +00:00
psi29a	f55f90b36c	Merge branch 'sqlite3' into 'master' ... Add dependency to SQLite3 See merge request OpenMW/openmw!1286	2021-10-12 07:20:31 +00:00
psi29a	207a7245bc	Merge branch 'navigator_settings' into 'master' ... Initialize navigator max climb and max slope settings in makeSettingsFromSettingsManager See merge request OpenMW/openmw!1283	2021-10-12 07:02:08 +00:00
psi29a	444765e304	Merge branch 'navmesh_agent_half_extents' into 'master' ... Define default actor half extents in settings See merge request OpenMW/openmw!1282	2021-10-12 07:01:13 +00:00
psi29a	d110c1be3b	Merge branch 'collision_object' into 'master' ... Move btCollisionObject creation for MWPhysics::Object into components See merge request OpenMW/openmw!1281	2021-10-12 06:59:46 +00:00
Petr Mikheev	a8acc19988	Avoid copying std::string in MWWorld::Ptr::getTypeDescription()	2021-10-12 00:18:23 +02:00
elsid	405e814190	Move btCollisionObject creation for MWPhysics::Object into components	2021-10-11 23:14:02 +02:00
fredzio	c9279d4137	Add a simple HOWTO for the builtin tracing functionality.	2021-10-11 22:56:24 +02:00
Evil Eye	ebe42a6c7d	Apply elsid's switch suggestions	2021-10-11 20:10:39 +00:00
Evil Eye	7af5b3acd2	Remove Java option	2021-10-11 19:58:45 +00:00
Evil Eye	ae4578f566	Fix soul trapping for one shot kills	2021-10-11 21:46:15 +02:00
Petr Mikheev	fec65acd18	Move getters to header in order to allow inlining	2021-10-11 21:33:35 +02:00
elsid	144862aa35	Define default actor half extents in settings ... Player's half extents may change over time when wolfskin model is used for example. Having it in settings is a more presistent approach.	2021-10-11 19:41:43 +02:00
elsid	2bace703d5	Add dependency to SQLite3 ... This will be required by navmeshtool.	2021-10-11 19:34:07 +02:00
elsid	7c5a590890	Replace float type for arguments to create heightfield with int ... To reduce amount of computations on the caller side and restrict possible values. * verts can't be non-int because it's a number of things. * worldsize is initially defined as int by ESM::Land::REAL_SIZE. * Put function to calculate heightfied shift into components to be able to reuse by other binaries.	2021-10-11 19:28:08 +02:00
elsid	6986feb81b	Initialize navigator max climb and max slope settings in makeSettingsFromSettingsManager ... To avoid having multiple places to initialize them when they will be required by multiple binaries.	2021-10-11 18:50:26 +02:00
Bo Svensson	d6613d3677	mostly reverts MWLua changes (#3170) ... We just can no longer use the former ptr.getTypeName() as a fallback, but I do not suppose it matters. This value was an implementation defined string that usually contained a garbled mess. Probably we should additionally refactor Lua types completely now that we have Ptr::getType(). I will leave this up to MWLua developers.	2021-10-11 16:56:26 +02:00
Bret Curtis	21f1cf6d86	Merge pull request #3169 from bosvensson1/patch-47 ... fixes build For some reason only some platforms complain about this missing header.	2021-10-11 16:56:11 +02:00
Bo Svensson	5cf9995a31	fixes windows build	2021-10-11 13:28:37 +00:00