1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Commit graph

25516 commits

Author SHA1 Message Date
psi29a
8edef1692f Merge branch 'revert_windows_ci' into 'master'
Revert some windows CI changes

See merge request OpenMW/openmw!773
2021-04-24 13:04:25 +00:00
AnyOldName3
6420501baa Merge branch 'fix_noexcept_default' into 'master'
Fix build by compliers without implementation of P1286R2 (#5983)

See merge request OpenMW/openmw!772
2021-04-24 13:02:11 +00:00
elsid
0ac3f09fe0
Revert "Build windows in scheduled tasks"
This reverts commit 44ca708e12.
2021-04-24 13:58:32 +02:00
elsid
2af40a1e13
Revert "Build even more windows"
This reverts commit e3d3b97da0.
2021-04-24 13:58:11 +02:00
elsid
e1d955d92b
Remove noexcept specifier from CreatureCustomData move ctor
C++17 doesn't allow to declare defaulted move ctor with not matching
exception specification to the calculated one:
/Users/eddie/Downloads/BUILD/openmw-master/apps/openmw/mwclass/creature.cpp:63:9: error:
      exception specification of explicitly defaulted move constructor does not
      match the calculated one
        CreatureCustomData(CreatureCustomData&& other) noexcept = default;
        ^

http://wg21.link/p1286r2 makes this possible in C++20 and newer compilers
already have it working even with -std=c++17 but older onces give an error.
2021-04-24 00:32:22 +02:00
elsid
ca7add0624
Add move constructor to MWMechanics::Spells 2021-04-24 00:32:22 +02:00
elsid
46e34c500c
Use algorithms to add/remove listener to SpellList 2021-04-24 00:32:07 +02:00
Andrei Kortunov
8aa76ff540 Use W4 instead of Wall for MSVC 2021-04-23 22:54:02 +04:00
Andrei Kortunov
6d351b2bdd Fix MSVC 4706 warnings 2021-04-23 22:53:59 +04:00
AnyOldName3
a34151d890 Merge branch 'brew_gitlab' into 'master'
Don't run `brew uninstall` outside of travis-ci

See merge request OpenMW/openmw!771
2021-04-23 18:30:09 +00:00
AnyOldName3
90fecdeda2 Merge branch 'vertex_lighting_fix' into 'master'
Correct vertex lighting

Closes #5973

See merge request OpenMW/openmw!770
2021-04-23 18:20:16 +00:00
jvoisin
ce654b0504 Don't run brew uninstall outside of travis-ci 2021-04-23 19:21:33 +02:00
AnyOldName3
123044f60b Merge branch 'osx_sysroot_patch' into 'master'
Revert CMAKE_OSX_SYSROOT as this interferes with the gitlab ci builds.

See merge request OpenMW/openmw!769
2021-04-23 01:44:36 +00:00
glassmancody.info
c48eee4eee Clamp vertex lighting before interpolation
Fixes a regression in which pass lighting was clamped after being passed
to fragment shader. For correct FFP emulation, we need to clamp the result
in vertex shader. When clamping after interpolation, negative lights in
particular have a much more drastic effect.
2021-04-22 16:53:37 -07:00
nighthawk469
511d3344fe Revert CMAKE_OSX_SYSROOT as this interferes with the gitlab ci builds. 2021-04-22 23:43:30 +00:00
psi29a
138d3b65a3 Merge branch 'audio-device-close-error' into 'master'
don't forget to close the audio device after you're done with it.

See merge request OpenMW/openmw!759
2021-04-22 18:42:57 +00:00
Simon Meulenbeek
cd419256ad don't forget to close the audio device after you're done with it. 2021-04-22 18:42:56 +00:00
psi29a
f553f4e891 Merge branch 'nighthawk469-master-patch-79878' into 'master'
Revert Xcode sdk version from 11.6 to 10.2

See merge request OpenMW/openmw!766
2021-04-22 18:41:03 +00:00
nighthawk469
03bb569995 Revert Xcode sdk version from 11.6 to 10.2 2021-04-22 18:41:02 +00:00
jvoisin
e3d3b97da0 Build even more windows 2021-04-21 20:31:02 +02:00
jvoisin
44ca708e12 Build windows in scheduled tasks
This should solve disappearing nigthlies
2021-04-21 20:29:16 +02:00
jvoisin
fb55207328 Remove some useless includes from the wizzard 2021-04-21 19:08:06 +02:00
Andrei Kortunov
f2f2c3d873 Disable -Wsuggest-override again since we have no control over code from FetchContent 2021-04-21 09:28:51 +04:00
Andrei Kortunov
faad18b7f9
Merge pull request #3072 from akortunov/warnfix
Fix node masks signed/unsigned mismatch
2021-04-21 09:26:06 +04:00
Bret Curtis
823c4dfba4
Merge pull request #3073 from akortunov/master
Disable controllers for found sheath meshes
2021-04-20 18:51:42 +02:00
Andrei Kortunov
b7b85bb713 Disable controllers for found sheath meshes (bug #5975) 2021-04-20 16:01:01 +04:00
Andrei Kortunov
2d869ca9ff Fix node masks signed/unsigned mismatch 2021-04-20 10:52:51 +04:00
Bret Curtis
50d6cd2a34
Merge pull request #3070 from akortunov/coverity
Fix an another portion of Coverity warnings
2021-04-20 07:33:03 +02:00
Bret Curtis
c6c92b5712
Merge pull request #3071 from akortunov/master
Fix an another batch of MSVC complaints
2021-04-20 07:31:56 +02:00
AnyOldName3
ff46eceabe Merge branch 'maybe-reintroduce-5904' into 'master'
Fix crash on startup

See merge request OpenMW/openmw!709
2021-04-19 19:31:21 +00:00
Lamoot
cbfaab51e7 Mention and link settings for dehardcoded models in index page of custom models section. 2021-04-19 21:21:53 +02:00
Lamoot
55416a57ef Document the newly added settings under [Models] section, used for dehardcoded mesh paths. 2021-04-19 20:11:13 +02:00
Hristos N. Triantafillou
43e5d8300c Merge branch 'allow_osx_fail' into 'master'
Allow OSX to fail for now

See merge request OpenMW/openmw!763
2021-04-19 14:50:27 +00:00
jvoisin
21203fb850 Allow OSX to fail for now 2021-04-19 16:00:11 +02:00
Andrei Kortunov
d10399e083 Cast double constant to float explicitely 2021-04-19 17:08:03 +04:00
Andrei Kortunov
7d5c5f8a24 Do not assign negative values to unsigned variables 2021-04-19 16:08:19 +04:00
Andrei Kortunov
651ad11ad8 Do not leave variables without initialization, even in execution paths where they are unused 2021-04-19 16:08:10 +04:00
Andrei Kortunov
9647b670e4 Do not declare unused variables 2021-04-19 15:43:00 +04:00
Andrei Kortunov
2009916dd8 Fix dead code 2021-04-19 15:38:02 +04:00
Andrei Kortunov
0cadc97fb3 Fix double -> float conversions 2021-04-19 15:36:58 +04:00
Andrei Kortunov
1b1c786d0c Do not suppress fixed MyGUI warnings 2021-04-19 15:34:22 +04:00
Bret Curtis
befa3f587f
Merge pull request #3068 from akortunov/master
Clean up MSVC warnings
2021-04-19 09:27:17 +02:00
psi29a
b645c1f4c0 Merge branch 'navmesh_ignore' into 'master'
Do not trigger NavMesh update when RecastMesh update should not change NavMesh (#4917)

See merge request OpenMW/openmw!762
2021-04-18 21:53:43 +00:00
psi29a
f3354c509e Merge branch 'stomp' into 'master'
Adjustable Stomp

See merge request OpenMW/openmw!575
2021-04-18 21:35:37 +00:00
elsid
3e67f5ffa5
Detect and ignore updates for oscillating objects
To avoid triggering NavMesh update when RecastMesh change should not change
NavMesh.

Based on the following assumption:
Given a set of transformations and a bounding shape for all these
tranformations, a new object transformation that does not change this
bounding shape also should not change navmesh if for all of this object
transformations resulting navmesh tiles are equivalent

The idea is to report back to RecastMeshManager all changes of NavMesh if there
are any assiciated with RecastMesh version. So we know the last time when
RecastMesh change resulted into the NavMesh change. When later report shows
that there was no NavMesh change for a new RecastMesh version we can assume
that any object transformation within the same bounding box should not change
NavMesh.
2021-04-18 23:00:13 +02:00
elsid
64fb700ae9
Remove unnecessary relation between updateCompoundObject and RecastMeshObject 2021-04-18 23:00:13 +02:00
elsid
629cedb6d0
Do not track last build revision in RecastMeshManger
mLastBuildRevision == mRevision with current use cases does not happen. But
even if this will happen when another use case will be added it does not save
much computation. The most expensive operation is not adding objects to the
MeshBuilder but to optimize resulting navmesh that will happen anyway in
MeshBuilder::create call.
2021-04-18 22:59:16 +02:00
AnyOldName3
ce3ed28403 Control stomping via settings. 2021-04-18 21:44:23 +01:00
psi29a
7a22c022dc Merge branch 'collada-documentation' into 'master'
Various improvements to the COLLADA format asset pipeline page.

See merge request OpenMW/openmw!761
2021-04-18 20:16:24 +00:00
psi29a
3423d3f882 Merge branch 'various_warn' into 'master'
Fix various warnings found by clang

See merge request OpenMW/openmw!758
2021-04-18 20:04:20 +00:00