699bd257ef
Merge branch 'camera_stats' into 'master'
...
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to a valid file.
See merge request OpenMW/openmw!526
4 years ago
7cd7fa2f08
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
...
a valid file.
4 years ago
64475ebedb
Remove a brainfart from precise projectile handling: all non-actor
...
non-projectile objects were treated as ground.
4 years ago
8737453498
cmake: Compiler-specific whole-archive macro
4 years ago
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
4 years ago
f40e227686
Remove redundant formatting changes
4 years ago
b975f16e6b
Remove redundant check - groundcover is not present in the CellStore
4 years ago
d12a0fdcb3
Mark only instances from groundcover files as groundcover objects
4 years ago
8874e88ff1
Drop fading setting
4 years ago
1a6c06f7b5
Do not allow to set distance to non-positive values
4 years ago
859cd0fd0c
Do not use display lists for instanced meshes
4 years ago
a09f03c850
Drop groundcover materials - they are not used
4 years ago
14cf0ce1dc
Implement instanced groundcover
4 years ago
663e0a1055
Fix a race condition in loading screen.
4 years ago
bc2cec86e9
Fix bug: NPCs doesn't move if the target is exactly above or exactly below.
4 years ago
cadd1e7529
Merge branch 'daedric_fog' into 'master'
...
Don't nuke fog when bounds have changed
Closes #5469
See merge request OpenMW/openmw!522
4 years ago
a8c5607aa6
Merge branch 'disableinfotablesorting' into 'master'
...
[OpenMW-CS] Info table dragging to move record order, disable sorting
See merge request OpenMW/openmw!538
4 years ago
64b4472efa
Merge branch 'stand' into 'master'
...
Don't adjust actor position until all objects are loader (#5379 )
See merge request OpenMW/openmw!546
4 years ago
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
4 years ago
3bb551a6f1
Show level multipliers in levelup tooltip
4 years ago
59af819f97
Merge branch 'fix-mem-leak-2' into 'master'
...
Fix memory leak in MWInput
See merge request OpenMW/openmw!566
4 years ago
fe815d3d8d
Fix memory leak in MWInput
...
mListener wasn't being cleaned up
4 years ago
a2171875a0
Prevent nullptr access
4 years ago
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.
4 years ago
165c731492
Remove physics dependency on basenode
...
Necessary to be able to load physics objects from inactive cells.
4 years ago
b28adafee4
Merge branch 'navcrash' into 'master'
...
Fix #5798
Closes #5798
See merge request OpenMW/openmw!554
4 years ago
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.
4 years ago
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
4 years ago
d2c5de5211
Merge branch 'projectile_physics' into 'master'
...
Precise projectile physics (closes #4201 )
Closes #4201
See merge request OpenMW/openmw!550
4 years ago
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.
4 years ago
cc24f13b39
Remove duplicated sound_buffer entry
4 years ago
b6e92c9c6d
Use ShaderVisitor to skip translucent framebuffer specific stuff
4 years ago
8af8ad3840
Always write opaque fragments instead of relying on blending being off for translucent RTT
4 years ago
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
4 years ago
9f0f3eaeb2
Add collada to supported formats
4 years ago
54ea8eb5c7
Fix string corruption with Qt on linux-systems
4 years ago
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.
4 years ago
9eba086c34
Merge branch 'sound_buffer_pool_2' into 'master'
...
Separate sound buffer pool from sound manager
See merge request OpenMW/openmw!520
4 years ago
e68651e9a6
Merge pull request #3042 from akortunov/helpers
...
Refactoring pre-requisites for groundcover
4 years ago
f2fc02cdff
Support filtered tables (mapToSource for indexes)
4 years ago
16e03c151a
Implement basic move algorithm, connect it to drag&drop
4 years ago
0418e8e7a6
Add an API to get base wind speed (which is from openmw.cfg)
4 years ago
f175beb304
Define template ref classes in components
4 years ago
fd602e2c31
Merge branch 'viewdist' into 'master'
...
Downgrade FOV-dependent view distance factor to a recommendation
See merge request OpenMW/openmw!531
4 years ago
d944f703e8
Merge branch 'master' of gitlab.com:OpenMW/openmw
4 years ago
73740013a3
mResourceSystem initialization reorder
4 years ago
abdc4cde95
Merge branch 'float' into 'master'
...
Allow all creatures to float to the water surface (#5790 , #5758 )
Closes #5758 and #5790
See merge request OpenMW/openmw!534
4 years ago
4638fc36b4
Allow all creatures to float to the water surface
4 years ago
3903142152
Update apps/openmw/mwbase/environment.cpp
4 years ago
654238fd18
Merge branch 'no_bonus_points' into 'master'
...
Show mesh origin
Closes #5771
See merge request OpenMW/openmw!507
4 years ago
29fdcb3fa1
Merge branch 'hardlanding' into 'master'
...
Init mJumpState based on saved fallheight (#5739 )
See merge request OpenMW/openmw!532
4 years ago
70087e16fe
Disable dialogue info table sorting
4 years ago
3087ce9c70
Use saved fallheight to determine a character's jump state.
...
The jump state initial state is "none", and it is set after physics simulation.
If a save is done just above the ground, the character may land before
the first run of the simulation, effectively cancelling the effect of
falling.
4 years ago
acfd2cfd90
Merge branch 'dialogclonefix' into 'master'
...
[OpenMW-CS] Fix cloning in info records
See merge request OpenMW/openmw!524
4 years ago
93b1b444f2
Optimize CreateCommand and CloneCommand configuration
4 years ago
7be7af13d7
Downgrade FOV-dependent view distance factor to a recommendation
4 years ago
6863c5a68f
Merge branch 'raii' into 'master'
...
Make all physics object manage their own resources.
See merge request OpenMW/openmw!527
4 years ago
7196ad7455
Implement an override-value when cloning, use when cloning info records
4 years ago
1ab4683dce
Tweak follow distance to be more like the original
4 years ago
d015f17a6c
Make all physics object manage their own resources
...
Use smart pointer for heightfields and their members.
Move collision object addition inside of Object's ctor, as for Actors and HeightFields
4 years ago
8b7f3fe908
Merge branch 'nodeadlock' into 'master'
...
Avoid a rare but possible deadlock around mCollisionWorldMutex.
See merge request OpenMW/openmw!525
4 years ago
b3f3b29bbe
Merge pull request #3039 from akortunov/screenshotmanager
...
Move screenshots handling to the separate class
4 years ago
a735bbe9a5
Merge pull request #3040 from akortunov/pvs
...
Fix some issues, found by PVS Studio
4 years ago
e737bd00fa
Merge branch 'unused_param' into 'master'
...
Remove never used parameter from CharacterController::update()
See merge request OpenMW/openmw!523
4 years ago
c3a952c133
Merge branch 'dorsbien' into 'master'
...
Don't update magic effects when unequipping items to equip something else
Closes #5687
See merge request OpenMW/openmw!509
4 years ago
a257567b80
Don't update magic effects when unequipping items to equip something else
4 years ago
3045d20a97
Make sure that vector isn't empty, just in case
4 years ago
5f1d3e0e2f
Use the Topic ID of the cloned target from topicinfos
4 years ago
f7d7186c39
Merge branch 'instanceselectiontools' into 'master'
...
[OpenMW-CS] Cube and sphere instance selection
See merge request OpenMW/openmw!485
4 years ago
313e895912
[OpenMW-CS] Cube and sphere instance selection
4 years ago
60f66f5e29
Remove never used parameter from CharacterController:update()
4 years ago
9bc687e209
Avoid a rare but possible deadlock around mCollisionWorldMutex.
...
What happened is that the last handle to an Actor shared_ptr was a
promoted weak_ptr. When the shared_ptr goes out of scope, the Actor dtor
is invoked. That involves removing the Actor collision object after
exclusively locking mCollisionWorldMutex. In this case, the lock was
already held in the outter scope of the promoted weak_ptr.
Reduce the scope of the mCollisionWorldMutex to never encompass the
lifetime of a promoted weak_ptr.
4 years ago
ad101de733
Merge declaration and initialization
4 years ago
564a0d7d55
Don't nuke fog when bounds have changed
4 years ago
1930f8f37d
Fix copy-paste error
4 years ago
50e4600b16
Reduce code duplication
4 years ago
874348fb46
Remove redundant code
4 years ago
a2d8a0b61a
engine.cpp typos
4 years ago
80ee1b55ea
Protect assignment operator from this == &src case
4 years ago
33da0af1d1
Use explicit calls for virtual methods in constructors
4 years ago
a6aba83741
Remove redundant SoundManager::lookupSound and loadSound
4 years ago
e4cce88142
Replace std::tie by structured binding
4 years ago
90c8e77e2c
Remove redundant default Sound_Buffer fields initialization
4 years ago
24f8a2db27
Use perfect forwarding in Sound_Buffer ctor
4 years ago
a80ee7a76a
Avoid possible memory leak in the mInterMessageBoxe field
4 years ago
8e5f26c109
Code cleanup
4 years ago
c9b885ffd4
Avoid possible null dereferencing
4 years ago
33648313a6
Initialize variables
4 years ago
c1512b8b6c
Convert loop to condition
4 years ago
56666c60d4
Remove dead code
4 years ago
8283ec6cad
Do not use & for boolean arguments
4 years ago
7fc4c9f3f6
Avoid dead code
4 years ago
801e2d6ad0
Avoid to use uninitialized variables
4 years ago
c5a36ad440
Do not cast enums to booleans
4 years ago
799bd3379c
Move screenshots handling to the separate class
4 years ago
944033db4e
Separate sound buffer pool from sound manager
4 years ago
2d61db555b
Merge branch 'osg_log' into 'master'
...
Split long osg log messages into lines.
See merge request OpenMW/openmw!519
4 years ago
7d551b0cfd
Split long osg log messages into lines.
4 years ago
cbce3ebb79
Merge branch 'stanky_fetcher' into 'master'
...
Consider a path completed if it was non-empty
Closes #5773
See merge request OpenMW/openmw!508
4 years ago
2a583e2337
consider empty paths as not constructed
4 years ago
4ed3252001
Check for EXT_gpu_shader4 CPU-side
...
Mesa lies and always defines GL_EXT_gpu_shader4 even when the extension
isn't present.
4 years ago
dc82cb61f4
Merge branch 'nativeshapesdebug' into 'master'
...
Unbreak physics debugger with projectiles' spherical shapes.
See merge request OpenMW/openmw!489
4 years ago
c17e498465
Merge branch 'launchercleanup' into 'master'
...
Remove deadcode from the launcher.
See merge request OpenMW/openmw!511
4 years ago
f2eed5594a
Don't use A2C when MSAA is off
4 years ago
c75d7ceada
Ensure alpha test is off by default
4 years ago
5215ffd964
The debug drawer rely on Bullet to determines the vertices of collision
...
shapes. It doesn't work in the case of spheres (used by projectiles):
resulting shape is malformed. It can also leads to this error which
makes the debug drawer non-working till game restart:
CullVisitor::apply(Geode&) detected NaN,
depth=nan, center=(nan nan nan),
matrix={
-0.265814 -0.0639702 0.9619 0
0.964024 -0.0176387 0.265228 0
-4.29769e-09 0.997796 0.0663574 0
18178.6 -3550.91 42154.4 1
}
Avoid this issue by using osg::Sphere
While here, remove an unused function. We don't use Bullet's solver so
we never have any contact points (in Bullet parlance).
4 years ago
dbdd397716
Remove deadcode.
4 years ago
57c92673bc
Consider a path completed if it was non-empty
4 years ago
3bf641d3ce
Show mesh origin
4 years ago
396667f801
Fix weather particle fading
...
Update rain particle system setup
4 years ago
e46472442a
Switch torches to shields for hostile NPCs
4 years ago
54853380cd
Enable multisampling in RTTs to support A2C
4 years ago
e80d34268c
Fix defines names
4 years ago
a7cbe0b497
Merge pull request #3036 from akortunov/tooltip
...
Enhance level-up tooltip
4 years ago
66fee6dccb
Enhance level-up tooltip
4 years ago
6a12c2b58b
Fix GCC build warnings
4 years ago
45f4e69a19
Merge branch 'skipanim' into 'master'
...
Don't move characters if their animation can't move them
Closes #5593
See merge request OpenMW/openmw!490
4 years ago
18ef32ca82
values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset
4 years ago
ddbfa5410d
Merge branch 'fixboats' into 'master'
...
Apply waterwalking even when bypassing physics simulation
See merge request OpenMW/openmw!500
4 years ago
ebb564ad22
call moveObject() after applying waterwalking
...
This unbreak abot's boat mods: they're continually teleporting
the boats (who is an actor with waterwalking effect). As such, the
physics simulation was never run and the boat never went to sea level.
4 years ago
7d8727b98e
Merge branch 'books' into 'master'
...
Only ignore plain text after the last EOL tag (#5627 )
Closes #5627
See merge request OpenMW/openmw!492
4 years ago
5e004356a2
Merge remote-tracking branch 'upstream/master' into alpha-meddling
4 years ago
a094269c46
Merge branch 'guardsguards' into 'master'
...
Don't consider a path completed unless we're close
Closes #5736
See merge request OpenMW/openmw!498
4 years ago
3afa4e5869
Merge branch 'feels_good_guar' into 'master'
...
Make followers keep a distance dependant on the fattest party member
Closes #5423
See merge request OpenMW/openmw!499
4 years ago
8f4b856b44
Initial A2C implementation
4 years ago
7cac7fa870
Make followers keep a distance dependant on the fattest party member
4 years ago
ad41546648
Merge branch 'fix_swimming' into 'master'
...
Fix #5743 where NPCs and creatures underwater may rotate to the upwards direction
Closes #5743
See merge request OpenMW/openmw!494
4 years ago
d2a28d915a
Don't consider a path completed unless we're close
4 years ago
1f1755ae48
Add version checks
4 years ago
bdcbb412a5
Don't restore focus to hidden/unrelated buttons
4 years ago
8b3088a9e5
Fix #5743
4 years ago
51d63a4152
Fix minor bug: mSmoothedSpeed is not updating in first person mode, that leads to an incorrect value after switching to first person mode and back.
...
Additional refactoring: move `setSideMovementAngle` from camera.cpp to character.cpp as this logic shouldn't belong to Camera.
4 years ago
fd77ef6b01
Only ignore plain text after the last EOL tag ( #5627 )
4 years ago
32cc14981e
Don't move characters if their animation can't move them
4 years ago
4f1361b5ea
Merge branch 'paralyze' into 'master'
...
Fix paralyze for swimming and levitating actors
Closes #5758
See merge request OpenMW/openmw!488
4 years ago
22476281da
Fix paralyze for swimming actors
4 years ago
218597b13d
Fix paralyze for levitating actors
4 years ago
f5af09aed9
Fix AI sequence looping code (bug #5706 )
4 years ago
3e87c35005
Merge branch 'dialogue' into 'master'
...
Don't regenerate the topics list unconditionally
See merge request OpenMW/openmw!459
4 years ago
e9a8636d18
Merge branch 'restore_absolute_position_handling' into 'master'
...
Restore pre-async handling of absolute actors positionning
See merge request OpenMW/openmw!486
4 years ago
ce36dd8a52
Merge branch 'misc_cleanup' into 'master'
...
Small cleanup
See merge request OpenMW/openmw!482
4 years ago
5bd921fa3a
Restore pre-async handling of absolute actors positionning
...
One of the issue since the introduction of async physics is the quirky
handling of scripted moves. Previous attempt to account for them was
based on detecting changes in actor position while the physics thread is
running. To this end, semantics of Actor::updatePosition() (which is
responsible for set the absolute position of an actor in the world) was
toned down to merely store the desired position, with the physics system
actually responsible for moving the actor. For the cases were complete
override of the physics simulation was needed, I introduced
Actor::resetPosition(), which actually have same semantics as
original updatePosition(). This in turn introduced a loads of new bugs
when the weakened semantics broke key assumptions inside the engine
(spawning, summoning, teleport, etc).
Instead of tracking them down, count on the newly introduced support for
object relative movements in the engine (World::moveObjectBy) to
register relative movements and restore original handling of absolute positionning.
Changes are relatively small:
- move resetPosition() content into updatePosition()
- call updatePosition() everywhere it was called before
- remove all added calls to the now non-existing resetPosition()
tldr; ditch last month worth of bug introduction and eradication and redo
it properly
4 years ago
33eb09f534
Remove unused headers
4 years ago
6b5e614b1a
Merge branch 'dont_cache_ptr' into 'master'
...
Always use latest actor's Ptr
See merge request OpenMW/openmw!481
4 years ago
e5f0c7f117
Fix a typo introduced in 08e73a09ec
...
It closes #5752
4 years ago
93a12fe388
Avoid dynamic_cast when possible.
4 years ago
8e084dea2e
Don't cache Ptr, it can be updated while the simulation is running.
4 years ago
58297ffbf4
Move stats update into their own function.
4 years ago
24a8b8c66a
Remove redundant call to resetPosition(). adjustPosition() takes care of
...
it,
4 years ago
eec2ba3623
Loading screen initialdrawcallback 4th time's the charm
4 years ago
2ecd00b6db
Don't accidentally enable alpha testing for all shadow casting
4 years ago
4e7c9b6696
Embed physics simulation results inside of actor class.
...
This gives finer control over reseting positions (switch off tcl is no
longer glitchy) and solve most of the erroneous usage of stale World::Ptr
indicated by:
"Error in frame: moveTo: object is not in this cell"
4 years ago
d01d5745c6
Merge branch 'relative_move' into 'master'
...
Relative translation for scripts
See merge request OpenMW/openmw!477
4 years ago
ea8f98b339
Wait for initialDrawCallback to finish before removing it
4 years ago
7bae6691b6
Introduce World::moveObjectBy() function to translate an object relatively to
...
its current position.
Use it in relevant MWScripts opcode (move and moveworld).
Remove the fragile detection of scripted translation from PhysicsTaskScheduler.
No user visible change, just a more robust mechanism.
4 years ago
a080071588
Set default state sensibly
4 years ago
96a87b582c
Merge branch 'loadingScreen_initialdrawcallback' into 'master'
...
Fix for !472 for older versions of OSG
See merge request OpenMW/openmw!474
(cherry picked from commit 35e25d79b9a6c76807084be5ca2584c4fd9b9c35)
4447dd41 osg versions
06f4d63b Preserve callback in older osg version
4 years ago
8db2ba2b38
Merge pull request #3032 from akortunov/gtest
...
Mark mock methods as overrides (requires GTest 1.10)
4 years ago
bc961a13f5
avoid redundant calls to removeInitialDrawCallback
4 years ago
640420eaaa
No longer delete and recreate CopyFramebufferToTextureCallback, remove oneshot functionality. Instead just remove the callback after the traversals. Use addInitialDrawCallback instead of setInitialDrawCallback to avoid messing with existing callbacks.
4 years ago
259d522800
When doing a ray cast to the next projectile position, ignore collisions
...
that occurs with the projectile own collision object. Otherwise a magic
bolt can explode "spontaneously".
4 years ago
884b434ee0
Merge branch 'fixfriendlyfire' into 'master'
...
Fix projectiles friendly fire (#5744 )
See merge request OpenMW/openmw!466
4 years ago
78e85fe011
Merge branch 'this_is_nife' into 'master'
...
More NIF stuff
See merge request OpenMW/openmw!461
4 years ago
bc6bcda58f
Merge branch 'wizard' into 'master'
...
Wizard: fix "file is already opened" warning
See merge request OpenMW/openmw!465
4 years ago
8b2bf12e8f
Use bip01 for root bone name
4 years ago
b39437dfb6
Don't allow projectiles to stand still when they hit an ally.
...
When an NPC fire a projectile, it should affect only its targeted actor.
To this end, after a hit is detected the target is checked against the
list of AI targets and reactivated if necessary.
Problem occurs when the hit occurs as a result of a friendly actor going
into the projectile (detected in ClosestNotMeConvexResultCallback):
while the projectile is inside the friend's collision box, it is
deactivated, just to be immediately reactivated. Effectively, the
projectile does nothing until the actor moves out.
Add a check inside the ClosestNotMeConvexResultCallback before declaring
a hit.
Since the necessary data is not safely accessible from the async thread,
maintain a copy inside the Projectile class.
4 years ago
8fd45d85ec
Unify NiGeometry/NiGeometryData handling
4 years ago
ab789e37e1
Wizard: fix "file is already opened" warning
4 years ago
201999c4a9
Make sure adjustPosition() is safe to call for any actor
4 years ago
817ac4cfbd
Don't regenerate the topics list unconditionally
4 years ago
a314f196eb
Unconditionally call actor->resetPosition in adjustPosition.
...
Revert broken change that would force adjust all actors in cell upon
loading. That break floating corpses (and probably others things).
4 years ago
15291f15d3
Make actor collision box components a struct
4 years ago
11eff02a1d
Merge branch 'Show-more-information-about-level-on-menu' into 'master'
...
Show more information about level on menu
See merge request OpenMW/openmw!437
4 years ago
9a35c5815e
Merge branch 'nofallfloor' into 'master'
...
Update physics object position after spawning.
See merge request OpenMW/openmw!449
4 years ago
789d034432
Merge branch 'skirts' into 'master'
...
Editor: Properly reserve body parts for skirts (bug #5731 )
Closes #5731
See merge request OpenMW/openmw!452
4 years ago
460e5abb55
Update physics object position after spawning.
4 years ago
899b8422fa
explicitely use a reference, auto can't infer it and make a copy
4 years ago
32601e0ae4
Properly reserve body parts for skirts (bug #5731 )
4 years ago
3b9db41346
removing unneeded variable
4 years ago
d77f122289
Merge branch 'gl-5199-improve-scene-colors' into 'master'
...
[OpenMW-CS] Issue #5199 : Improve Scene Colors
See merge request OpenMW/openmw!442
4 years ago
842ea9d6ed
simplifying a bit
...
- attaching gradient camera directly to the main camera
- using Vec4ub
4 years ago
c8fa8cfe74
Merge branch 'herbalmenu' into 'master'
...
Add graphic herbalism to the launcher
Closes #5730
See merge request OpenMW/openmw!448
4 years ago
7156b11dbc
be explicit about narrowing to resolve: error: type 'btScalar *' (aka 'float *') cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
4 years ago
525292b184
Add graphic herbalism to the launcher
4 years ago
686692519c
Merge branch 'fix-tests' into 'master'
...
Use correct variable types when loading config for tests
See merge request OpenMW/openmw!446
4 years ago
15f03ae375
Merge branch 'logging2' into 'master'
...
Print '--version' and '--help' messages without timestamps
Closes #2686
See merge request OpenMW/openmw!444
4 years ago
0e5af74a2f
Merge branch 'masterindexloadfix' into 'master'
...
[OpenMW-CS] Load master index from refId to mContentFile
See merge request OpenMW/openmw!445
4 years ago
fd4a62ce35
Use correct variable types when loading config for tests
4 years ago
49c6e50c31
Print '--version' and '--help' messages without timestamps
4 years ago
61a4a0807b
Load master index in refId to mContentFile, keep master index also in mIndex
4 years ago
afaacedf67
Merge branch 'placeatmecrash' into 'master'
...
Don't crash the game when placing a non-actor
See merge request OpenMW/openmw!443
4 years ago
39ac0cbb4a
Don't crash the game when placing a non-actor
4 years ago
21de3fa7e8
Merge pull request #3033 from akortunov/main_messages
...
Use a logging system instead of cout for a couple of missing messages
4 years ago
fd64aacf7d
Merge branch 'cliherbalism' into 'master'
...
Add a setting to disable graphical herbalism
See merge request OpenMW/openmw!440
4 years ago
4fbe1ed12c
Ignore caster collision shape. Sometimes the magic bolt get launched
...
inside too near its caster.
4 years ago
7e85235220
Projectile to projectile collision
4 years ago
66fe3b0d38
Modify projectile collision to work with async physics
4 years ago
dc7b48e92e
Generate physics collisions for projectiles (bug #3372 )
...
Remove redundant now mHit field
4 years ago
242dd8d496
Use a logging system instead of cout for a couple of missing messages
4 years ago
275b9aea4d
rename setting
4 years ago
e62fff5f2e
Add a setting to disable graphical herbalism
4 years ago
807367ca3f
Mark mock methods as overrides (requires GTest 1.10)
4 years ago
6bfdf0e57f
Add more information on mouse over level
4 years ago
c2933721c6
Merge branch 'explodespell' into 'master'
...
Make AI cast self-targeted spells at the ground (bug #5695 )
Closes #5695
See merge request OpenMW/openmw!426
4 years ago
a3dfdde9ef
Merge branch 'move_actors_into_scene' into 'master'
...
Move actors into the scene after a teleport
See merge request OpenMW/openmw!438
4 years ago
c742c15f6d
Merge branch 'autogoesbrr' into 'master'
...
Use range based for loops and auto
See merge request OpenMW/openmw!400
4 years ago
b22418d053
Merge branch 'fix_spawn' into 'master'
...
Fix spawn #5724
See merge request OpenMW/openmw!439
4 years ago
c6c02a6f16
Remove useless code. ipos is already initialized with the correct
...
values.
4 years ago
08e73a09ec
Make the code more compact by mean of std::min / max and ternary
...
operator.
4 years ago
b79f6ac808
Force reset position of actor after snapping to the ground. Otherwise
...
the interpolation calculation would kick in and make the actor goes upward if the
spawn point is higher than summoner or downward if lower. The actor
would then either jump or fall through terrain.
4 years ago
5734551ff3
Add time to logs. Redirect OSG log to OpenMW log.
4 years ago
7843dad35d
Don't let the actor "nowhere" after a teleport but move them in their
...
place.
This solve the problem where after loading, an empty frame was rendered
because the player is "nowhere".
4 years ago
078de86e60
Use range based for loops and auto
4 years ago
84e1a29700
Make AI cast self-targeted spells at the ground (bug #5695 )
4 years ago
5a4872393a
Rework actor position reset. While solving the issue with invalid
...
position being used under heavy load, I introduced a regression that
prevented the position to be updated in case of teleport.
Move the logic in its own function and decide in PhysicsSystem whether a
reset is needed.
4 years ago
6f0b90e606
documented that currently underwater shadows are mutually exclusive to refraction scale; to be fixed in follow up issue #5709 ; documentation fixes
4 years ago
b0e3bd6ff9
Fix crash caused by QStatusBar
4 years ago
16b34c2863
Merge pull request #3029 from akortunov/replace_zeroes
...
Replace zeroes and nulls by nullptrs
4 years ago
73ca333c4b
Merge branch 'actorpositionagain' into 'master'
...
Make the physics simulation more robust when overloaded
See merge request OpenMW/openmw!429
4 years ago
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
ea2ba27084
Move the moment when the actor origin is saved before simulation so to
...
be sure the simulation is over. Otherwise, if the simulation is too slow
the position is wrong, and the actors would jump back and forth between
old and new position instead of actually moving.
4 years ago
dc1bd8ec29
Merge branch 'osgAnimation_basics' into 'master'
...
Collada animation support
See merge request OpenMW/openmw!421
4 years ago
96e22bd44e
Merge branch 'fastforwardpos' into 'master'
...
Discard physics simulation results after fast forward
See merge request OpenMW/openmw!423
(cherry picked from commit ff2d7695698341ef059c75707aa092cef48deea4)
03a37433 In case of time fast forward (resting, jail), force reset of positions
4 years ago
f8c791fde3
Merge branch 'physics_worker_profile' into 'master'
...
Add the async physics worker to the profiler overlay.
See merge request OpenMW/openmw!422
4 years ago
9aba55a21a
Add the async physics worker to the profiler overlay.
4 years ago
bc6f46465f
Add to changelog, authors. Move variable declaration inside block
4 years ago
2413de38b5
Extend spell/item search to search by magic effect name
4 years ago
6e77ad1f6a
OSG-Collada animation support
4 years ago
f78a5d795c
Separate keyframes logic to provide basis for osgAnimation integration.
4 years ago
c69b407f8c
Merge branch 'close_the_window_before_you_destroy_the_world' into 'master'
...
Don't unload the world before closing containers
Closes #5689
See merge request OpenMW/openmw!419
4 years ago
c126d8801f
Fix #5689
4 years ago
06d1e70aac
Make Bullet DebugDrawer's default state match the physics system
4 years ago
bb5213670c
Use bigger hammer to set Actor's position after teleporting. Otherwise traceDown() would use old collision object transform and gives incorrect results, making the Actor "fall" in the new position.
4 years ago
d64ed6cf53
Get rid of the StandingActorsMap. Just embed the necessary info into
...
Actor class.
4 years ago
5362146d24
Merge branch 'interleaved_movements' into 'master'
...
Unbreak lifts & conveyors in Sotha Sil Expanded
See merge request OpenMW/openmw!410
4 years ago
e5fa457fe7
Properly account for interleaved move of actors.
...
Before this change, if an actor position was changed while the physics
simulation was running, the simulation result would be discarded. It is
fine in case of one off event such as teleport, but in the case of
scripts making use of this functionality to make lifts or conveyor (such
as Sotha Sil Expanded mod) it broke actor movement.
To alleviate this issue, at the end of the simulation, the position of the Actor
in the world is compared to the position it had at the beginning of the
simulation. A difference indicate a force move occured. In this case,
the Actor mPosition and mPreviousPosition are translated by the difference of position.
Since the Actor position will be really set while the next simulation runs, we
save it in the mNextPosition field.
4 years ago
df9667e923
Read NIF bounding volume data correctly
4 years ago
8a6d3d1b4f
Minor fixes
...
Fix extra semicolon
Disable collision avoidance if AI is disabled
4 years ago
1e0df23d14
Merge branch 'shadows-bin' into 'master'
...
Use a custom renderbin to avoid pointless OpenGL state switches
See merge request OpenMW/openmw!402
4 years ago
72f7e6a702
Handle all shadow alpha uniforms in shadowsbin
4 years ago
ed8342ebc9
Merge branch 'niffile' into 'master'
...
Remove NIFFile settings manager dependency
See merge request OpenMW/openmw!398
4 years ago
c857588ee9
Remove NIFFile settings manager dependency
4 years ago
b523574090
Remove shader visitor settings manager dependency
4 years ago
0e971dccf0
Rework cure effects
4 years ago
37cce328ca
Merge branch 'basicmath' into 'master'
...
Compute the rotation normal relative to the door axe, not the world.
See merge request OpenMW/openmw!391
4 years ago
6efa7eea5a
Merge pull request #3025 from akortunov/iterator
...
Do not remove active effects in the active effects loop
4 years ago
c1d56d94c4
Do not remove active effects in loop (bug #3789 )
4 years ago
ecd10a731e
Compute the rotation normal relative to the door axe, not the world.
4 years ago
18e38d8810
Do not block a door when it turns away.
4 years ago
ba3aad31c1
Merge branch 'hitdebug' into 'master'
...
Visualize hits in the debug overlay
See merge request OpenMW/openmw!379
4 years ago
7ee7041399
Merge branch 'stretch' into 'master'
...
Put a stretch menu background checkbox into the launcher (#5672 )
Closes #5672
See merge request OpenMW/openmw!387
4 years ago
f49bf028b9
Put a stretch menu background checkbox into the launcher ( #5672 )
4 years ago
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
4 years ago
4876969153
Use the PhysicsSystem::movementQueue instead of a serie of
...
setPosition(getPosition() + diff) to move actor in scripts.
With background physics, this is very slightly off with the collision
object position.
When the script run long enough (a few dozen frames for instance),
the accumulated error becomes too big. It make actors fall through lifts floors.
4 years ago
7065282127
Save and load container records; fixes #5668
4 years ago
64ba81ecf2
Fix some issues, found by CoverityScan
4 years ago
8f68f08aee
Merge branch 'moonmoon' into 'master'
...
Change moon phase to an enum class
See merge request OpenMW/openmw!381
4 years ago
3bf5247c0b
remove forward declaration
4 years ago
9763995892
Fix regression #5666
4 years ago
74dfc09e2d
Merge branch 'removeitem' into 'master'
...
Fix remove item regression
Closes #5663
See merge request OpenMW/openmw!380
4 years ago
2c4cafa41a
Change moon phase to an enum class
4 years ago
0512a574e8
Fix remove item regression
4 years ago
f6e4c7cb42
Merge branch 'regionsounds' into 'master'
...
Fix region sounds
See merge request OpenMW/openmw!370
4 years ago
e8c0a7bec0
Visualie projectile hits
4 years ago
574ccbf7bd
Visualize hand to hand hits
4 years ago
435b2e37f8
Allow to display collision points in the debug viewer
4 years ago
4032b754e4
set minimal boost version; remove #ifdef boost version checks
4 years ago
eae9eafb8c
Merge branch 'master' of gitlab.com:OpenMW/openmw into regionsounds
4 years ago
eebb320916
Wait for the previous sound to stop
4 years ago
f6bead88a9
purge boost/optional.hpp headers
4 years ago
62b0781f7d
use std::optional instead of boost::optional
4 years ago
957a1425d1
Merge branch 'cleanup_1' into 'master'
...
Cleanup 1
See merge request OpenMW/openmw!365
4 years ago
1ce296aa7f
Use fallback values for region sounds and fix probability
4 years ago
259f7fcf12
Merge pull request #3020 from unelsson/strippluginindex_cs
...
Strip the plugin index when looking for deleted refs.
4 years ago
b1ea9f6a5b
Strip the plugin index from refid completely
4 years ago
6534bc9b74
Merge branch 'config-fixes' into 'master'
...
Config fixes
See merge request OpenMW/openmw!367
4 years ago
538314b03a
Make path settings have path type
4 years ago
129bd51672
Add compressed BSA support to bsatool
4 years ago
8b28b6e55e
Compose BSA, context and script blacklist lists
...
These would only take their value from the highest priority source, so
specifying `openmw --content anExtraEsp.esp` would override all the
content files in the user cfg file, and the user cfg file would override
any in the global/local one.
4 years ago
cf81f1bbb7
Make composing variables compose in the expected order
4 years ago
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
4 years ago
651a5a27f6
Fix inconsistent indentation
...
This has been irritating me for years.
4 years ago
43614e2204
Merge pull request #3021 from akortunov/warnfix
...
Do not use deprecated Qt functions
4 years ago
fa1765816f
Merge branch 'somecpp17' into 'master'
...
C++17 cosmetics
See merge request OpenMW/openmw!357
4 years ago
46a1950b0e
Do not use deprecated Qt functions
4 years ago
a19db73eca
Fix bad rebase
4 years ago
1357bba0a0
Use some C++17 where it makes the code more readable
...
Also replace boost::optional
4 years ago
4fc5b6f6f4
Sort headers
4 years ago
212b293803
Use same parameter name in definition and declaration
4 years ago
f1b7cd5404
Don't reset temporarily hidden container window
4 years ago
4ae504970f
Merge branch 'blocking' into 'master'
...
Fix lower body blocking animation priority (bug #5656 )
Closes #5656
See merge request OpenMW/openmw!359
4 years ago
7f59751946
Merge branch 'standing' into 'master'
...
Fix standing actors logic
See merge request OpenMW/openmw!360
4 years ago
2916a9462e
Fix standing actors logic:
...
it is updated in the solver only if the actor is standing on
"something". The ground is not "something", so in case the actor goes
from standing on an object to the standing on the ground, this change was not taken
into account.
Clear the value before the simulation to solve this problem.
4 years ago
2972033a72
Merge branch 'thelevelling' into 'master'
...
Allow adding levelled lists using AddItem
Closes #2404
See merge request OpenMW/openmw!358
4 years ago
7da8479d25
Fix lower body blocking animation priority (bug #5656 )
4 years ago
bdcd2bc802
Allow adding levelled lists with AddItem
4 years ago
7d16b6f26c
Merge pull request #2992 from akortunov/service_refusal
...
Add support for service-specific refusals
4 years ago
82431b752d
removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd
4 years ago
f62905eb0a
remove redundant argument
4 years ago
09373a757d
Merge branch 'radioactive' into 'master'
...
Container base record mutations
See merge request OpenMW/openmw!353
(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)
275908a0 mutate container base records
16fca11d add changelog entry
4 years ago
6c591c190b
Add support for service-specific refusals (feature #5580 )
4 years ago
a036183248
Use a much simpler and assert-free check for Bullet multithreading support
4 years ago
fb4250a2b7
Strip the plugin index when looking for deleted refs.
4 years ago
065ed5138e
Use emplace_back instead of push_back
4 years ago
4adc689c7a
Merge branch 'summoncrash' into 'master'
...
Avoid summon spawn if actor isn't in a cell (bug #5644 )
See merge request OpenMW/openmw!351
4 years ago
f90e403bc1
Avoid summon spawn if actor isn't in a cell (bug #5644 )
4 years ago
f513ee1f1d
Merge branch 'configurable_turning_delay' into 'master'
...
Makes the delay of turning while run configurable (part of "smooth movement")
See merge request OpenMW/openmw!349
4 years ago
9d350ec824
Merge branch 'head_bobbing' into 'master'
...
Add head bobbing in first person mode
Closes #5043
See merge request OpenMW/openmw!320
4 years ago
9ec6fce446
Makes the delay of turning while run configurable (part of "smooth movement").
4 years ago
c72199155c
Use full speed in the "NPCs give way" maneuver.
4 years ago
8050882baf
Merge pull request #3015 from akortunov/overrides
...
Mark overrided methods as overrides
4 years ago
df178ed97c
Merge branch 'container-regressions' into 'master'
...
Fix container regressions
See merge request OpenMW/openmw!346
(cherry picked from commit b0aee6f83d4cddb0116284b197913f9687dd9cee)
95e7a22d fix container regressions
4 years ago
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
978af12c2d
Restore fall damage
4 years ago
c16fa27407
Merge branch 'async-physics' into 'master'
...
Async physics
See merge request OpenMW/openmw!248
4 years ago
ae3306c019
Document async physics settings
...
Add an option to the launcher
Update changelog
4 years ago
3c2504b442
Process movement queue in one or several background threads
...
Before movement calculation, the main thread prepare a
vector of ActorFrameData, which contains all data necessary to perform
the simulation, and feed it to the solver. At the same time it fetches
the result from the previous background simulation, which in turn is
used by the game mechanics.
Other functions of the physics system (weapon hit for instance)
interrupt the background simulation, with some exceptions described
below.
The number of threads is controlled by the numeric setting
[Physics]
async num threads
In case 'async num threads' > 1 and Bullet doesn't support multiple threads,
1 async thread will be used. 0 means synchronous solver.
Additional settings (will be silently switched off if async num threads = 0)
[Physics]
defer aabb update
Update AABBs of actors and objects in the background thread(s). It is not an especially
costly operation, but it needs exclusive access to the collision world, which blocks
other operations. Since AABB needs to be updated for collision detection, one can queue
them to defer update before start of the movement solver. Extensive tests on as much
as one installation (mine) show no drawback having that switched on.
[Physics]
lineofsight keep inactive cache
Control for how long (how many frames) the line of sight (LOS) request will be kept updated.
When a request for LOS is made for the first time, the background threads are stopped to
service it. From now on, the LOS will be refreshed preemptively as part of the background
routine until it is not required for lineofsight keep inactive cache frames. This mean
that subsequent request will not interrupt the background computation.
4 years ago
91b3926a49
We need to update the collision world after each step.
...
Change order of traversal simulation step to make it rare enough to be parallelizable
Before:
for actor in actors:
repeat numstep:
solve(actor)
After:
repeat numstep:
for actor in actors:
solve(actor)
Introduce struct ActorFrameData to pack all data that is necessary for
the solver
4 years ago
d76cc5d0a9
Make the Object class manage its collision object and position.
4 years ago
4ef36973fb
Make the Actor class manage its collision object and position.
4 years ago
82da2045a9
Non functionnal changes in preparation for async physics feature
4 years ago
425fa837d1
Merge pull request #3012 from akortunov/container_crash
...
Fix crash on saving
4 years ago
c3d84b2c7c
Ability to attach arrows to shooter's hands (feature #5642 )
4 years ago
8e647aa72a
Fix crash on saving
4 years ago
72549651e0
Rework container resolution ( #3006 )
...
* Rework container resolution
* add optional argument to getCount
* remove now-redundant changes
* undo worldimp changes
* move save-fixing code to InventoryState
* replace Rng instances with Seeds
4 years ago
c99be77a32
Merge pull request #3008 from akortunov/strings
...
Rework fixed strings handling
4 years ago
15078f5b3c
Fix #5630 "NPCs momentarily turn when the player character is moving backwards during combat"
4 years ago
1842f546c3
Restore empty target check in spell absorption
4 years ago
e930251d92
Merge branch 'godmode' into 'master'
...
Add many more godmode checks to harmful magic (bug #5633 )
Closes #4264
See merge request OpenMW/openmw!336
4 years ago
0e8c5c5034
Merge branch 'avoid_collision_update' into 'master'
...
Update logic of "NPCs avoid collisions"
See merge request OpenMW/openmw!318
4 years ago
b85875a354
Ignore Burden effect in god mode
4 years ago
39678c74bf
Add many more godmode checks to harmful magic (bug #5633 )
4 years ago
0dcb8c6b69
Fix pick/probe uses decrement
4 years ago
ec825b2510
Fix RayCastingResult warning
4 years ago
be27b51279
Add head bobbing in first person mode
4 years ago
bca698d951
Merge branch 'shader_line_numbering' into 'master'
...
Correctly resetting line numbering during shader processing.
See merge request OpenMW/openmw!317
4 years ago
c9e3db40a1
Merge branch 'multi-config-build' into 'master'
...
Add support for multi configurations generators on unix
See merge request OpenMW/openmw!198
4 years ago
822764d0fa
Rework fixed strings handling
4 years ago
29ccb09da5
Introduce some extended NIF definitions
4 years ago
2835ea1e21
Update logic of "NPCs avoid collisions"
4 years ago
14aacb81c5
Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation.
4 years ago
d5450a7d88
Correctly resetting line numbering during shader processing.
4 years ago
3040b3b2b6
Merge branch 'issue-5588' into 'master'
...
Prevent empty right page of journal having invisible topics (Fixes #5588 )
Closes #5588
See merge request OpenMW/openmw!310
4 years ago
845049a166
Prevent empty right page of journal having invisible topics ( Fixes #5588 )
4 years ago
9e78f3d936
Skip raycasting for zero-length rays
...
Rays with no length can't intersect anything. This also prevents an
assertion triggering with Bullet built in Debug mode.
4 years ago
aa4e6c448b
Merge branch 'spellabsorption' into 'master'
...
Support enchantment absorption
See merge request OpenMW/openmw!307
4 years ago
d9dafbe45b
Merge branch 'master' into 'uses'
...
# Conflicts:
# CHANGELOG.md
4 years ago
0438d9d5bb
Merge branch 'enchanting' into 'master'
...
Reset enchant effects displayed range when they are constant (bug #5603 )
See merge request OpenMW/openmw!309
4 years ago
ad1021721f
Merge branch 'master' into 'rotation'
...
# Conflicts:
# CHANGELOG.md
4 years ago
f2af957647
Reset enchant effects displayed range when they are constant (bug #5603 )
4 years ago
psi29a
Frederic Chardon
Gleb Mazovetskiy
Andrei Kortunov
madsbuvi
Petr Mikheev
Cédric Mocquillon
Evil Eye
elsid
AnyOldName3
Alexei Dobrohotov
Nelsson Huotari
Alexei Dobrohotov
Mads Buvik Sandvei
AnyOldName3
wareya
Coleman Smith
Chris Djali
CedricMocquillon
jefetienne
Charles Calhoun
Kyle Shrader