mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 21:42:13 +00:00
Code Issues Projects Releases Wiki Activity
24,679 Commits 17 Branches 65 Tags 492 MiB
99ba45a308
Commit Graph

24679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gleb Mazovetskiy
99ba45a308 Optional static builds of OSG, MyGUI, Bullet 2021-01-26 19:00:55 +00:00
psi29a
f917037ead Merge branch 'movement_fix2' into 'master' 
Fix bug: NPCs don't move if the target is exactly above or exactly below.

See merge request OpenMW/openmw!496
 2021-01-26 08:30:15 +00:00
Petr Mikheev
bc2cec86e9 Fix bug: NPCs doesn't move if the target is exactly above or exactly below. 2021-01-26 00:05:28 +01:00
psi29a
cadd1e7529 Merge branch 'daedric_fog' into 'master' 
Don't nuke fog when bounds have changed

Closes #5469

See merge request OpenMW/openmw!522
 2021-01-25 12:58:44 +00:00
psi29a
a8c5607aa6 Merge branch 'disableinfotablesorting' into 'master' 
[OpenMW-CS] Info table dragging to move record order, disable sorting

See merge request OpenMW/openmw!538
 2021-01-25 12:51:13 +00:00
psi29a
64b4472efa Merge branch 'stand' into 'master' 
Don't adjust actor position until all objects are loader (#5379)

See merge request OpenMW/openmw!546
 2021-01-25 12:12:43 +00:00
psi29a
c6f14cde20 Merge branch 'Show-level-multipliers-in-levelup-tooltip' into 'master' 
Show level multipliers in levelup tooltip

Closes #5783

See merge request OpenMW/openmw!518
 2021-01-25 10:01:39 +00:00
Cédric Mocquillon
3bb551a6f1 Show level multipliers in levelup tooltip 2021-01-25 10:01:39 +00:00
Evil Eye
59af819f97 Merge branch 'fix-mem-leak-2' into 'master' 
Fix memory leak in MWInput

See merge request OpenMW/openmw!566
 2021-01-24 16:05:30 +00:00
Gleb Mazovetskiy
fe815d3d8d Fix memory leak in MWInput 
mListener wasn't being cleaned up
 2021-01-24 15:22:36 +00:00
Frederic Chardon
2353a4d8ec Merge branch 'projectile_crash' into 'master' 
Prevent nullptr access

See merge request OpenMW/openmw!565
 2021-01-24 15:09:55 +00:00
Evil Eye
a2171875a0 Prevent nullptr access 2021-01-24 15:15:51 +01:00
fredzio
f219c5992b Add changelog 2021-01-24 14:11:12 +01:00
fredzio
f031a191b8 Some actors are supposed to spawn on a static object that belong to an adjacent cell. 
Since actors can be active in 3x3 grid around the player, we need to
first load all statics in a 5x5 grid around the player.

Split load and unloading in 2 phases. Add an mInactiveCells set into the
scene, which contains all cells inside the aforementioned 5x5 grid.
These cells contains only heightfields and physics objects of static
class.
 2021-01-24 14:11:10 +01:00
fredzio
165c731492 Remove physics dependency on basenode 
Necessary to be able to load physics objects from inactive cells.
 2021-01-24 14:10:27 +01:00
psi29a
49c828c138 Merge branch 'threadsafe-createchunk' into 'master' 
Avoid OSG setting array binding from multiple threads

Closes #4765

See merge request OpenMW/openmw!557
 2021-01-23 22:19:31 +00:00
AnyOldName3
0d2cdd5b7b Merge branch 'fix-mem-leak-2' into 'master' 
Clean-up FontLoader::loadFontFromXml fix

See merge request OpenMW/openmw!561
 2021-01-23 18:44:38 +00:00
Gleb Mazovetskiy
1e113710ef Clean-up FontLoader::loadFontFromXml fix 
Follow-up to !559
 2021-01-23 17:14:56 +00:00
AnyOldName3
3300e26c86 Add changelog entry 2021-01-23 15:25:05 +00:00
psi29a
b28adafee4 Merge branch 'navcrash' into 'master' 
Fix #5798

Closes #5798

See merge request OpenMW/openmw!554
 2021-01-23 13:37:01 +00:00
Andrei Kortunov
cf9ac9c6c9 Merge branch 'fix-mem-leak-1' into 'master' 
Fix memory leak in FontLoader::loadFontFromXml

See merge request OpenMW/openmw!559
 2021-01-23 06:30:59 +00:00
Gleb Mazovetskiy
bd7d5a8f92 Fix memory leak in FontLoader::loadFontFromXml 
Tried building with -DCMAKE_CXX_FLAGS='-fsanitize=address -fsanitize-recover=address'
and this was one of the reported leaks.
 2021-01-23 04:08:39 +00:00
Evil Eye
a401c517bf Always unload height fields 
loadCell always adds a height field, but unloadCell only removed it for
cells with height data. Reloading a cell overwrote the height field
added earlier (leading to its destruction) while the navigator retained
a reference to the now deleted collision shape, leading to a crash.
 2021-01-23 00:56:46 +01:00
AnyOldName3
eb80c997b8 Avoid OSG setting array binding from multiple threads 2021-01-22 19:44:22 +00:00
Andrei Kortunov
7b095e8701 Merge branch 'revert-7455dfb3' into 'master' 
Revert "Merge branch 'windowing-system' into 'master'"

See merge request OpenMW/openmw!555
 2021-01-22 19:07:37 +00:00
