26362 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elsid	5878b1fce6	Use same logic for testing cell as for loading cell ... Having different branches makes testing less useful. If something fails in regular executing it should fail in testing. To make it possible there should be none differences in the execution paths.	2021-09-24 22:24:07 +02:00
elsid	027277ce3b	Merge branch 'Sheathed-weapons-visible-first-person' into 'master' ... Fix #6299 Sheathed Weapons are visible in first person Closes #6299 See merge request OpenMW/openmw!1237	2021-09-24 16:18:32 +00:00
Cédric Mocquillon	b676d93e03	Use a pair of iterator to represents a range for directory listing	2021-09-24 14:17:34 +02:00
psi29a	baa33799de	Merge branch 'check_pathgrid' into 'master' ... Make sure PathFinder::getClosestPoint is not called with failing precondition (#6294) Closes #6294 See merge request OpenMW/openmw!1236	2021-09-23 12:50:08 +00:00
elsid	d36595e09e	Make sure PathFinder::getClosestPoint is not called with failing precondition ... Pathgrid should be not nullptr and points should be not empty.	2021-09-23 01:48:54 +02:00
elsid	14516b9fd6	Merge branch 'fix_6296' into 'master' ... Ignore time to destination when giving way (#6296) See merge request OpenMW/openmw!1234	2021-09-22 22:12:22 +00:00
Petr Mikheev	5893b88409	Ignore time to destination when giving way (#6296)	2021-09-22 01:46:04 +02:00
Bo Svensson	d38c8c6dcb	optimise chunk drawing order (#3116) ... * material.cpp * material.cpp	2021-09-21 22:41:07 +02:00
Bo Svensson	b22fb7a7bf	consolidate node mask checks (#3125) ... * consolidate node mask checks This PR simplifies a few checks against node masks in object paging by using the osg provided `setTraversalMask`. * objectpaging.cpp	2021-09-21 22:39:31 +02:00
Evil Eye	786b6b7c9a	Merge branch 'lua_util' into 'master' ... Move LuaState::makeReadOnly(sol::table) out of the class See merge request OpenMW/openmw!1229	2021-09-21 15:14:09 +00:00
Bo Svensson	99df1c695c	fixes wireframe is broken (#3123) ... * renderingmanager.cpp [ci skip] * groundcover.hpp [ci skip] * groundcover.cpp * renderingmanager.cpp [ci skip] * renderingmanager.hpp	2021-09-20 20:17:55 +02:00
psi29a	15bcbb5844	Merge branch 'getsquareroot' into 'master' ... Remove duplicate GetSquareRoot implementation See merge request OpenMW/openmw!1231	2021-09-19 19:49:55 +00:00
Evil Eye	831055f878	Merge branch 'OpenCS-fix-modify' into 'master' ... OpenCS - Re-implement the fix for Issue #6067. See merge request OpenMW/openmw!1173	2021-09-19 19:23:30 +00:00
Evil Eye	6d7cb38834	Remove duplicate GetSquareRoot implementation	2021-09-19 19:53:38 +02:00
Petr Mikheev	2f25257a3e	Move LuaState::makeReadOnly(sol::table) out of the class because it doesn't need to access LuaState internals.	2021-09-19 14:38:27 +02:00
psi29a	d3f5be0950	Merge branch 'fix_6286' into 'master' ... Fix deadlock in Lua worker thread Closes #6286 See merge request OpenMW/openmw!1228	2021-09-19 11:20:26 +00:00
Bo Svensson	095f4b2ed5	material.cpp (#3117)	2021-09-19 13:13:28 +02:00
Petr Mikheev	f1e3c55ea3	Fix deadlock in Lua worker thread (#6286)	2021-09-19 11:32:52 +02:00
Bret Curtis	8d86d90782	remove whitespace	2021-09-18 22:00:26 +02:00
Bo Svensson	179f91276a	lightmanager.cpp (#3121)	2021-09-18 18:21:11 +02:00
psi29a	68db9869f5	Merge branch 'DistantTerrainDebugChunks' into 'master' ... Debug terrain chunks See merge request OpenMW/openmw!1169	2021-09-18 15:21:26 +00:00
psi29a	7590b3a223	Merge branch 'remove_cmake_macros' into 'master' ... Remove redundant qt-related cmake macros See merge request OpenMW/openmw!1224	2021-09-18 15:11:12 +00:00
psi29a	3419d5ab32	Merge branch 'fix_osg_static' into 'master' ... Fix build with system static OpenSceneGraph See merge request OpenMW/openmw!1225	2021-09-18 15:09:44 +00:00
elsid	b9825afb8a	Fix build with system static OpenSceneGraph ... * Add dependency to libraries required by OSG but missing when linking with OSG system library. * Use find_package for already defined dependencies.	2021-09-17 19:59:11 +02:00
Bo Svensson	e4648cec48	kill buil (#3118) ... He was a great fellow. We will forever be in debt for his services. Time to say good-bye.	2021-09-17 19:24:11 +02:00
Pi03k	4ff5a04e9b	Remove redundant qt-related cmake macros	2021-09-17 14:41:04 +02:00
Bo Svensson	f62adab43a	Avoid the terrain sync completely in most cases (#3103) ... We can take elsid's commit 605cb8d further by avoiding the terrain sync completely in most cases. Currently in changeCellGrid we wait for a new preloading task to ensure the getPagedRefnums for the new active cells have been filled in by object paging. This is usually not necessary because we have already completed a preload in the past containing these active cells. With this PR we remember what we preloaded and skip the terrain sync if it is not needed.	2021-09-16 22:11:19 +02:00
Bret Curtis	c658acc2b3	pipeline only on pull_requests (#3109) ... * Create debs * Update cmake.yml * give ccache a try * ccache round 2 * Update cmake.yml	2021-09-15 16:50:19 +02:00
psi29a	2be3a76b6a	Merge branch 'spin_me_right_round' into 'master' ... Reset rotation when respawning actors Closes #6273 See merge request OpenMW/openmw!1219	2021-09-15 08:27:25 +00:00
psi29a	24d1c2b5fa	Merge branch 'recurse_directory_iterator' into 'master' ... VFS manager refactoring See merge request OpenMW/openmw!1218	2021-09-15 07:20:52 +00:00
psi29a	7e3ed9605b	Merge branch 'qt_moc_notes' into 'master' ... Remove 'no relevant classes' moc warning. Fix: #6201 Closes #6201 See merge request OpenMW/openmw!1206	2021-09-15 07:08:25 +00:00
Chris Djali	633b4852d5	Merge pull request #3106 from bosvensson1/bosvensson1-patch-2 ... consolidate a uniform related to shadows	2021-09-15 00:48:03 +01:00
Bret Curtis	dd6649d519	Create cmake.yml (#3107) ... * Create cmake.yml * Update cmake.yml * Update cmake.yml * Update cmake.yml * Update cmake.yml	2021-09-14 22:59:04 +02:00
Cédric Mocquillon	6817282097	Move getFileExtension to common header and use instead of repeating same code	2021-09-14 18:09:55 +02:00
Cédric Mocquillon	c2df0949e2	Change normalizeFilename signature	2021-09-14 18:09:55 +02:00
Cédric Mocquillon	d4e26746a3	Use recurse subdirectory iterator to iterate over the VFS without exposing internal details	2021-09-14 18:09:54 +02:00
Evil Eye	60298cd66d	Reset rotation when respawning actors	2021-09-14 16:53:57 +02:00
Bo Svensson	2cebd19432	shadervisitor.cpp	2021-09-14 11:37:23 +00:00
Bo Svensson	3415f12e12	shadervisitor.cpp	2021-09-14 11:30:07 +00:00
pi03k	e4eeb9cce9	Remove 'no relevant classes' moc warning	2021-09-14 11:20:18 +02:00
Bo Svensson	b6f572578e	Groundcover optimisation (#3101) ... * groundcover.cpp share state * groundcover.hpp share state	2021-09-13 12:20:00 +02:00
psi29a	0ab8a7ddd7	Merge branch 'create-objects-menu' into 'master' ... OpenMW-CS: Usability changes to the drop-down menu when creating a new object. See merge request OpenMW/openmw!1210	2021-09-12 14:15:11 +00:00
psi29a	ff29bd8dfa	Merge branch 'revert-c284d0cf' into 'master' ... Fix weapon sheathing is broken Closes #6272 See merge request OpenMW/openmw!1215	2021-09-12 09:48:29 +00:00
Bo Svensson	6d12a240a3	shadervisitor.cpp uniform	2021-09-12 09:23:36 +00:00
Bo Svensson	52a9b4d989	shadowsbin.cpp uniform	2021-09-12 09:21:10 +00:00
psi29a	c40f921396	Revert "actoranimation.cpp faster getbonebyname (#3099)" ... This reverts commit c284d0cf5c6ca0a6a55e92f9de7351469946628d	2021-09-12 07:56:20 +00:00
Cédric Mocquillon	d7352ded36	Add configurable color and offset	2021-09-11 21:53:05 +02:00
Cédric Mocquillon	080c909c28	Merge the 'debug chunks' and 'object paging debug batches' settings into a single one	2021-09-11 21:53:05 +02:00
Cédric Mocquillon	4b7d0bba53	Avoid adding redundant osg;;Group in non debug mode	2021-09-11 21:53:04 +02:00
Cédric Mocquillon	98a0819d52	Debug terrain chunks	2021-09-11 21:53:04 +02:00