mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 20:49:56 +00:00
Code Issues Releases Wiki Activity
24565 commits 38 branches 54 tags 122 MiB
Commit graph

16897 commits

Author SHA1 Message Date
fredzio
a036183248 Use a much simpler and assert-free check for Bullet multithreading support 2020-10-19 21:31:52 +02:00
Nelsson Huotari
fb4250a2b7 Strip the plugin index when looking for deleted refs. 2020-10-19 15:02:10 +03:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
psi29a
4adc689c7a Merge branch 'summoncrash' into 'master' 
Avoid summon spawn if actor isn't in a cell (bug #5644)

See merge request OpenMW/openmw!351
 2020-10-18 00:35:35 +00:00
Alexei Dobrohotov
f90e403bc1 Avoid summon spawn if actor isn't in a cell (bug #5644) 2020-10-18 01:42:32 +03:00
psi29a
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
 2020-10-17 20:21:02 +00:00
psi29a
9d350ec824 Merge branch 'head_bobbing' into 'master' 
Add head bobbing in first person mode

Closes #5043

See merge request OpenMW/openmw!320
 2020-10-17 19:54:34 +00:00
Petr Mikheev
9ec6fce446 Makes the delay of turning while run configurable (part of "smooth movement"). 2020-10-17 16:11:22 +02:00
Petr Mikheev
c72199155c Use full speed in the "NPCs give way" maneuver. 2020-10-17 15:33:23 +02:00
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides 
Mark overrided methods as overrides
 2020-10-17 13:32:08 +02:00
AnyOldName3
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
 2020-10-16 22:55:10 +00:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
fredzio
978af12c2d Restore fall damage 2020-10-16 19:30:03 +02:00
psi29a
c16fa27407 Merge branch 'async-physics' into 'master' 
Async physics

See merge request OpenMW/openmw!248
 2020-10-15 08:34:26 +00:00
fredzio
ae3306c019 Document async physics settings 
Add an option to the launcher
Update changelog
 2020-10-15 06:41:41 +02:00
fredzio
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.
 2020-10-15 06:41:35 +02:00
fredzio
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
 2020-10-15 06:41:22 +02:00
fredzio
d76cc5d0a9 Make the Object class manage its collision object and position. 2020-10-15 06:41:16 +02:00
fredzio
4ef36973fb Make the Actor class manage its collision object and position. 2020-10-15 06:41:08 +02:00
fredzio
82da2045a9 Non functionnal changes in preparation for async physics feature 2020-10-15 06:41:03 +02:00
Bret Curtis
425fa837d1
Merge pull request #3012 from akortunov/container_crash 
Fix crash on saving
 2020-10-14 12:43:31 +02:00
Andrei Kortunov
c3d84b2c7c Ability to attach arrows to shooter's hands (feature #5642) 2020-10-14 10:07:42 +04:00
Andrei Kortunov
8e647aa72a Fix crash on saving 2020-10-14 09:16:01 +04:00
Assumeru
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
 2020-10-13 17:46:32 +02:00
Bret Curtis
c99be77a32
Merge pull request #3008 from akortunov/strings 
Rework fixed strings handling
 2020-10-13 17:37:48 +02:00
