Mads Buvik Sandvei
e9ed1948f1
fix unused warning
2020-07-05 11:32:20 +02:00
Mads Buvik Sandvei
90dd416d00
Minor cleanup
2020-06-28 13:02:12 +02:00
Mads Buvik Sandvei
461258cb4b
Reverted renaming of video player's gui layer
2020-06-28 13:01:58 +02:00
Mads Buvik Sandvei
e53d9e28f3
fix gui mode recenter
2020-06-28 12:16:29 +02:00
Mads Buvik Sandvei
b6e6be51aa
Merge errors
2020-06-28 12:12:24 +02:00
Mads Buvik Sandvei
58d73e14e6
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/environment.cpp
# apps/openmw/mwbase/environment.hpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwrender/camera.cpp
# apps/openmw/mwrender/camera.hpp
# apps/openmw/mwrender/renderingmanager.cpp
# apps/openmw/mwrender/renderingmanager.hpp
2020-06-28 11:59:07 +02:00
Mads Buvik Sandvei
519163c121
Commit before merge
2020-06-28 11:41:04 +02:00
Mads Buvik Sandvei
45656f1d06
Comments etc
2020-06-28 11:33:01 +02: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
Mads Buvik Sandvei
91de6392ca
More refactoring / cleanup. Code policies.
2020-06-26 23:02:48 +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
Mads Buvik Sandvei
60ffaea195
Pointer mode verbiage.
...
protected member variables for vranimation
2020-06-25 23:20:38 +02:00
Mads Buvik Sandvei
d405bcc910
Obsolete struct
2020-06-25 22:55:31 +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
Mads Buvik Sandvei
e3c460ae35
Swapchain refactoring. Use of multisampling. Msaa resolve steps for mirror textures.
2020-06-24 22:22:09 +02:00
Mads Buvik Sandvei
df45ee1690
More refactoring/cleanup
2020-06-24 21:26:11 +02: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
Mads Buvik Sandvei
1cf97fd7ad
lots of refactoring and some commenting
2020-06-21 23:40:07 +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
Andrei Kortunov
808c905e1f
Initialize fields to avoid undefined behaviour
2020-06-18 14:50:06 +04:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix
...
Get rid of ECLD and dependencies
2020-06-17 15:00:57 +02:00
