mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-24 12:53:52 +00:00
Code Issues Releases Wiki Activity
23916 commits 38 branches 54 tags 122 MiB
Commit graph

16644 commits

Author SHA1 Message Date
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
Mads Buvik Sandvei
69b4a4741f Formatting errors 2020-07-05 12:18:54 +02:00
Mads Buvik Sandvei
76e6862c82 Revert formatting errors based on diff. 2020-07-05 12:02:31 +02:00
Mads Buvik Sandvei
e9ed1948f1 fix unused warning 2020-07-05 11:32:20 +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
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
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
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
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
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
Bret Curtis
51136a75f2
Merge pull request #2915 from akortunov/guifixes 
Reset selected slot when closing savegame dialogue
 2020-06-17 14:09:31 +02:00
Bret Curtis
b18028b125
Merge pull request #2905 from elsid/ai_package_type 
Store package type id as enum except ESM
 2020-06-17 13:03:31 +02:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
Bret Curtis
1db58575c8
Fixed missed AiPackageTypeId::Wander 'fix' 2020-06-17 09:58:18 +02:00