mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:26:43 +00:00
Code Issues Releases Wiki Activity
26386 commits 115 branches 76 tags 128 MiB
Commit graph

26386 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
2cee222e73 Merge branch 'explosion_at_impact' into 'master' 
Bring arrow behaviour in line with vanilla (#6233 and other change)

See merge request OpenMW/openmw!1188
 2021-09-27 19:00:53 +00:00
Bo Svensson
c6f7137ee1
fixes bugs with share state (#3111) 
* optimizer.cpp merge fix

* objectpaging.cpp

* optimizer.hpp setSharedStateManager

* optimizer.cpp shareState

* scenemanager.cpp shareState

* scenemanager.cpp

* optimizer.cpp

* optimizer.cpp

* scenemanager.cpp

* optimizer.cpp
 2021-09-27 20:41:24 +02:00
Evil Eye
233bb287e1 Merge branch 'refactoring2' into 'master' 
Minor refactoring: use Misc::normalizeAngle in worldimp.cpp

See merge request OpenMW/openmw!1242
 2021-09-27 16:01:31 +00:00
Evil Eye
30c998f34e Merge branch 'test_cells' into 'master' 
Use same logic for testing cell as for loading cell

See merge request OpenMW/openmw!1240
 2021-09-27 15:24:00 +00:00
Evil Eye
2f4df12b2e Merge branch 'Fix_ASCII' into 'master' 
Fixed an issue where keyword search expected the text to be all ASCII characters

See merge request OpenMW/openmw!1227
 2021-09-26 20:08:55 +00:00
florent.teppe
5620e8f0e2 Added the fix to the changelog, and my name to the authors 2021-09-26 20:40:11 +02:00
Petr Mikheev
83e0d9aeef Minor refactoring: use Misc::normalizeAngle in worldimp.cpp 2021-09-26 17:28:51 +02:00
psi29a
aa11238be1 Merge branch 'colladaalphatest' into 'master' 
Collada alpha testing

See merge request OpenMW/openmw!1177
 2021-09-26 15:26:02 +00:00
psi29a
e2e5161d81 Merge branch 'optimizebrushdraw' into 'master' 
Optimize terrain editing brush drawing performance

Closes #6285

See merge request OpenMW/openmw!1226
 2021-09-26 15:14:55 +00:00
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
florent.teppe
d9c3ba03f4 Uses limits instead of climits 2021-09-20 21:01:28 +02: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
florent.teppe
2d32954888 Replaced Assert_true with expect_eq 2021-09-20 19:56:47 +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
unelsson
67894349a9 Add a check for OPAQUE_BIN 2021-09-19 22:38:07 +03:00
unelsson
f2a894024a Change debug levels 2021-09-19 22:38:07 +03:00
unelsson
ec0b36d21d Don't make a new osg::depth to alpha tested node 2021-09-19 22:38:07 +03:00
unelsson
96f02ab32c Per-material alpha testing for collada 2021-09-19 22:38:07 +03:00
unelsson
40497d6fe5 Set depth testing for alpha blend & test, depth writes off for blend. 2021-09-19 22:38:07 +03:00
unelsson
89982eb9e3 Add changelog 2021-09-19 22:38:07 +03:00
unelsson
b3d1d106af Collada alpha testing and uniforms 2021-09-19 22:38:07 +03: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
florent.teppe
0e06e9b221 Removed useless comment and converted the file to UTF8 to keep special characters 2021-09-19 20:31:22 +02:00
Evil Eye
6d7cb38834 Remove duplicate GetSquareRoot implementation 2021-09-19 19:53:38 +02:00
florent.teppe
c1c501ca35 Added test to make sure keyword search works even with non ascii characters 2021-09-19 15:05:48 +02:00
florent.teppe
bcb0526268 Added climits, it compiled on VS2019, but not with g++ 2021-09-19 15:00:51 +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
florent.teppe
76be2e91e5 Fixed an issue where keyword search expected the text to be all ASCII characters 2021-09-18 18:25:04 +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
unelsson
70e210735a Optimize terrain editing brush drawing performance 2021-09-18 15:57:00 +03: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