mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 11:26:38 +00:00
Code Issues Releases Wiki Activity
24962 commits 115 branches 76 tags 128 MiB
Commit graph

17105 commits

Author SHA1 Message Date
glassmancody.info
6255b0492b Resolve crashes on exit with visible MyGUI widgets 2021-03-13 15:43:46 -08:00
Evil Eye
4db2f79a3c Merge branch 'setpos' into 'master' 
Use relative movement inside of SetPos

See merge request OpenMW/openmw!649
 2021-03-13 12:58:48 +00:00
fredzio
cb39f8fb01 Use moveObjectBy in SetPos 2021-03-13 09:53:21 +01:00
fredzio
03b86c232b Apply the position offset even if the simulation is not performed 
because we're too fast.
 2021-03-13 09:52:05 +01:00
psi29a
311b497491 Merge branch 'bullet-heightfield-floats' into 'master' 
Avoid heightfield conversion in newer Bullet

See merge request OpenMW/openmw!647
 2021-03-13 08:32:01 +00:00
psi29a
cc6f08930b Merge branch 'alpha-meddling' into 'master' 
Replace deprecated alpha test in shader visitor

Closes #4899

See merge request OpenMW/openmw!473
 2021-03-13 08:13:19 +00:00
AnyOldName3
0431ba4c87 Merge branch 'alpha-meddling-shader-side-mip-meddling' into alpha-meddling 2021-03-13 01:23:30 +00:00
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
 2021-03-12 17:21:36 +00:00
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
 2021-03-11 23:52:12 +00:00
Andrei Kortunov
39b7260ab4 Fix a crash during new game 2021-03-11 11:46:44 +04:00
AnyOldName3
64ddb4c1b0 Fix linking on MacOS 2021-03-11 01:01:55 +00:00
psi29a
9f47190411 Merge branch 'now-it-blends' into 'master' 
Convert blending factors properly for the character preview

See merge request OpenMW/openmw!644
 2021-03-10 23:27:04 +00:00
AnyOldName3
cb2cbb4181 Convert blending factors properly for the character preview 2021-03-10 22:07:14 +00:00
Chris Djali
9bfe941d4b
Merge pull request #3050 from akortunov/master 
Double-buffer shader water stateset
 2021-03-10 15:56:40 +00:00
Andrei Kortunov
38679013fe Give meaningful name to the mEffectFade 2021-03-10 19:10:17 +04:00
Gleb Mazovetskiy
1db7d2ec4e Restore compatibility with FFMpeg < 57.80.100 
This should fix macOS Travis build broken by 58d33aa95b
 2021-03-08 19:29:34 +00:00
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
 2021-03-08 19:01:02 +00:00
psi29a
611a63acc6 Merge branch 'threesacharm' into 'master' 
Attempt to fix restocking items in old saves

Closes #5823

See merge request OpenMW/openmw!580
 2021-03-08 10:45:13 +00:00
psi29a
194875dec1 Merge branch 'fix-video-arm' into 'master' 
osg-ffmpeg-videoplayer: Fix crash on ARM

Closes #5807

See merge request OpenMW/openmw!564
 2021-03-08 08:05:25 +00:00
