Bret Curtis
40c989d732
allman style
4 years ago
Bret Curtis
9fc0649fb6
a better check to avoid the mCell assertion, so compariing nullptr to current cell will refurn false anyway
4 years ago
Bret Curtis
49545e6d29
add comments as to why we need to check that the player is grounded or not; only run once during initial cell loading
4 years ago
Bret Curtis
fff1df9ee4
revert some blank lines
4 years ago
Bret Curtis
c067782814
proper fix that traces down the player when a cell is loaded; we also only run once if the current cell being loaded is the one that the player is in.
4 years ago
Bret Curtis
1479f98793
hacky solution with debug; seems that player is added before cell so tracing down will not find anything
4 years ago
Bret Curtis
19ad7d7f0c
Resolve #5895 by setting the initial mOnGround state to false; we do this because the movement solver runs one frame behind so when we run through the loop the first time we assume we are on the ground even though we may be 400 units in the air.
4 years ago
psi29a
514a55ed4c
Merge branch 'fix_5846' into 'master'
...
Fix #5846 (headtracking)
Closes #5846
See merge request OpenMW/openmw!652
4 years ago
glassmancody.info
6255b0492b
Resolve crashes on exit with visible MyGUI widgets
4 years ago
Petr Mikheev
447c3b9489
Fix 5846
4 years ago
Evil Eye
4db2f79a3c
Merge branch 'setpos' into 'master'
...
Use relative movement inside of SetPos
See merge request OpenMW/openmw!649
4 years ago
fredzio
cb39f8fb01
Use moveObjectBy in SetPos
4 years ago
fredzio
03b86c232b
Apply the position offset even if the simulation is not performed
...
because we're too fast.
4 years ago
psi29a
311b497491
Merge branch 'bullet-heightfield-floats' into 'master'
...
Avoid heightfield conversion in newer Bullet
See merge request OpenMW/openmw!647
4 years ago
psi29a
cc6f08930b
Merge branch 'alpha-meddling' into 'master'
...
Replace deprecated alpha test in shader visitor
Closes #4899
See merge request OpenMW/openmw!473
4 years ago
AnyOldName3
0431ba4c87
Merge branch 'alpha-meddling-shader-side-mip-meddling' into alpha-meddling
4 years ago
AnyOldName3
f09b0fc1bd
Put groundcover alphafunc where shader visitor can see it
...
I'd already made this change so don't know why it disappeared instead of
being included in b8ee32e3
4 years ago
Gleb Mazovetskiy
351d11449b
Avoid heightfield conversion in newer Bullet
...
Takes advantage of the direct `float` support implemented in
https://github.com/bulletphysics/bullet3/pull/3293
4 years ago
Andrei Kortunov
39b7260ab4
Fix a crash during new game
4 years ago
AnyOldName3
64ddb4c1b0
Fix linking on MacOS
4 years ago
psi29a
9f47190411
Merge branch 'now-it-blends' into 'master'
...
Convert blending factors properly for the character preview
See merge request OpenMW/openmw!644
4 years ago
AnyOldName3
cb2cbb4181
Convert blending factors properly for the character preview
4 years ago
Chris Djali
9bfe941d4b
Merge pull request #3050 from akortunov/master
...
Double-buffer shader water stateset
4 years ago
Andrei Kortunov
38679013fe
Give meaningful name to the mEffectFade
4 years ago
Gleb Mazovetskiy
1db7d2ec4e
Restore compatibility with FFMpeg < 57.80.100
...
This should fix macOS Travis build broken by 58d33aa95b
4 years ago
AnyOldName3
deb184cdce
Merge branch 'fix-build' into 'master'
...
Fix linking with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`
See merge request OpenMW/openmw!640
4 years ago
psi29a
611a63acc6
Merge branch 'threesacharm' into 'master'
...
Attempt to fix restocking items in old saves
Closes #5823
See merge request OpenMW/openmw!580
4 years ago
psi29a
194875dec1
Merge branch 'fix-video-arm' into 'master'
...
osg-ffmpeg-videoplayer: Fix crash on ARM
Closes #5807
See merge request OpenMW/openmw!564
4 years ago
Andrei Kortunov
d805886de7
Double-buffer shader water stateset (bug #5026 )
4 years ago
Gleb Mazovetskiy
58d33aa95b
AV: Fix all memory leaks
...
The most substantial memory leak came from `PacketQueue::get`
not unreferencing its argument packet.
Other leaks came from using `av_free` instead of type-specific free
functions.
Also modifies `PacketQueue::put` for readability.
4 years ago
Chris Djali
213525c372
Merge pull request #3049 from akortunov/master
...
Use correct mCursorActive flag initial value
4 years ago
Alexei Dobrohotov
e9aa161ffc
Merge branch 'reallyskipphysics' into 'master'
...
Close race that breaks scripted teleporting (#5873 )
See merge request OpenMW/openmw!639
4 years ago
Andrei Kortunov
482f04c836
Use correct mCursorActive flag initial value
4 years ago
Gleb Mazovetskiy
455be9dbbb
Fix linking with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`
...
1. CMake's built-in OSG finder does not use pkgconfig, so we have to
manually ensure the order is correct for inter-library dependencies.
https://gitlab.kitware.com/cmake/cmake/-/issues/21701
2. OSG plugin pkgconfig files are missing dependencies on the underlying
libraries (e.g. freetype, png, jpeg), so we have to link them manually.
https://github.com/openscenegraph/OpenSceneGraph/issues/1052
4 years ago
fredzio
31d8ce266b
Close a race between main and physics threads when actor is positioned by scripts.
...
When a position is forced, the actor position in physics subsystem is
overriden. The background physics thread is not made aware of this,
its result are simply discarded.
There is a short window where this doesn't work (in this
example, actor is at A and script moves it to B)
1) actor position is set to B. (among others, Actor::mPosition is set to B)
2) physics thread reset Actor::mPosition with stale value (around A)
3) main thread read simulation result, reset Actor::mSkipSimulation flag => actor is at B
4) physics thread fetch latest Actor::mPosition value, which is around A
5) main thread read simulation result, actor is around A
To avoid this situation, do not perform 2) until after 3) occurs. This
way, at 4) starts the simulation with up-to-date Actor::mPosition
4 years ago
Alexei Dobrohotov
2bfee281fd
Merge branch 'restore_caster' into 'master'
...
Restore projectile caster from savegame (#5860 )
See merge request OpenMW/openmw!616
(cherry picked from commit d595c7adb0fb45eafed6d3d0403ad640a91411ed)
c5426bec In the savegame, projectile caster is identified by its actor id. When
4 years ago
Evil Eye
c9d3da498a
Merge branch 'pursue' into 'master'
...
AIPursue: Pursue the player until LOS is established (#5869 )
Closes #5869
See merge request OpenMW/openmw!634
4 years ago
Evil Eye
8ae4ee291f
Attempt to fix restocking items in old saves
4 years ago
Dobrohotov Alexei
fc329050b3
AIPursue: Pursue the player until LOS is established ( #5869 )
4 years ago
Alexei Dobrohotov
5e91af230d
Reset effect icon transparency when they're hidden ( #5877 )
4 years ago
Gleb Mazovetskiy
4495b67d77
MyGUI HEAD compatibility
...
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614
Refs #5806
4 years ago
Evil Eye
e2fc5d87b3
Merge branch 'elemental_shields' into 'master'
...
Don't let elemental shields harm the player in god mode
Closes #5875
See merge request OpenMW/openmw!631
4 years ago
Alexei Dobrohotov
023bc80f55
Don't let elemental shields harm the player in god mode
4 years ago
psi29a
eb11e1fcdb
Merge branch 'build-accelerator' into 'master'
...
heightfield: Only `buildAccelerator` on Bullet 2.89+
Closes #5874
See merge request OpenMW/openmw!630
4 years ago
Gleb Mazovetskiy
1fb442e701
heightfield: Only `buildAccelerator` on Bullet 2.89+
...
Fixes #5874
4 years ago
elsid
fac5759748
Set bounding min and max height for btHeightfieldTerrainShape
...
They must be set for proper AABB based filtering. Use
+-max(abs(min), abs(max)) to make sure bullet does not shift coordinates by z.
4 years ago
elsid
fdca76ce86
Remove unused includes
4 years ago
psi29a
28be5a259b
Merge branch 'russian_console' into 'master'
...
Don't assume unmapped keycodes outside the extended ASCII range are unprintable
Closes #5871
See merge request OpenMW/openmw!622
4 years ago
psi29a
937549c99e
Merge branch 'fix_still_actors' into 'master'
...
Make actor flee from a combat when cannot reach a target (#5851 )
See merge request OpenMW/openmw!601
4 years ago
psi29a
20e6db917b
Merge branch 'fix-osg-static' into 'master'
...
CMake: Fix support for OSG static lib paths
See merge request OpenMW/openmw!624
4 years ago