mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 09:15:37 +00:00
Code Issues Releases Wiki Activity
28513 commits 109 branches 66 tags 134 MiB
Commit graph

19004 commits

Author SHA1 Message Date
elsid
5ad2ae04ce
Fix build on Windows 
When rearranging the code some features of Windows.h start to interfere
with other code. For example this happens when adding more precompiled
headers.
 2022-07-01 12:58:58 +02:00
elsid
d991b63861
Fix gcc build error: call of overloaded ‘lerp(const float&, const float&, const float&)’ is ambiguous 
/home/elsid/dev/openmw/apps/openmw/mwworld/weather.cpp: In member function ‘void MWWorld::WeatherManager::calculateTransitionResult(float, float)’:
/home/elsid/dev/openmw/apps/openmw/mwworld/weather.cpp:1223:33: error: call of overloaded ‘lerp(const float&, const float&, const float&)’ is ambiguous
 1223 |         mResult.mFogDepth = lerp(current.mFogDepth, other.mFogDepth, factor);
      |                             ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/elsid/dev/OpenSceneGraph/build/gcc/release/install/include/osg/Math:17,
                 from /home/elsid/dev/OpenSceneGraph/build/gcc/release/install/include/osg/Vec2f:17,
                 from /home/elsid/dev/OpenSceneGraph/build/gcc/release/install/include/osg/Vec3f:17,
                 from /home/elsid/dev/openmw/components/esm/defs.hpp:8,
                 from /home/elsid/dev/openmw/components/esm/records.hpp:4,
                 from /home/elsid/dev/openmw/apps/openmw/mwworld/esmstore.hpp:10,
                 from /home/elsid/dev/openmw/build/gcc/fast/apps/openmw/CMakeFiles/openmw.dir/cmake_pch.hxx:5,
                 from <command-line>:
/usr/include/c++/12.1.0/cmath:1919:3: note: candidate: ‘constexpr long double std::lerp(long double, long double, long double)’
 1919 |   lerp(long double __a, long double __b, long double __t) noexcept
      |   ^~~~
/usr/include/c++/12.1.0/cmath:1915:3: note: candidate: ‘constexpr double std::lerp(double, double, double)’
 1915 |   lerp(double __a, double __b, double __t) noexcept
      |   ^~~~
/usr/include/c++/12.1.0/cmath:1911:3: note: candidate: ‘constexpr float std::lerp(float, float, float)’
 1911 |   lerp(float __a, float __b, float __t) noexcept
      |   ^~~~
/home/elsid/dev/openmw/apps/openmw/mwworld/weather.cpp:31:11: note: candidate: ‘float {anonymous}::lerp(float, float, float)’
   31 |     float lerp (float x, float y, float factor)
      |           ^~~~
 2022-07-01 12:58:58 +02:00
psi29a
56187ad977 Merge branch 'soften_me_up_like_one_of_your_french_meshes' into 'master' 
Allow soft particle effect on any NIF

See merge request OpenMW/openmw!2015
 2022-06-30 13:46:22 +00:00