Andrei Kortunov
d805886de7 Double-buffer shader water stateset (bug #5026) 2021-03-08 10:58:51 +04:00
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.
 2021-03-08 03:16:55 +00:00
Chris Djali
213525c372
Merge pull request #3049 from akortunov/master 
Use correct mCursorActive flag initial value
 2021-03-07 15:35:38 +00:00
Alexei Dobrohotov
e9aa161ffc Merge branch 'reallyskipphysics' into 'master' 
Close race that breaks scripted teleporting (#5873)

See merge request OpenMW/openmw!639
 2021-03-07 08:41:20 +00:00
Andrei Kortunov
482f04c836 Use correct mCursorActive flag initial value 2021-03-07 12:08:43 +04:00
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
 2021-03-06 21:17:52 +00:00
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
 2021-03-06 10:41:55 +01:00
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
 2021-03-05 21:07:29 +00:00
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
 2021-03-05 16:45:47 +00:00
Evil Eye
8ae4ee291f Attempt to fix restocking items in old saves 2021-03-04 22:52:03 +01:00
Dobrohotov Alexei
fc329050b3 AIPursue: Pursue the player until LOS is established (#5869) 2021-03-03 22:06:58 +03:00
Alexei Dobrohotov
5e91af230d Reset effect icon transparency when they're hidden (#5877) 2021-03-03 21:17:59 +03:00
Gleb Mazovetskiy
4495b67d77 MyGUI HEAD compatibility 
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614

Refs #5806
 2021-03-02 13:24:30 +00:00
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
 2021-03-02 06:45:38 +00:00
Alexei Dobrohotov
023bc80f55 Don't let elemental shields harm the player in god mode 2021-03-01 21:37:30 +00:00
psi29a
eb11e1fcdb Merge branch 'build-accelerator' into 'master' 
heightfield: Only `buildAccelerator` on Bullet 2.89+

Closes #5874

See merge request OpenMW/openmw!630
 2021-03-01 09:14:04 +00:00
Gleb Mazovetskiy
1fb442e701 heightfield: Only buildAccelerator on Bullet 2.89+ 
Fixes #5874
 2021-03-01 08:27:24 +00:00
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.
 2021-02-28 20:49:22 +01:00
elsid
fdca76ce86
Remove unused includes 2021-02-28 20:44:56 +01:00
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
 2021-02-26 23:28:01 +00:00
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
 2021-02-26 23:25:05 +00:00
psi29a
20e6db917b Merge branch 'fix-osg-static' into 'master' 
CMake: Fix support for OSG static lib paths

See merge request OpenMW/openmw!624
 2021-02-26 23:20:52 +00:00
AnyOldName3
f5a87ee46d Refactor out duplicated RTT setup code 2021-02-26 19:01:27 +00:00
Gleb Mazovetskiy
21a70b7d2b heighfield: buildAccellerator() 
This enables accelleration of heightfield collisions.

Unfortunately, `btHeightfieldTerrainShape::processAllTriangle` does not
yet use the accellerator data, so this change does not improve
performance yet but might do so in future bullet versions.

References:

* Accellerator introduced in:
  https://github.com/bulletphysics/bullet3/pull/2062

* Feature request to use the accellerator in `processAllTriangle`:
  https://github.com/bulletphysics/bullet3/issues/3276
 2021-02-26 14:38:06 +00:00
Gleb Mazovetskiy
13c5b1b0c5 CMake: Fix support for OSG static lib paths 
`$<TARGET_FILE:...>` fails if the argument is already a path (instead of
a library name). This happens when a static library is found via
`osg_find_library`.

If the argument contains `/` or `.`, do not use `$<TARGET_FILE:...>`
 2021-02-26 10:48:09 +00:00
Alexei Dobrohotov
a292a31cb3 Merge branch 'you_and_i_code' into 'master' 
Fix Ctrl U/W behaviour to work with unicode text

See merge request OpenMW/openmw!621
 2021-02-25 23:11:03 +00:00
Evil Eye
6e0f070cd1 Don't assume unmapped keycodes outside the extended ASCII range are unprintable 2021-02-25 21:37:21 +01:00
Evil Eye
a616af822e Fix Ctrl U/W behaviour to work with unicode text 2021-02-25 19:33:11 +01:00
AnyOldName3
4ed67d8597 Improve A2C setting name 2021-02-24 18:01:06 +00:00
AnyOldName3
c7ee5d21dc Make the dummy texture for the character preview even more shadow-friendly 2021-02-23 23:24:40 +00:00
AnyOldName3
2b144ff3dd Merge branch 'fix_frame_rate_limit' into 'master' 
Fix frame rate limit (#5686)

See merge request OpenMW/openmw!603
 2021-02-21 16:20:51 +00:00