Petr Mikheev
51173ebcf5
Refactoring. Move all code related to 'view over shoulder' to a separate file.
2020-07-12 20:51:38 +02:00
Petr Mikheev
5bdf61a886
Slightly pulls camera away when the character moves
2020-07-12 20:51:38 +02:00
Petr Mikheev
ef03f2c033
Auto switch shoulder
2020-07-12 20:51:38 +02:00
Petr Mikheev
5675d6ce81
Generalize calculation of focal point offset for 3rd person camera.
...
When player swim, the view slowly switches from "over shoulder" to "above head".
New functions to switch shoulder.
2020-07-12 20:51:38 +02:00
Andrei Kortunov
f12123a172
Merge pull request #2965 from Assumeru/startscript-regression
...
Fix a regression caused by #2648 (fixes #5513 )
2020-07-12 15:27:49 +04:00
Evil Eye
271f7040a6
Fix a regression caused by #2648 ( fixes #5513 )
2020-07-12 13:25:40 +02:00
Andrei Kortunov
7f936e4cde
Merge pull request #2961 from akortunov/move
...
Do not use outdated references when moving objects to new cells
2020-07-12 12:11:22 +04:00
Bret Curtis
3acb84f4d5
Merge pull request #2964 from elsid/osg_rendering_stats
...
Report OSG rendering stats to file
2020-07-11 23:45:26 +02:00
Roman Siromakha
0f6badc581
Merge pull request #2958 from akortunov/statswatcher
...
Corrections for StatsWatcher
2020-07-11 22:54:35 +02:00
Andrei Kortunov
78627d66bc
Merge pull request #2963 from elsid/fix_particle_tsan
...
Add bug #4764 to changelog
2020-07-11 20:50:01 +04:00
Andrei Kortunov
da791590ac
Update HUD icons during mechanics update again to avoid crashes
2020-07-11 20:40:00 +04:00
elsid
db0ad8421f
Report OSG rendering stats
2020-07-11 18:32:57 +02:00
elsid
bdf215d1a9
Add bug #4764 to changelog
2020-07-11 18:32:33 +02:00
Andrei Kortunov
58e3900ea0
Avoid redundant call
2020-07-11 20:11:49 +04:00
Bret Curtis
9124a18bb6
Merge pull request #2959 from elsid/fix_particle_tsan
...
Fix TSAN warnings for ripples emitter (bug #4764 )
2020-07-11 17:22:24 +02:00
Andrei Kortunov
db8f0ad6fd
Do not use outdated references when moving objects to new cells (bug #5387 )
2020-07-11 17:24:20 +04:00
elsid
a4e3f32ec8
Fix TSAN warnings for ripples emitter
...
While main thread creates particles rendering thread draws them so
sychronization is required.
2020-07-11 13:29:30 +02:00
psi29a
b372ac9119
Merge branch '#5493_better_handle_objects_across_cells' into 'master'
...
Resolve #5493 by better supporting objects that are placed across cells.
Closes #5493
See merge request OpenMW/openmw!260
2020-07-11 08:27:27 +00:00
Bret Curtis
4a17bf27a3
Set BULLET_ROOT via add_cmake_opts like we do the rest
2020-07-11 00:18:14 +02:00
psi29a
15c5cf42c0
Merge branch '#5517_ag_rotate_object_fix' into 'master'
...
Resolves #5517 by removing the object being rotated from the paging system.
Closes #5517
See merge request OpenMW/openmw!259
2020-07-10 18:09:42 +00:00
Bret Curtis
f47d2bb8af
make sure we use case-sensative BULLET_ prefix
2020-07-10 15:01:44 +02:00
psi29a
7300496a5f
Delete FindFreetype.cmake; as it is provided by cmake as of 3.0.2 and we require 3.1.0.
2020-07-10 12:27:22 +00:00
psi29a
5c3496fb15
Delete FindBullet.cmake; we use cmake's version which has been available since 3.0.2 and we have a requirement of 3.1.0
...
https://cmake.org/cmake/help/v3.0/module/FindBullet.html
2020-07-10 12:22:58 +00:00
psi29a
721e659d37
Update CHANGELOG.md
2020-07-10 12:12:07 +00:00
psi29a
8f86617262
Merge branch 'master' into 'master'
...
Fixed passed indexes for object deletion #5384
See merge request OpenMW/openmw!196
2020-07-10 12:10:33 +00:00
psi29a
c3a44212c7
Merge branch 'player_resurrection_spell_fix' into 'master'
...
Don't clear spells for a dead player, preventing resurrection problems
See merge request OpenMW/openmw!207
2020-07-10 12:00:24 +00:00
Andrei Kortunov
8517737ac0
Merge branch 'camera_dist_setting' into 'master'
...
New setting "third person camera distance"
See merge request OpenMW/openmw!241
2020-07-10 03:42:15 +00:00
Bret Curtis
fd61ebf6ab
remove big white blob of space
2020-07-10 00:44:54 +02:00
Petr Mikheev
280862f58b
New setting "third person camera distance"
2020-07-10 00:38:18 +02:00
bzzt lost a hitlab login
4ea018c594
Should resolve #5493 by better supporting objects that are placed across cells.
2020-07-09 23:17:01 +02:00
Bret Curtis
bbba524a6c
Resolves #5517 by removing the object being rotated from the paging system.
2020-07-09 22:36:57 +02:00
psi29a
46db69a349
Merge branch 'swimming' into 'master'
...
Swimming-related fixes
See merge request OpenMW/openmw!247
(cherry picked from commit 8be328ef80f29e9692e29d24beefa8ced16537a7)
738c71fd Extend the "turn to movement direction" mode for swimming up and down.
10d3e82b New setting "swim upward coef"
2020-07-09 20:05:59 +00:00
Andrei Kortunov
e335dc8b8a
Merge pull request #2957 from elsid/sound_lookup_when_fade_out
...
Lookup sound when need to fade out
2020-07-09 10:25:16 +04:00
elsid
1c9ce03575
Lookup sound when need to fade out
2020-07-08 22:43:16 +02:00
Andrei Kortunov
700f70595f
Merge pull request #2956 from elsid/sound_reoder_conditions
...
Check distance to object before load sound
2020-07-08 08:53:20 +04:00
elsid
41434f26a6
Merge branch 'Fix-Trainers-Issue-5486' into 'master'
...
Trainers training skills based on base skill issue #5486
See merge request OpenMW/openmw!257
2020-07-07 20:25:21 +00:00
elsid
624baa6d89
Check distance to object before load sound
2020-07-07 21:19:00 +02:00
CedricMocquillon
d76b81a4a4
Update changelog
2020-07-07 17:54:42 +02:00
CedricMocquillon
e51191b5ca
Update documentation
2020-07-07 17:54:31 +02:00
CedricMocquillon
096e25b29a
Make the getSkillForTraining a member method of TrainingWindow class.
...
The implementation is based now on the member of the class
mTrainingSkillBasedOnBaseSkill instead of local static
2020-07-07 11:13:35 +02:00
Bret Curtis
49489b31f7
Merge pull request #2955 from elsid/sound_npc_animation
...
Use pointer to Sound to stop sounds started by NpcAnimation
2020-07-07 08:17:03 +02:00
CedricMocquillon
998bf5da34
Add new checkbox for the new setting 'trainers training skills based on base skill'
2020-07-06 20:32:30 +02:00
CedricMocquillon
1aa4f6bf96
The number of skills points a trainer can teach is based either on its base
...
values or on its modified ones depending on the new setting 'trainers training
skills based on base skill' value
2020-07-06 20:30:14 +02:00
CedricMocquillon
281cef9769
The 3 skill selected by a trainer are based on its 3 best skills.
...
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
2020-07-06 20:28:08 +02:00
elsid
3c460fb3e9
Use pointer to Sound to stop sounds started by NpcAnimation
2020-07-06 17:38:09 +02:00
Bret Curtis
0f855a83c0
Merge pull request #2945 from OpenMW/macos10.15
...
give MacOS 10.15 a spin
2020-07-06 09:04:11 +02:00
Bret Curtis
14d5b3eeaf
try release again and turning on bit by bit for ccache to be used
2020-07-06 07:47:31 +02:00
Bret Curtis
67c2f0b26c
Merge pull request #2951 from elsid/sound_object_pool
...
Store SoundManager sounds and streams in object pool
2020-07-06 07:18:46 +02:00
psi29a
f4d024b4f1
Merge branch 'ci-cache' into 'master'
...
Cache compilation using ccache
See merge request OpenMW/openmw!159
2020-07-06 05:06:09 +00:00
Icecream95
dc6fbd39d8
Cache compilation using ccache
2020-07-06 11:01:45 +12:00