glassmancody.info
b09411d396 allow soft particles on meshes and add extra data extensions 2022-06-29 18:15:12 -07:00
psi29a
451cc6a07c Merge branch 'correct_path' into 'master' 
Use existing functions and objects to call correctMeshPath etc (#6837)

Closes #6837

See merge request OpenMW/openmw!2063
 2022-06-29 10:22:08 +00:00
psi29a
e861491127 Merge branch 'quickfix' into 'master' 
Fix a couple typos

See merge request OpenMW/openmw!2052
 2022-06-29 09:22:15 +00:00
elsid
ce263af393
Use existing functions and objects to call correctMeshPath etc 
Remove WindowManager wrappers.

It's not safe to use WindowManager in all places and it's not required.
Environment stores resource system providing VFS required to call these
functions. In the case of ObjectPaging it's available from the member variable.
Also ObjectPaging::createChunk may access WindowManager when it's already
destructed when exiting the game because it's destructed before CellPreloader
finishes all background jobs. Engine::mResourceSystem is destructed after all
other systems so it's safe to use it.
 2022-06-29 00:58:49 +02:00
AnyOldName3
066575821b Merge branch 'fog_alpha' into 'master' 
Several fixes related to sky blending

See merge request OpenMW/openmw!2046
 2022-06-28 22:17:37 +00:00
psi29a
776cae4c95 Merge branch 'assert' into 'master' 
Use string_view in Layout and remove dead code

See merge request OpenMW/openmw!2060
 2022-06-27 20:02:20 +00:00
Petr Mikheev
d0deb37f5c Fix several issues with sky blending 2022-06-27 21:51:41 +02:00
Evil Eye
81ec7e80bb Use string_view in Layout and remove dead code 2022-06-27 19:13:17 +02:00
jvoisin
3403ea1d9e Merge branch 'FixUBOnDoubleMove' into 'master' 
Avoid double move when an area with same coordinates already exists

See merge request OpenMW/openmw!2059
 2022-06-27 16:28:17 +00:00
psi29a
a814d11a39 Merge branch 'move_left_shift_to_cpp' into 'master' 
Move std::ostream& operator<< to .cpp

See merge request OpenMW/openmw!2058
 2022-06-27 09:24:01 +00:00
elsid
1a5932a669
Move std::ostream& operator<< to .cpp 2022-06-26 22:43:53 +02:00
elsid
ffd1bd30ef
Remove redundant includes from groundcoverstore.hpp 2022-06-26 22:28:10 +02:00
Cédric Mocquillon
cbf48b4382 Avoid double move when an area with same coordinates already exists 2022-06-26 21:45:42 +02:00
elsid
fdf6e58ea3
Split apps/openmw/mwmechanics/actorutil.hpp 2022-06-26 16:42:29 +02:00
glassmancody.info
54e2e74c2a quickfix 2022-06-25 22:41:03 -07:00
elsid
10fbf170a2
Reduce number of includes for boost/program_options 2022-06-25 18:32:10 +02:00
Petr Mikheev
50b143b53f Fast fix in cellbindings.cpp 2022-06-24 23:41:11 +00:00
Petr Mikheev
377c00261a [Lua] Ability to distinguish normal interiors and quasi exteriors (like Mournhold). 2022-06-24 18:24:02 +02:00
psi29a
c3599ada2e Merge branch 'imayhaverunoutofclevernifbranchnames' into 'master' 
Clean up NIF record flags/modes

See merge request OpenMW/openmw!2047
 2022-06-22 21:15:14 +00:00
Evil Eye
b79c42fa77 Exclude followers in combat with their leader 2022-06-22 16:37:03 +02:00
Evil Eye
cc081c3d2d Don't add additional targets to allies that are already in combat 2022-06-22 16:36:58 +02:00
psi29a
ede09309a6 Merge branch 'groundcover_progress' into 'master' 
Show groundcover loading progress

See merge request OpenMW/openmw!1978
 2022-06-22 13:02:22 +00:00
psi29a
e50c1dbcb1 Merge branch 'slaughteredslaughterfish' into 'master' 
Avoid assigning idle animations to non-actors (bug #5371)

Closes #5371

See merge request OpenMW/openmw!2048
 2022-06-22 12:38:15 +00:00
psi29a
e2ae381a6c Merge branch 'lua_worker_join' into 'master' 
Correctly terminate LuaWorker if the game is being terminated due to an unhanded exception.

See merge request OpenMW/openmw!2044
 2022-06-22 12:35:21 +00:00
Alexei Kotov
fbb0004aae Avoid assigning idle animations to non-actors (bug #5371) 2022-06-22 03:53:39 +03:00
Alexei Kotov
e673f9fa76 Clean up NIF flags 2022-06-22 01:58:16 +03:00
Petr Mikheev
8123e41a75 Fix #6824 2022-06-21 21:11:15 +02:00
Petr Mikheev
241b414aa6 Correctly terminate LuaWorker if the game is being terminated due to an unhanded exception. 2022-06-21 20:56:19 +02:00
psi29a
1a478875f0 Merge branch 'navmesh_agent_bounds' into 'master' 
Support different agent collision shape type for pathfinding

See merge request OpenMW/openmw!2030
 2022-06-21 16:13:41 +00:00
psi29a
feef257584 Merge branch 'postprocessor-stereo' into 'master' 
[Postprocessing] Stereo integration

See merge request OpenMW/openmw!1988
 2022-06-21 15:55:06 +00:00
Mads Buvik Sandvei
b0e4c7e76a [Postprocessing] Stereo integration 2022-06-21 15:55:06 +00:00
psi29a
a822044199 Merge branch 'riggeoosgaext' into 'master' 
custom class for osgAnimation::RigGeometry, Collada animated deforming body parts

See merge request OpenMW/openmw!1682
 2022-06-21 15:27:34 +00:00
Nelsson Huotari
334c6dde0b custom class for osgAnimation::RigGeometry, Collada animated deforming body parts 2022-06-21 15:27:34 +00:00
elsid
1a12c453d6
Support different agent collision shape type for pathfinding 
Actors may have different collision shapes. Currently there are axis-aligned
bounding boxes and rotating bounding boxes. With AABB it's required to use
bounding cylinder for navmesh agent to avoid providing paths where actor can't
pass. But for rotating bounding boxes cylinder with diameter equal to the front
face width should be used to not reduce of available paths. For example rats
have rotating bounding box as collision shape because of the difference between
front and side faces width.

* Add agent bounds to navmesh tile db cache key. This is required to distinguish
  tiles for agents with different bounds.
* Increase navmesh version because navmesh tile db cache key and data has changed.
* Move navmesh version to the code to avoid misconfiguration by users.
* Fix all places where wrong half extents were used for pathfinding.
 2022-06-21 12:57:32 +02:00
psi29a
15c7ed774c Merge branch 'shaders_fog' into 'master' 
Better fog

See merge request OpenMW/openmw!2006
 2022-06-21 08:39:48 +00:00
psi29a
d2df89b013 Merge branch 'aitravelendtolerance' into 'master' 
Give AITravel time to end if the actor is close to the destination (#6495)

Closes #6495

See merge request OpenMW/openmw!2036
 2022-06-21 07:31:37 +00:00
Petr Mikheev
3bf18c601c Better fog 2022-06-21 02:21:20 +02:00
Bret Curtis
37a440a0ee add one include back 2022-06-20 16:26:52 +02:00
psi29a
aeed99ca2c Merge branch 'clean_qt_headers' into 'master' 
Clean up Qt includes

See merge request OpenMW/openmw!2027
 2022-06-20 14:05:33 +00:00
Petr Mikheev
e466a812d8 Merge branch 'lua_consume' into 'master' 
Refactor consuming mechanics, improve Lua onConsume handler

See merge request OpenMW/openmw!1848
 2022-06-20 12:12:50 +00:00
Alexei Kotov
bd6716d89d Give AITravel time to end if the actor is close to the destination 2022-06-20 15:07:18 +03:00
Cody Glassman
66aa546e97 [Postprocessing] Small cleanup 2022-06-20 06:58:40 +00:00
Alexei Kotov
e5e6645575 Merge branch 'more_romantic_disable' into 'master' 
Enable collision for postponed objects when any object is disabled

Closes #6648

See merge request OpenMW/openmw!2035
 2022-06-19 21:42:30 +00:00
Evil Eye
aa2fab8db5 Enable collision for postponed objects when any object is disabled 2022-06-19 20:16:31 +02:00
Alexei Kotov
a8e409deef Make launcher viewing distance setup more precise 2022-06-19 20:20:12 +03:00
uramer
36a1e18b6f Increment Lua API revision 2022-06-19 17:31:53 +02:00
uramer
c1f8d7c20a Make comment style consistently inconsistent 2022-06-19 17:31:18 +02:00