Kyle Shrader
845049a166
Prevent empty right page of journal having invisible topics ( Fixes #5588 )
2020-10-03 10:55:44 +00: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
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
Andrei Kortunov
f9e667dd8c
Fix MSVC warnings
2020-08-26 12:34:27 +04: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
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
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
