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
23694 commits 38 branches 54 tags 122 MiB
Commit graph

23694 commits

This branch
This branch
All branches
Author SHA1 Message Date
elsid
6ca29c6107
Use common type for pool of sounds and streams 2020-07-04 01:09:04 +02:00
Bret Curtis
c7a612a891
Merge pull request #2949 from elsid/sound_water_action 
Choose next action for water sound in a separate function
 2020-07-04 00:03:17 +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
Andrei Kortunov
349a11864f
Merge pull request #2950 from elsid/fit_stats 
Make all stats fit into the window
 2020-07-03 22:53:54 +04:00
elsid
56bc462007
Make all stats fit into the window 2020-07-03 20:49:23 +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
4dbc0a34ba
Merge pull request #2948 from elsid/rm_sound_local_static 
Replace SoundManager local static variables by fields
 2020-07-02 23:26:25 +02: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
psi29a
978b9e9285 Merge branch 'patch-1' into 'master' 
fix typos in launcher

See merge request OpenMW/openmw!255
 2020-07-02 14:39:40 +00:00
Dillon
8f9de7289d fix typos 2020-07-02 13:48:56 +00:00
psi29a
90a0f11c1f Merge branch '#5509_invisibility_fix' into 'master' 
Resolve #5509 where culling did not take invisiblity into accont

Closes #5509

See merge request OpenMW/openmw!254
 2020-07-02 13:34:32 +00:00
Bret Curtis
e9126fae54 Resolve #5509 where culling did not take invisiblity into accont 2020-07-02 12:36:25 +02:00
Bret Curtis
21d4c9fe84
Merge pull request #2947 from elsid/fix_sound_update 
Clamp sound volume on settings update (fix #5507)
 2020-07-02 11:50:45 +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
Alexei Dobrohotov
85b4b84342 Merge branch 'particle-lifetime' into 'master' 
Do not set particle lifetime to 0 (#5472)

See merge request OpenMW/openmw!233
 2020-07-01 11:04:18 +00:00
Frederic Chardon
f268bc13f1 Do not set particle lifetime to 0 (#5472) 2020-07-01 11:04:18 +00:00
Bret Curtis
26024e7d0d
Merge pull request #2944 from akortunov/input 
Regression fixes for input system
 2020-07-01 10:45:58 +02:00
Bret Curtis
5b7f37cf46
Merge pull request #2943 from elsid/sound_update_region 
Put logic for the next region sound selection into a separate class
 2020-07-01 10:12:32 +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
Andrei Kortunov
829c26e904
Merge pull request #2942 from akortunov/master 
Fix crash in the stateset updater
 2020-06-30 09:04:09 +04:00
Andrei Kortunov
ef6fe8d52a Fix crash in the stateset updater (regression #5478) 2020-06-30 09:01:17 +04: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
Andrei Kortunov
d18f1f8956 Merge branch 'fix_speed' into 'master' 
Fix incorrect speed for creatures

See merge request OpenMW/openmw!250
 2020-06-28 06:39:09 +00: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
Roman Siromakha
d5d5fab92e
Merge pull request #2938 from Assumeru/gtest 
Update Windows CI script to Google Test 1.10.0
 2020-06-27 21:58:04 +02:00
Evil Eye
fcc761c13c Update Windows CI script to download a version of Google Test that can actually compile the tests 2020-06-27 15:30:28 +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
Bret Curtis
927f835b7f
Merge pull request #2935 from akortunov/factionfix 
Fix faction requirement calculations
 2020-06-26 13:02:57 +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