Petr Mikheev
15078f5b3c Fix #5630 "NPCs momentarily turn when the player character is moving backwards during combat" 2020-10-10 23:06:43 +02:00
Alexei Dobrohotov
1842f546c3 Restore empty target check in spell absorption 2020-10-10 14:27:52 +03:00
Alexei Dobrohotov
e930251d92 Merge branch 'godmode' into 'master' 
Add many more godmode checks to harmful magic (bug #5633)

Closes #4264

See merge request OpenMW/openmw!336
 2020-10-09 22:09:46 +00:00
Alexei Dobrohotov
0e8c5c5034 Merge branch 'avoid_collision_update' into 'master' 
Update logic of "NPCs avoid collisions"

See merge request OpenMW/openmw!318
 2020-10-09 18:43:43 +00:00
Alexei Dobrohotov
b85875a354 Ignore Burden effect in god mode 2020-10-09 21:34:39 +03:00
Alexei Dobrohotov
39678c74bf Add many more godmode checks to harmful magic (bug #5633) 2020-10-09 20:36:51 +03:00
Alexei Dobrohotov
0dcb8c6b69 Fix pick/probe uses decrement 2020-10-09 19:20:50 +03:00
Alexei Dobrohotov
ec825b2510 Fix RayCastingResult warning 2020-10-08 22:44:46 +03:00
Petr Mikheev
be27b51279 Add head bobbing in first person mode 2020-10-08 00:22:01 +02:00
psi29a
bca698d951 Merge branch 'shader_line_numbering' into 'master' 
Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
 2020-10-07 07:16:45 +00:00
AnyOldName3
c9e3db40a1 Merge branch 'multi-config-build' into 'master' 
Add support for multi configurations generators on unix

See merge request OpenMW/openmw!198
 2020-10-06 14:02:04 +00:00
Andrei Kortunov
822764d0fa Rework fixed strings handling 2020-10-05 21:52:22 +04:00
Alexei Dobrohotov
29ccb09da5 Introduce some extended NIF definitions 2020-10-04 13:18:56 +03:00
Petr Mikheev
2835ea1e21 Update logic of "NPCs avoid collisions" 2020-10-03 22:58:00 +02:00
Charles Calhoun
14aacb81c5 Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation. 2020-10-03 20:05:17 +00:00
Mads Buvik Sandvei
d5450a7d88 Correctly resetting line numbering during shader processing. 2020-10-03 14:22:34 +02:00
psi29a
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
 2020-10-03 10:55:44 +00:00
Kyle Shrader
845049a166 Prevent empty right page of journal having invisible topics (Fixes #5588) 2020-10-03 10:55:44 +00:00
AnyOldName3
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.
 2020-10-03 02:19:38 +01:00
psi29a
aa4e6c448b Merge branch 'spellabsorption' into 'master' 
Support enchantment absorption

See merge request OpenMW/openmw!307
 2020-09-29 15:27:52 +00:00
psi29a
d9dafbe45b Merge branch 'master' into 'uses' 
# Conflicts:
#   CHANGELOG.md
 2020-09-29 08:20:50 +00:00
psi29a
0438d9d5bb Merge branch 'enchanting' into 'master' 
Reset enchant effects displayed range when they are constant (bug #5603)

See merge request OpenMW/openmw!309
 2020-09-28 17:18:29 +00:00
psi29a
ad1021721f Merge branch 'master' into 'rotation' 
# Conflicts:
#   CHANGELOG.md
 2020-09-28 17:09:50 +00:00
Alexei Dobrohotov
f2af957647 Reset enchant effects displayed range when they are constant (bug #5603) 2020-09-25 02:13:57 +03:00
Alexei Dobrohotov
e0a5c24afe Handle 0-use items like vanilla (bug #5611) 2020-09-25 00:20:25 +03:00
AnyOldName3
73708a6f2a Install openmw-cs.cfg on single-config generators and from the right directory on multi-config 2020-09-23 20:00:32 +02:00
Petr Mikheev
a17fb14b8a Add "smooth movement" and "NPCs avoid collisions" settings to openmw-launcher and to the docs; update CHANGELOG.md. 2020-09-22 22:50:44 +02:00
Petr Mikheev
ad51a4be2e Changes in head tracking and greetings for "smooth movement". 2020-09-22 22:50:44 +02:00
Petr Mikheev
b838782557 Avoid collisions between actors. 2020-09-22 22:50:44 +02:00
Petr Mikheev
79a72e4b44 Slightly modify aicombat to make it more difficult to get around an enemy. The difference is visible only if turning is slow (i.e. if smooth movement enabled). 2020-09-22 22:50:44 +02:00
Petr Mikheev
6a75942907 Fix CharacterController::setAttackTypeBasedOnMovement 2020-09-22 22:50:44 +02:00
Petr Mikheev
bd6b984022 Smoothing speed in CharacterController 2020-09-22 22:50:44 +02:00
Petr Mikheev
71ba94a89a Smooth turning; smooth stopping; combat headtracking 2020-09-22 22:50:44 +02:00
Alexei Dobrohotov
f8389c6c37 Support enchantment absorption 2020-09-22 00:33:27 +03:00
Alexei Dobrohotov
387bda5e22 Add inverse order rotation support to SetAngle (feature #5579) 2020-09-21 22:27:01 +03:00
Andrei Kortunov
7d776609c8 Fix unsugned/signed comparison warning 2020-09-21 10:36:01 +04:00
Bret Curtis
dd7e964baf
Merge pull request #2999 from akortunov/spellfix 
Apply effects during rest before fast-forwarding spells state
 2020-09-20 14:47:37 +02:00
psi29a
22c3588d0d Merge branch '4771-and-4631' into 'master' 
Try lower MSAA level if the requested value isn't available

Closes #4471 and #4631

See merge request OpenMW/openmw!297

(cherry picked from commit b3db387512340a5e9a77427c2d7d9d88c2340056)

da0aef7a Retrieve SDL OpenGL attributes after context creation
a51e63b3 Try lower MSAA levels if OpenGL context doesn't have what we requested
c4e92a0a Update CHANGELOG.md
 2020-09-20 12:35:26 +00:00
psi29a
b4ccd2658a Merge branch 'khr_debug' into 'master' 
Khr debug

See merge request OpenMW/openmw!302
 2020-09-20 12:14:57 +00:00
Bret Curtis
8f07b7e076
Merge pull request #3005 from Assumeru/dont-search-containers 
Don't search containers
 2020-09-20 11:48:26 +02:00
AnyOldName3
3f61ff3a44 Make OpenGL debugging optional 2020-09-19 23:30:34 +01:00
AnyOldName3
441c09578a Merge remote-tracking branch 'origin/khr_debug' into khr_debug 2020-09-19 23:09:11 +01:00
Evil Eye
fe82cd9f92 Don't search containers 2020-09-15 21:13:18 +02:00
Petr Mikheev
874c754b68 Fix #5557 2020-09-15 20:24:16 +02:00
tessa
58b5249e8b fix typo in terrainstorage.hpp 2020-09-13 10:46:27 -05:00
Bret Curtis
673f0f4f77
Merge pull request #3003 from akortunov/min_cost 
Set a minimum 1gp cost for services
 2020-09-08 17:00:49 +02:00
Andrei Kortunov
753ca91556 Set a minimum 1gp cost for services (regression #5600) 2020-09-08 17:04:31 +04:00
AnyOldName3
ffed6acc49 Merge branch 'patch-1' into 'master' 
force static data variance for water geometry

See merge request OpenMW/openmw!294
 2020-09-07 22:32:00 +00:00
Alexei Dobrohotov
99ab629a03
Merge pull request #2995 from akortunov/arrows 
Improve ammo resetting
 2020-09-06 13:30:55 +03:00
Mads Buvik Sandvei
2d021430b8 force static data variance for water geometry 2020-09-05 11:52:52 +00:00
Andrei Kortunov
f9ca08a984 Do not use swish sound for ranged weapons 2020-09-03 09:48:12 +04:00
Andrei Kortunov
787ca06d55 Apply effects during rest before fast-forwarding spells state 2020-09-01 19:36:59 +04:00
Bret Curtis
53e581fe10
Merge pull request #2899 from akortunov/multiple_effects 
Track magic effect index for summoning
 2020-09-01 14:17:49 +02:00
Andrei Kortunov
7a4efe3979 Avoid crash when object paging encounters an empty shape 2020-09-01 10:13:32 +04:00
Petr Mikheev
7e3d19196d Fix #5586 2020-09-01 00:37:37 +02:00
Evil Eye
131bd5c91d Fix unused template argument 2020-08-30 22:10:49 +02:00
Andrei Kortunov
9189a42c4c Fix failed assertion 2020-08-29 12:07:13 +04:00
Andrei Kortunov
67eace1028 Use struct instead of tuple 2020-08-29 11:24:08 +04:00
Andrei Kortunov
924f634bda Support for multiple summons with same ID in the single spell 2020-08-28 21:14:54 +04:00
Andrei Kortunov
47af221f10 Reset ammo when switching view to avoid warnings spam 2020-08-28 15:57:11 +04:00
Andrei Kortunov
297898182b Reset attached arrow in the beginning of unequipping animation 2020-08-28 15:53:30 +04:00
Bret Curtis
7ee5526dbf
Merge pull request #2993 from akortunov/warnfix 
Fix MSVC warnings
 2020-08-27 23:39:01 +02:00
psi29a
f90a049702 Merge branch 'movement_refactoring' into 'master' 
Refactoring related to "smooth movement"

See merge request OpenMW/openmw!285

(cherry picked from commit 6eaf0a389d5aed3b74ab1a7cf89574612f964bdf)

e847b4c8 Split getSpeed() to getMaxSpeed() and getCurrentSpeed()
a96c46bc Refactor calculation of movement.mSpeedFactor
03ee9090 Use getMaxSpeed instead of getCurrentSpeed where it makes sense.
a178af5c Create helper functions `normalizeAngle` and `rotateVec2f`
 2020-08-27 11:54:30 +00:00
AnyOldName3
a495888d3d Get per-monitor resolution list while SDL is alive 2020-08-26 16:58:51 +01:00
AnyOldName3
5538fea1d1 Display standard resolutions on single-monitor machines 2020-08-26 16:58:12 +01:00
Andrei Kortunov
f9e667dd8c Fix MSVC warnings 2020-08-26 12:34:27 +04:00
AnyOldName3
b60d5904e2 Correct SDL_GetNumVideoDisplays error message 
It logged the wrong function
 2020-08-26 00:16:14 +01:00
Bret Curtis
74ba6197ce
Merge pull request #2991 from akortunov/launcher 
Use two columns when there is too many checkboxes in launcher's tab
 2020-08-23 21:17:05 +02:00
elsid
80e23536cb Merge branch 'camera_refactoring' into 'master' 
Camera refactoring

See merge request OpenMW/openmw!271
 2020-08-22 22:15:18 +00:00
Andrei Kortunov
7c9497c4de Use two columns when there is too many checkboxes in launcher's tab 2020-08-22 09:26:15 +04:00
Andrei Kortunov
8e566fa7ab
Merge pull request #2989 from Capostrophic/tabs 
Make Advanced tab of the launcher look okay for everyone again
 2020-08-21 12:21:16 +04:00
Alexei Dobrohotov
5c37b5bc4b
Merge pull request #2990 from akortunov/serialize 
[Regression] Fix crash for ShowSceneGraph
 2020-08-12 18:08:33 +03:00
Andrei Kortunov
7f342374fc Fix crash when using 'showscenegraph 1' console command 2020-08-12 11:16:10 +04:00
Capostrophic
c436f29a1e Make Advanced tab of the launcher look okay for everyone again 2020-08-09 20:23:17 +03:00
Capostrophic
a0ca7c4b43 AIPursue: don't do a LOS check 
Properly resolve #4774
 2020-08-09 12:48:59 +03:00
psi29a
f73aa9f27a Merge branch 'launcher_update' into 'master' 
Add more settings to openmw-launcher

See merge request OpenMW/openmw!272
 2020-08-07 20:17:44 +00:00
Petr Mikheev
6a4fa8a8b5 Add more settings to openmw-launcher 2020-08-07 20:17:44 +00:00
Bret Curtis
32e7b78cb9
Merge pull request #2985 from Assumeru/master 
Fix regression #5572
 2020-08-07 21:23:38 +02:00
Evil Eye
fb28d27d08 don't discard purged effects 2020-08-07 16:36:59 +02:00
Capostrophic
a211527b4b Fix AppVeyor warnings 2020-08-07 09:59:16 +03:00
Petr Mikheev
0de6650add Add RayCastingInterface 2020-08-06 22:03:33 +02:00
Petr Mikheev
e9b2e9b474 Remove camera stuff from RenderingManager 2020-08-06 00:43:33 +02:00
Petr Mikheev
694e0b5906 Refactoring. Simplification of camera interface. 2020-08-06 00:43:33 +02:00
Petr Mikheev
ed3426cf2f Move third person camera collision check from World::updatePlayer() to Camera::updatePosition() 2020-08-06 00:43:33 +02:00
Alexei Dobrohotov
eed8902380
Merge pull request #2982 from Assumeru/explain 
Comments to explain the arcane workings of Morrowind
 2020-08-05 18:05:55 +03:00
Bret Curtis
2e05b5a4ee
Merge pull request #2983 from Assumeru/spell-regression 
Fix #5566
 2020-08-05 09:57:47 +02:00
Petr Mikheev
ca4330f753 Tune algorithm of "auto switch shoulder" 2020-08-05 01:01:51 +02:00
Evil Eye
144a7f330f Fix a regression that meant missing spells would prevent a save from being loaded 2020-08-04 18:28:10 +02:00
Perry Hugh
4bf24a955e Restore Gamepad Zooming 2020-08-04 06:04:59 +00:00
Bret Curtis
1995e43b46
Merge pull request #2980 from Assumeru/heritage 
Make scripts inherit variables from the base record
 2020-08-03 13:10:35 +02:00
unknown
073a7f2b2d Comments to explain the arcane workings of Morrowind 2020-07-30 21:39:04 +02:00
Andrei Kortunov
9f349e8d91 Use more C++11 in the scripting system code 2020-07-30 20:57:25 +04:00
unknown
b39f35d805 inherit variables 2020-07-29 18:43:56 +02:00
Bret Curtis
72b63ed140
Merge pull request #2954 from Assumeru/basespells 
Mutate base records when adding/removing spells
 2020-07-29 09:18:55 +02:00
Frederic Chardon
12ee42c6f3 Update mLastTopic before executing scripts. In case the script contains ClearInfoActor it erase not the correct topic. 
Other correction not linked with the bug:
- reset mActorKnownTopicsFlag at the same time as mActorKnownTopics
- don't call updateTopics in addResponse, it is already handled by the response
callback
 2020-07-28 20:50:49 +00:00
unknown
e27858cfab these were supposed to be included 2020-07-28 18:24:09 +02:00
Evil Eye
6ad20ec9c7 Mutate base records when adding/removing spells 2020-07-28 08:33:28 +02:00
Bret Curtis
ae1af0e103
Merge pull request #2972 from Assumeru/non-unique-additem 
Mutate base record when calling add/remove item on non-unique actors
 2020-07-27 23:33:10 +02:00
Bret Curtis
d197e2887b
Merge pull request #2977 from Capostrophic/simplewater 
Make a horrible simple water hack less horrible
 2020-07-27 01:26:44 +02:00
Bret Curtis
82a45eb6ae
Merge pull request #2976 from Capostrophic/unconscious 
Add option to always allow stealing from KO'd actors (feature #5545)
 2020-07-27 01:22:51 +02:00
Capostrophic
03f0bd3df6 Make a horrible simple water hack less horrible 2020-07-27 00:32:24 +03:00
Capostrophic
9c930e38fa Add option to always allow stealing from KO'd actors (feature #5545) 2020-07-26 13:10:44 +03:00
Capostrophic
cc6e4ad215 Fix pickpocketing sneaking stance check 2020-07-26 12:20:17 +03:00
Evil Eye
040a92c373 implement additem/removeitem for non-unique actors 2020-07-26 11:07:18 +02:00
CedricMocquillon
1f4f10c723 Add a tab level in advanced settings 2020-07-25 17:42:31 +02:00
psi29a
fc7266d4ee Merge branch 'Improve-cell-name-autocompleter-implementation' into 'master' 
#5520 Improve cell name autocompleter implementation

See merge request OpenMW/openmw!267
 2020-07-25 13:58:42 +00:00
Cédric Mocquillon
2e27de027e Add members in AdvancedPage class to avoid memory leak when the list of cells names is updated as we recreated a completer at each notification event 2020-07-25 13:58:42 +00:00
Bret Curtis
21ee1ed317
Merge pull request #2973 from akortunov/refactoring 
Use more C++11 loops in game mechanics code
 2020-07-25 15:43:42 +02:00
Andrei Kortunov
e6036e13b9 Use more C++11 loops in game mechanics code 2020-07-25 15:54:49 +04:00
Petr Mikheev
8cdc7031f5 Support vectors in settings.cfg 2020-07-24 21:47:49 +02:00
Petr Mikheev
62c8ea373b Fix not completely correct camera transition when switching from 1st person to 3rd person if armed. 2020-07-19 22:12:17 +02:00
Petr Mikheev
d78b227670 Fix inverted preview rotation when using controller 2020-07-19 18:21:40 +02:00
Petr Mikheev
2e6aa155a3 New settings 'preview if stand still' and 'deferred preview rotation'. 2020-07-19 18:21:40 +02:00
Petr Mikheev
9f850b6ffc Move deferred rotation logic from renderingmanager.cpp to camera.cpp 2020-07-19 18:21:40 +02:00
Petr Mikheev
63cab4052d Refactoring in mwrender::Camera. enum for normal/preview/vanity mode. 2020-07-19 18:21:40 +02:00
Petr Mikheev
8ac7ffc32b Remove 'separate preview camera' and make the new behavior the default one. 
Also minor refactoring in camera.cpp
 2020-07-17 22:59:44 +02:00
Petr Mikheev
4d206d2c67 Improved preview mode 2020-07-17 20:35:52 +02:00
elsid
c3b581131d Merge branch 'third_person_fix' into 'master' 
Minor fixes for 'view over shoulder'

See merge request OpenMW/openmw!265
 2020-07-17 18:11:35 +00:00
Petr Mikheev
8ac143c983 Camera can pull out after clearing obstruction instead of instant snapback. 2020-07-17 10:19:46 +02:00
Petr Mikheev
68148f5ec7 1. Skip smooth camera transition after changing cell; 2. Fix 'zoom out when move' for extremely high speed; 2020-07-16 22:21:50 +02:00
elsid
9240833bda
Init sound by a single object 2020-07-15 19:46:34 +02:00
Bret Curtis
74c67218e4
Merge pull request #2968 from elsid/fix_flee_cliff_racers 
Adjust actor rotation when flee by axis x (bug #5531)
 2020-07-14 17:04:04 +02:00
Bret Curtis
e98ae3262e
Merge pull request #2969 from akortunov/scripts 
Resume failed scripts execution after game reload
 2020-07-14 10:44:58 +02:00
Andrei Kortunov
b05d071e69 Resume failed scripts execution after game reload (feature #5524) 2020-07-14 10:53:01 +04:00
elsid
b7c1c52439
Adjust actor rotation when flee by axis x 
Otherwise Cliff Racers can go underwater.
 2020-07-13 20:08:37 +02:00
elsid
bcd526b706 Merge branch 'third_person_new' into 'master' 
Further improvements of "view over shoulder"

See merge request OpenMW/openmw!237
 2020-07-13 09:42:19 +00:00
Bret Curtis
a5da59e840
Merge pull request #2967 from Capostrophic/casesensitivity 
Fix search filter unicode character case sensitivity
 2020-07-12 22:41:24 +02:00
Petr Mikheev
383fa3d3ab Make 'zoom out when move' configurable. 2020-07-12 21:03:18 +02:00
Petr Mikheev
173c1fdabb Make transition in 'auto switch shoulder' smoother. 2020-07-12 20:51:38 +02:00
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
Capostrophic
65ac0c86b8 Fix search filter unicode character case sensitivity 2020-07-12 19:05:47 +03: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
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
Andrei Kortunov
58e3900ea0 Avoid redundant call 2020-07-11 20:11:49 +04: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
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
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
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
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
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
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
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
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads 
Replace OpenThreads by std types
 2020-07-04 13:11:23 +02:00
Andrei Kortunov
9ec61c14d2 Mark some methods as overrides to avoid warnings 2020-07-04 12:00:30 +04:00
Andrei Kortunov
d1b5f17390 Remove redundant virtual qualifier 2020-07-04 10:17:39 +04:00
elsid
02f9b44f01
Use RAII for object ptr from pool 2020-07-04 01:15:27 +02:00
elsid
6ca29c6107
Use common type for pool of sounds and streams 2020-07-04 01:09:04 +02:00
elsid
b424aac25e
Choose next action for water sound in a separate function 2020-07-03 21:04:25 +02:00
elsid
080b0d6319
Remove unused duration from updateWaterSound 2020-07-03 21:01:48 +02:00
psi29a
08469af742 Merge branch '#5509_invisibility_fix_round_2' into 'master' 
Should resolve the original cause of #5509

See merge request OpenMW/openmw!256
 2020-07-02 21:28:13 +00:00
Bret Curtis
d3c24a6ea4 Should resolve the original cause of #5509 and prevent mesh from growing while switching back and for from 3rd and 1st person view 2020-07-02 22:01:42 +02:00
elsid
6ab1a1f907
Make last cell a field of SoundManager and initialize 2020-07-02 19:28:58 +02:00
elsid
3fa1e7ebaf
Make time passed SoundManager field 2020-07-02 19:28:58 +02:00
Bret Curtis
e9126fae54 Resolve #5509 where culling did not take invisiblity into accont 2020-07-02 12:36:25 +02:00
elsid
a36a55bfb5
Clamp sound volume on settings update 2020-07-02 06:38:20 +02:00
Bret Curtis
f639c62428
Merge pull request #2939 from elsid/more_stats 
Add stats for all updates
 2020-07-01 23:00:48 +02:00
Bret Curtis
acf36344d4
Merge pull request #2946 from elsid/sound_update_water 
Put logic to update water sound id and volume into a separate class
 2020-07-01 22:50:29 +02:00
Roman Siromakha
859ab63679
Merge pull request #2889 from akortunov/statswatcher 
Add a separate stats watcher for GUI
 2020-07-01 19:05:15 +02:00
elsid
439891ef53
Put logic to update water sound id and volume into a separate class 2020-07-01 17:49:39 +02:00
Bret Curtis
3d7f8a573a
Merge pull request #2941 from elsid/lookup_stop_sound 
Lookup sound when need to stop
 2020-07-01 17:30:23 +02:00
Andrei Kortunov
27f1a3376c Add a separate stats watcher for GUI 2020-07-01 15:55:44 +04:00
Bret Curtis
26024e7d0d
Merge pull request #2944 from akortunov/input 
Regression fixes for input system
 2020-07-01 10:45:58 +02:00
Andrei Kortunov
7fb78e801f Fix mouse release injection 2020-07-01 11:02:02 +04:00
Andrei Kortunov
5f0cc87a67 Do not discard remnants 2020-07-01 09:52:57 +04:00
elsid
0594b7d1a0
Put logic for the next region sound selection into a separate class 2020-06-30 23:23:37 +02:00
elsid
eb68df1a37
Add stats for all updates 2020-06-30 22:00:23 +02:00
Alexei Dobrohotov
c53516a4b7
Merge pull request #2940 from akortunov/deadzone 
Make joysticks dead zone configurable
 2020-06-30 01:15:58 +03:00
elsid
02587ed1e9
Remove unused SoundManager::stopSound overload 2020-06-28 22:55:21 +02:00
elsid
0ff5e9bfb9
Lookup sound when need to stop 
Instead of loading.
 2020-06-28 22:16:48 +02:00
Andrei Kortunov
230e06dec7 Make joysticks dead zone configurable (bug #5502) 2020-06-28 13:12:12 +04:00
Petr Mikheev
a455b99ed6 Fix incorrect speed for creatures, that is caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/245/diffs?commit_id=eebbacd8b4ab22b3e824538df2d7faec0038c1a1 2020-06-27 23:56:48 +02:00
Bret Curtis
355996c2ff supress -> suppress 2020-06-27 01:20:57 +02:00
psi29a
e83fb8c3fd Merge branch 'fix_turn_to_movement' into 'master' 
Bugfix for "turn to movement direction"

Fix for #5457.

Users complain that movement is not smooth enough when the character turns from "straight right" to "straight right and a bit backward" movement.

This MR fixes it.

The problem was mostly caused by the logic that at first changes animation speed to match movement speed, and then adjusts the movement speed to match the animation. IMHO it is a doubtful logic because then the real movement speed may be not consistent with the result of getSpeed.

Also I've removed the setting "turn to movement direction speed coef" because:
1) It was added as a workaround for this "non smooth movement" problem. After the fix it is not needed.
2) Users mistakenly think that it is somehow related to movement speed for diagonal movement.

See merge request OpenMW/openmw!245
 2020-06-26 20:04:02 +00:00
Petr Mikheev
63f828fea8 Bugfix for "turn to movement direction" 2020-06-26 20:04:02 +00:00
Alexei Dobrohotov
c94d6336b5
Merge pull request #2936 from akortunov/refactoring 
Use more C++11 in the physics code
 2020-06-26 19:44:16 +03:00
Bret Curtis
c4453322e5
Merge pull request #2931 from Capostrophic/intimidate 
Increase disposition on marginal Intimidate wins (#5485)
 2020-06-26 13:47:35 +02:00
Andrei Kortunov
4a5fce8ca5 Use more C++11 in the physics code 2020-06-26 14:22:00 +04:00
Andrei Kortunov
d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 2020-06-26 11:47:59 +04:00
Andrei Kortunov
fde0f20a6f Fix faction requirement calculations (bug #5499) 2020-06-26 11:14:38 +04:00
Andrei Kortunov
3dc3fe06e2
Merge pull request #2934 from akortunov/master 
Fix MSVC warning about variable re-declaration
 2020-06-26 09:55:30 +04:00
Andrei Kortunov
30b63270ce Fix MSVC warning about variable re-declaration 2020-06-26 09:49:26 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
Capostrophic
b592fa826c Increase disposition on marginal Intimidate wins (#5485) 2020-06-25 20:28:55 +03:00
Bret Curtis
585755a502
Merge branch 'master' into shieldlocation 2020-06-25 14:58:45 +02:00
Capostrophic
2b2f9a8714 Redistribute hits to carried left slot when possible (#5490) 2020-06-25 15:44:40 +03:00
Capostrophic
c7aea20657 Don't offer a price of 1 gold for zero value items (#5484) 2020-06-25 14:56:20 +03:00
Petr Mikheev
63137a3b5a Make vertical offset of "view over shoulder" configurable 2020-06-24 20:07:41 +02:00
psi29a
abc77075b9 Merge branch 'doc-formattopics' into 'master' 
Follow up to MR 126 - make it more obvious for end users how to set colors

See merge request OpenMW/openmw!234
 2020-06-24 11:26:22 +00:00
Andrei Kortunov
19e95afc42 Avoid reverse iteration on QHash 2020-06-23 13:33:38 +04:00
Andrei Kortunov
0bb9322a69 Use default constructor for ItemFlags 2020-06-23 10:01:36 +04:00
Bret Curtis
8b02263341
Merge pull request #2919 from akortunov/warnfix 
Avoid to use some deprecated Qt API
 2020-06-23 07:42:11 +02:00
fredzio
6d4d53fc7c Add a setting to the launcher to enable/disable the dialogue topic 
formatting stuff.
 2020-06-22 23:21:03 +02:00
Andrei Kortunov
c8d5d421d9 Do not use deprecated mouse wheel movement angle 2020-06-22 18:46:45 +04:00
Andrei Kortunov
98bb73ffb7 Do not use deprecated QTextStream::endl 2020-06-22 18:46:45 +04:00
Andrei Kortunov
2b4274bca8 Use modern Qt flag declarations 2020-06-22 18:46:45 +04:00
Petr Mikheev
b4c699348f Improved strafe movement 2020-06-22 15:22:34 +02:00
Petr Mikheev
d3bd67d747 Advanced third person camera. 2020-06-22 15:22:34 +02:00
Bret Curtis
8f9c3e28d9 Handle typo 2020-06-22 13:48:35 +02:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
fredzio
ae27ad6bcd Follow up to MR 126 
Fill settings-default.cfg with default values as RGBA values are not intuitive for end users.
Add a boolean setting to enable the formatting (disabled by default).
 2020-06-22 04:31:12 +02:00
psi29a
981184109e Merge branch 'formattopics' into 'master' 
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
 2020-06-21 07:58:02 +00:00
Andrei Kortunov
142a9e772b Merge branch '5468_progress_caption_overlapping' into 'master' 
Issue #5468: Apparently this was always a problem but OP made "nested loading"...

See merge request OpenMW/openmw!228
 2020-06-18 16:27:06 +00:00
Andrei Kortunov
1541c7e5eb Fix ordering warning 2020-06-18 19:19:57 +04:00
Bret Curtis
c3dc0e62e8 OP profiling regression fix; Billboards such as those from Westly's tree mod should work again. 2020-06-18 16:16:16 +02:00
Bret Curtis
9446cece62 Issue #5468: Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly. 2020-06-18 13:23:39 +02:00