Gleb Mazovetskiy
cd5e31dc4b Revert "Merge branch 'windowing-system' into 'master'" 
This reverts merge request !541
 2021-01-22 19:04:07 +00:00
psi29a
0ec953380f Merge branch 'opaque-character-preview-preprocessor' into 'master' 
Always write opaque fragments instead of relying on blending being off for translucent RTT II: Daggerfall

Closes #5391

See merge request OpenMW/openmw!552
 2021-01-22 10:33:16 +00:00
psi29a
d2c5de5211 Merge branch 'projectile_physics' into 'master' 
Precise projectile physics (closes #4201)

Closes #4201

See merge request OpenMW/openmw!550
 2021-01-21 23:33:22 +00:00
fredzio
1f4c85520f Use convexSweepTest for projectile movement to solve any 
imprecision issue with projectile collision detection.
Simplify the mechanics: manage hits in one spot.
Give magic projectiles a collision shape similar in size to their visible
model.

Rename the 2 convex result callback to clearly state their purpose.
 2021-01-21 20:36:33 +01:00
AnyOldName3
3c53aa4bb1 Merge branch 'fix_unity_build' into 'master' 
Fix unity build (#5803)

See merge request OpenMW/openmw!553
 2021-01-21 16:43:15 +00:00
elsid
cc24f13b39
Remove duplicated sound_buffer entry 2021-01-21 13:08:50 +01:00
AnyOldName3
b6e92c9c6d Use ShaderVisitor to skip translucent framebuffer specific stuff 2021-01-20 23:37:19 +00:00
AnyOldName3
35fab97478 Add changelog entry 2021-01-20 01:24:05 +00:00
AnyOldName3
8af8ad3840 Always write opaque fragments instead of relying on blending being off for translucent RTT 2021-01-20 01:17:16 +00:00
Alexei Dobrohotov
6d70a3f308 Merge branch 'jumpy' into 'master' 
Don't run unstuck if there is no simulation running in async case (#5799)

See merge request OpenMW/openmw!548
 2021-01-19 15:04:49 +00:00
psi29a
c727e823e8 Merge branch 'nocolladacorruption' into 'master' 
[OpenMW-CS] Fix corrupted rendering of collada-models

See merge request OpenMW/openmw!549
 2021-01-18 18:36:43 +00:00
Nelsson Huotari
0acae08e52 Add changelog entry 2021-01-18 19:24:38 +02:00
Nelsson Huotari
9f0f3eaeb2 Add collada to supported formats 2021-01-18 19:22:01 +02:00
Nelsson Huotari
54ea8eb5c7 Fix string corruption with Qt on linux-systems 2021-01-18 19:21:02 +02:00
fredzio
e37e5d4d16 Don't run unstuck if there is no simulation running in async case. 
In this case, the actor mPreviousPosition is not updated, so the actor
position is interpolated between an old (stucked) position and the new
(unstucked) position. The new position is most likely "stucked", so the
unstuck code strikes again, making the actor "vibrates".

That's exactly what the sync code path does, and it doesn't exhibit this
behavior.
 2021-01-18 17:45:57 +01:00
psi29a
6265081d08 Merge branch 'works_with_travis' into 'master' 
Update CI/before_install.osx.sh

See merge request OpenMW/openmw!545
 2021-01-17 22:15:29 +00:00
psi29a
4974b64cbf Update CI/before_install.osx.sh 2021-01-17 15:58:43 +00:00
psi29a
9eba086c34 Merge branch 'sound_buffer_pool_2' into 'master' 
Separate sound buffer pool from sound manager

See merge request OpenMW/openmw!520
 2021-01-17 12:11:11 +00:00
AnyOldName3
a8014b4d97 Merge branch 'osg-find-plugins-2' into 'master' 
cmake/FindOSGPlugins: Support lib-prefixed plugins

Closes #5792

See merge request OpenMW/openmw!544
 2021-01-15 17:36:50 +00:00
Gleb Mazovetskiy
11dfb9daff cmake/FindOSGPlugins: Support lib-prefixed plugins 
With a regular OSG build, the plugin names are prefixed with
`lib`, e.g. `libosgdb_jpeg.a` for a static build.

However, on Debian on Ubuntu they are not.

With this commit we now try both options.

Fixes #5972

Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
 2021-01-15 16:52:18 +00:00
psi29a
7455dfb3a1 Merge branch 'windowing-system' into 'master' 
Fix OSG USE_GRAPHICSWINDOW check

See merge request OpenMW/openmw!541
 2021-01-14 15:00:34 +00:00
psi29a
4e39e0b01d Merge branch 'fix-libfind-pkg-detect' into 'master' 
cmake: Fix MyGUI detection

See merge request OpenMW/openmw!535
 2021-01-14 14:56:44 +00:00
psi29a
c6d5634654 Merge branch 'fix-missing-opengl-include-dir' into 'master' 
cmake: Fix missing OPENGL_INCLUDE_DIR

See merge request OpenMW/openmw!542
 2021-01-14 14:10:47 +00:00
Gleb Mazovetskiy
24d8412c0c cmake: Fix missing OPENGL_INCLUDE_DIR 
OPENGL_INCLUDE_DIR wasn't being included.
It is usually just /usr/include but if it was custom the build failed.
 2021-01-14 02:52:59 +00:00
Bret Curtis
e68651e9a6
Merge pull request #3042 from akortunov/helpers 
Refactoring pre-requisites for groundcover
 2021-01-13 23:09:01 +01:00