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
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
AnyOldName3
87ce1a7351
Explain stomp constants
2021-04-18 20:31:33 +01:00
AnyOldName3
a81dfe9ccc
MGE XE-like stomping
2021-04-18 20:31:33 +01:00
AnyOldName3
1737f737df
Don't use a vec3 if only two components get read
2021-04-18 20:31:32 +01:00
Lamoot
4d4fc5ed0b
Finish the section on materials setup.
2021-04-18 21:28:44 +02:00
elsid
62f32f4543
Do not replace equivalent navmesh tiles
2021-04-18 20:04:41 +02:00
Alexei Dobrohotov
b29e797b27
Merge branch 'seventh_time_is_the_charm' into 'master'
...
Unbreak again NPC teleport
See merge request OpenMW/openmw!760
2021-04-18 16:36:11 +00:00
Matjaž Lamut
8b40128559
Finish the section on how to set up collision shapes in Blender.
2021-04-18 15:14:36 +00:00
Lamoot
ee2bcff694
Various improvements to the COLLADA format asset pipeline page. Added images. Added more information on how to define textkeys. Always use all capitals for the COLLADA format name. Barebones subsections for materials and collisions.
2021-04-18 15:52:11 +02:00
jvoisin
032ba1e9a0
Fix the compilation
2021-04-18 13:26:26 +02:00
Petr Mikheev
5fe10e8e7f
Merge branch 'fix-headtracking' into 'master'
...
Fix headtracking while invisible
See merge request OpenMW/openmw!743
2021-04-18 10:54:57 +00:00
Jacob Turnbull
f49b9e3806
Fix headtracking while invisible
2021-04-18 10:54:56 +00:00
fredzio
36bb2d5f15
An actor needs not be in active cell. As such we can't use
...
PhysicsSystem::getActor() to determine that a ptr is not actor.
2021-04-18 08:45:43 +02:00
psi29a
50db75bd13
Merge branch 'settingstocs_csmprefs' into 'master'
...
Dehardcode animations in OpenMW-CS (CSMPrefs method)
See merge request OpenMW/openmw!742
2021-04-17 20:00:07 +00:00
jvoisin
c0f7e0d585
Use isnan
2021-04-17 20:58:37 +02:00
jvoisin
38316cdaf8
Fix various warnings found by clang
...
- unused alias
- inefficient use of push_back
- exceptions not inheriting from std::exception
- weird use of a comma
- value compared against itself
2021-04-17 19:06:33 +02:00
psi29a
a69619a1e8
Merge branch 'where_is_my_log' into 'master'
...
Don't clobber game log file when we collect a stack trace.
See merge request OpenMW/openmw!755
2021-04-17 15:55:45 +00:00
fredzio
4058e117ca
Don't clobber game log file when we collect a stack trace.
...
When the crash catcher catch a signal it forks to collect data about its
parent. In the process the child reinitialize the log file, which ends
up empty.
2021-04-17 13:14:01 +02:00
Andrei Kortunov
f308dde254
Clean up MSVC warnings
2021-04-17 12:14:50 +04:00
Andrei Kortunov
57b501ad13
Merge pull request #3067 from akortunov/master
...
Limit pointers cache size to avoid possible bad_alloc errors
2021-04-17 10:31:47 +04:00
psi29a
c83b6ff445
Merge branch 'enable_ag_by_default' into 'master'
...
Enable Active Grid by default
See merge request OpenMW/openmw!753
2021-04-16 22:08:23 +00:00
unelsson
06fda4c5a1
QLineEdit for setting base animation files
2021-04-16 23:12:14 +03:00
unelsson
95272e0f14
String setting to CSMPrefs, part of dehardcoding animation files
2021-04-16 23:12:14 +03:00
psi29a
4e3f338826
Now that the lighting issue has been fixed, we can now enable active grid by default (which is guarded by distant land).
2021-04-16 19:59:40 +00:00
psi29a
d3c865d909
Merge branch 'fix_bsa' into 'master'
...
Add some validation for bsa parsing
Closes #5955
See merge request OpenMW/openmw!750
2021-04-16 19:53:02 +00:00
psi29a
d0883f9a0d
Merge branch 'light_settings_tweak' into 'master'
...
Lighting patch
Closes #5957 and #5959
See merge request OpenMW/openmw!752
2021-04-16 19:47:26 +00:00
psi29a
50adeef1ab
Merge branch 'coverity_schedule' into 'master'
...
Fix once and for all™ coverity's schedule
See merge request OpenMW/openmw!748
2021-04-16 19:41:22 +00:00
glassmancody.info
16856d45c5
Lighting Patch
...
Fixes build errors with older OSG builds and some issues with 'shared' layout.
Bring back ambient in inventory through lightmodel instead of sun ambient, mirrors scene ambient/sunlight relationship.
Forces shaders when certain lighting methods are enabled and finalize settings.
Correctly override sun for localmap.
2021-04-16 11:55:40 -07:00
Evil Eye
80266d435c
Merge branch 'fix_crash' into 'master'
...
Fix an off-by-one in loadscpt
See merge request OpenMW/openmw!728
2021-04-16 18:02:47 +00:00
jvoisin
47ced7dec4
Add some validation for bsa parsing
...
This should fix #5955
2021-04-16 18:33:12 +02:00
psi29a
0b8cae4af8
Merge branch 'objects_can_move_too' into 'master'
...
Another fallout from MR 722: restore objects handling
See merge request OpenMW/openmw!749
2021-04-16 14:38:48 +00:00