mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity
26,964 Commits 18 Branches 66 Tags
Commit Graph

26964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
psi29a
c9f3c27dc7 Merge branch 'phys_perf_test' into 'master' 
Help bullet optimize collisions with very complex collision meshes by making small collision tests if possible

See merge request OpenMW/openmw!1317
 2021-11-03 11:49:44 +00:00
Bo Svensson
4657c655b1 refactors parentFileIndices (#3211) 
This PR aims to start addressing `ESM` design issues that have silenced errors we incorporated into groundcover `ESM` loading approaches.

- We move the resolution of `parentFileIndices` from `ESMStore` to `ESMReader` as suggested in a `TODO` comment.
- We improve a highly misleading comment which downplayed the significance of `parentFileIndices`.
- We document important preconditions.
- We move a user facing error message to the highest level and improve its context.
- We remove an inappropriate `setGlobalReaderList` method. We now pass this reader list into the method that requires it.
- We remove a thoroughly pointless optimisation of `Store<ESM::LandTexture>`'s construction that has unnecessarily depended on `getGlobalReaderList`.

There should be no functional changes for `master`, but this PR should remove an issue blocking PR #3208.
 2021-11-03 11:07:28 +01:00
psi29a
a5bfec610c Merge branch 'refactor_bullet_nif_loader' into 'master' 
Refactor BulletNifLoader

See merge request OpenMW/openmw!1344
 2021-11-03 08:11:45 +00:00
elsid
2b057f5c15
Expect nif node children to have parent 2021-11-02 22:44:33 +01:00
elsid
19843af704
Combine data check with data handling logic 2021-11-02 22:44:33 +01:00
elsid
4e8e8304aa
Avoid mesh allocation when data is invalid 2021-11-02 22:44:33 +01:00
elsid
4ac83f4c39
Add separate function to handle NiGeometry node 
To force use a single source of data. All fields of Nif::Node are available in NiGeometry.
 2021-11-02 22:44:32 +01:00
elsid
56eef691a8
Use reference type to pass nif node as argument where nullptr is not handled 2021-11-02 22:44:32 +01:00
elsid
4631d95739
Add more tests for BulletNifLoader 2021-11-02 22:44:32 +01:00
psi29a
523289c531 Merge branch 'refactor_bullet_shape' into 'master' 
Refactor bullet shape

See merge request OpenMW/openmw!1333
 2021-11-02 20:30:22 +00:00
psi29a
4ff4afd50b Merge branch 'lua_callback' into 'master' 
Refactoring. Lua `Callback` is moved from apps/openmw/mwlua to components/lua.

See merge request OpenMW/openmw!1334
 2021-11-02 20:28:34 +00:00
psi29a
cb3ab21c13 Merge branch 'recast_mesh_object' into 'master' 
Store holder only in parent RecastMeshObject

See merge request OpenMW/openmw!1332
 2021-11-02 20:27:49 +00:00
psi29a
ea7e83499d Merge branch 'enlightened_skeletons' into 'master' 
Allow creatures to use torches

Closes #6376

See merge request OpenMW/openmw!1335
 2021-11-02 20:25:26 +00:00
psi29a
c50aee9434 Merge branch 'blaze_it' into 'master' 
Rotate lights by 90 degrees

Closes #5937

See merge request OpenMW/openmw!1343
 2021-11-02 20:19:51 +00:00
Evil Eye
a9106f4d7c Rotate torches by 90 degrees 2021-11-02 18:01:22 +01:00
wareya
940e338453 Constifications 2021-11-02 15:17:26 +00:00
Bo Svensson
213faa6695
restores countRecords optimisations (#3210) 
With this PR we restore @elsid 's optimisations of countRecords we have unintentionally discarded in PR #3197. In addition, we give it a more appropriate name and add comments concerning its peculiar background.
 2021-11-02 14:46:41 +01:00
psi29a
d3b2503111 Merge branch 'distractions' into 'master' 
Reduce code duplication in getting the shield model

See merge request OpenMW/openmw!1337
 2021-11-02 13:32:21 +00:00
psi29a
9694398b69 Merge branch 'actually_walk_on_the_water' into 'master' 
#6373: finish half commited commit

See merge request OpenMW/openmw!1336
 2021-11-02 10:15:40 +00:00
psi29a
26ee2d284e Merge branch 'rtd' into 'master' 
Fix readthedocs config, second attempt.

See merge request OpenMW/openmw!1342
 2021-11-02 10:13:34 +00:00
psi29a
4d71e26ac8 Merge branch 'astoecke-fix-osg-341-pif' into 'master' 
Fix compilation with OpenSceneGraph 3.4.1 (#6381)

Closes #6381

See merge request OpenMW/openmw!1339
 2021-11-02 10:12:05 +00:00
Petr Mikheev
20f851b3b5 Fix readthedocs config, second attempt. 2021-11-02 10:22:15 +01:00
Andreas Stöckel
a5a895ffd4 Fix #6381 
Do not use osg::PI_f
 2021-11-01 20:55:19 -04:00
AnyOldName3
ade3c2c61b Merge branch 'rtd' into 'master' 
Fix readthedocs config

See merge request OpenMW/openmw!1340
 2021-11-02 00:09:47 +00:00
Petr Mikheev
665d756f02 Fix readthedocs config 2021-11-02 00:12:26 +01:00
Evil Eye
3660d5cc4c Reduce code duplication in getting the shield model 2021-11-01 19:33:29 +01:00
glassmancody.info
4461366761 settings update and launcher option 2021-11-01 09:26:50 -07:00
fredzio
8c21b0b503 Apply waterwalking even when we skip simulation. 
This chunk was supposed to be part of !1324 but somehow got stuck staged in my tree.
 2021-11-01 12:44:36 +01:00
wareya
221f6f134d gcc and clang don't like this 2021-10-31 18:18:49 -04:00
wareya
4f10d5d544 update docs 2021-10-31 16:15:25 -04:00
wareya
9b030e174f removing this part was a mistake, made the ripples more repetitive 2021-10-31 15:52:54 -04:00
wareya
838fc634c6 address review comments 2021-10-31 15:32:24 -04:00
Evil Eye
92bdd44e58 Allow creatures to use torches 2021-10-31 20:25:37 +01:00
wareya
e1378cd290 Replace uniform with define 2021-10-31 13:18:19 -04:00
Petr Mikheev
e7ec89573e Refactoring. Lua Callback is moved from apps/openmw/mwlua to components/lua. 2021-10-31 17:47:46 +01:00
wareya
d47770df19 Merge branch 'master' of gitlab.com:wareya/openmw 2021-10-31 10:36:43 -04:00
wareya
226d3eac0d Improve performance, add simpler ripples, add a setting, fix nighttime brightness 2021-10-31 10:33:28 -04:00
psi29a
8c06558cf8 Merge branch '6375' into 'master' 
Fix regression #6375

Closes #6375

See merge request OpenMW/openmw!1331
 2021-10-31 12:07:44 +00:00
Bo Svensson
b9911da4c7
applies lightMask (#3201) 
With this PR we apply `lightMask` to a `Transform` node we create specifically for a light. This mask will allow us to stop traversing such nodes sooner and avoid costly processing associated with `Transform` nodes in the cull visitor.
 2021-10-31 13:03:42 +01:00
Bo Svensson
d88d006984
fixes getViewDistance (#3207) 
I have been informed by @akortunov that my addition of `Groundcover::getViewDistance` is not working in some cases. Investigations revealed that some `ViewData` code interacting with my additions had been quite thoroughly optimised in a way that was not sufficiently documented and interfered with the new feature. With this PR we repair `getViewDistance` while preserving such optimisations and add a necessary comment to avoid issues in the future. In addition, we now rebuild views when the global `mViewDistance` changes.
 2021-10-31 12:59:34 +01:00
Evil Eye
3c40935ec1 Fix regression #6375 2021-10-31 11:57:33 +01:00
Bo Svensson
356e9d7cf0
refactors osg::Callback virtual inheritance (#3200) 
With this PR we refactor `SceneUtil::KeyframeController` not to require `virtual osg::Callback` inheritance. I suppose such `virtual` overhead is not justified here because it negatively impacts many other classes we derive from `osg::Callback`.
 2021-10-30 22:43:18 +02:00
psi29a
4c81518abb Merge branch 'puddle' into 'master' 
Give each reflect and spell absorption effect a chance to apply

Closes #6255 and #6253

See merge request OpenMW/openmw!1279
 2021-10-30 19:26:32 +00:00
glassmancody.info
40b6bbbdf3 use openmw define system 2021-10-30 12:19:31 -07:00
glassmancody.info
8c3b00164e soft particles 2021-10-30 12:19:31 -07:00
psi29a
3eb6b658c6 Merge branch 'setpos_strikes_back' into 'master' 
#6292 unbreak scripted spells

See merge request OpenMW/openmw!1324
 2021-10-30 18:50:02 +00:00
psi29a
740045f7d6 Merge branch 'test_compiler' into 'master' 
Add unit tests for the mwscript compiler

See merge request OpenMW/openmw!1325
 2021-10-30 18:41:15 +00:00
psi29a
15cb9f886c Merge branch 'launcher_omwscripts' into 'master' 
Support *.omwscripts in openmw-launcher

See merge request OpenMW/openmw!1329
 2021-10-30 18:10:09 +00:00
Bo Svensson
1329f22186
refactors MWWorld::Store maps (#3197) 
With this PR we clean up `MWWorld::Store` maps according to the approach of PR #3184.
 2021-10-30 19:27:57 +02:00
Bo Svensson
7d34149adc
consolidates createUnlitMaterial (#3203) 
With this PR we remove a few duplicate lines of code by adding a parameter to `createUnlitMaterial`.
 2021-10-30 19:19:58 +02:00