Commit Graph

24615 Commits (823e7bea382ef028643b114dfb85d49a147b2e6e)
 

Author SHA1 Message Date
psi29a 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
AnyOldName3 15f03ae375 Merge branch 'logging2' into 'master'
Print '--version' and '--help' messages without timestamps

Closes #2686

See merge request OpenMW/openmw!444
4 years ago
psi29a 0e5af74a2f Merge branch 'masterindexloadfix' into 'master'
[OpenMW-CS] Load master index from refId to mContentFile

See merge request OpenMW/openmw!445
4 years ago
AnyOldName3 fd4a62ce35 Use correct variable types when loading config for tests 4 years ago
Petr Mikheev 49c6e50c31 Print '--version' and '--help' messages without timestamps 4 years ago
Nelsson Huotari 61a4a0807b Load master index in refId to mContentFile, keep master index also in mIndex 4 years ago
psi29a 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
Evil Eye 39ac0cbb4a Don't crash the game when placing a non-actor 4 years ago
Chris Djali 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
psi29a fd64aacf7d Merge branch 'cliherbalism' into 'master'
Add a setting to disable graphical herbalism

See merge request OpenMW/openmw!440
4 years ago
psi29a 8d8a4a890c Merge branch 'projectiles_collisions_mk2' into 'master'
Projectiles collisions

See merge request OpenMW/openmw!369
4 years ago
fredzio 4fbe1ed12c Ignore caster collision shape. Sometimes the magic bolt get launched
inside too near its caster.
4 years ago
fredzio 7e85235220 Projectile to projectile collision 4 years ago
fredzio 66fe3b0d38 Modify projectile collision to work with async physics 4 years ago
Andrei Kortunov dc7b48e92e Generate physics collisions for projectiles (bug #3372)
Remove redundant now mHit field
4 years ago
Andrei Kortunov 242dd8d496 Use a logging system instead of cout for a couple of missing messages 4 years ago
Evil Eye 275b9aea4d rename setting 4 years ago
Evil Eye e62fff5f2e Add a setting to disable graphical herbalism 4 years ago
Andrei Kortunov 807367ca3f Mark mock methods as overrides (requires GTest 1.10) 4 years ago
CedricMocquillon 86c31ded53 Update changelog 4 years ago
CedricMocquillon 2d3d22025a Avoid height for empty message in AutoSizedTextBox 4 years ago
CedricMocquillon 6bfdf0e57f Add more information on mouse over level 4 years ago
psi29a 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
psi29a 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
psi29a c742c15f6d Merge branch 'autogoesbrr' into 'master'
Use range based for loops and auto

See merge request OpenMW/openmw!400
4 years ago
psi29a b22418d053 Merge branch 'fix_spawn' into 'master'
Fix spawn #5724

See merge request OpenMW/openmw!439
4 years ago
fredzio c6c02a6f16 Remove useless code. ipos is already initialized with the correct
values.
4 years ago
fredzio 08e73a09ec Make the code more compact by mean of std::min / max and ternary
operator.
4 years ago
fredzio 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
AnyOldName3 a8ab81cfa3 Merge branch 'logging' into 'master'
Add time to logs. Redirect OSG log to OpenMW log.

See merge request OpenMW/openmw!436
4 years ago
Petr Mikheev 5734551ff3 Add time to logs. Redirect OSG log to OpenMW log. 4 years ago
fredzio 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
Evil Eye 078de86e60 Use range based for loops and auto 4 years ago
psi29a e2213cbdb1 Merge branch 'calibrate_teleportation_beam' into 'master'
Solve regression when teleporting with async (#5705)

See merge request OpenMW/openmw!433
4 years ago
Alexei Dobrohotov 8fb07b72d5 Merge branch 'fix-5699' into 'master'
Guarantee glow updater regenerates shaders on completion

See merge request OpenMW/openmw!435
4 years ago
Alexei Dobrohotov 84e1a29700 Make AI cast self-targeted spells at the ground (bug #5695) 4 years ago
AnyOldName3 48f397f168 Remove existing shader when no longer required 4 years ago
AnyOldName3 5ad297e6ff Guarantee glow updater regenerates shaders on completion
Previously, it would edit the odd numbered stateset, then regenerate
shaders for the even-numbered one, then edit the even numbered one, and
regenerate shaders for the odd numbered one (or vice versa if it
finished during an even numbered frame). This would leave one of the
shader programs still trying to use the state that had been removed.
4 years ago
fredzio 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
psi29a a98847e670 Merge branch 'bzzt_8_shadows_in_refraction' into 'master'
shadows enabled in refraction

See merge request OpenMW/openmw!340
4 years ago
psi29a 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
psi29a ca3cde20cd Merge branch 'aut2020_changelog' into 'master'
Changelog additions

See merge request OpenMW/openmw!432
4 years ago
Nelsson Huotari b416c52978 Changelog additions 4 years ago
psi29a 2c6e8eb195 Merge branch 'particles' into 'master'
Make NIF particle node handling more generic

See merge request OpenMW/openmw!425
4 years ago
psi29a 61e6b543e5 Merge branch 'qstatusbarfix' into 'master'
Fix crash caused by QStatusBar

See merge request OpenMW/openmw!431
4 years ago
Alexei Dobrohotov db9c174ca8 Make NIF particle node handling more generic 4 years ago
Nelsson Huotari b0e3bd6ff9 Fix crash caused by QStatusBar 4 years ago
Bret Curtis 16b34c2863
Merge pull request #3029 from akortunov/replace_zeroes
Replace zeroes and nulls by nullptrs
4 years ago
psi29a 73ca333c4b Merge branch 'actorpositionagain' into 'master'
Make the physics simulation more robust when overloaded

See merge request OpenMW/openmw!429
4 years ago
Andrei Kortunov 8084a336b5 Replace zeroes and nulls by nullptrs 4 years ago