Commit Graph

26215 Commits (5eb7eb8d8823bdd97ffff16f951711616f635349)
 

Author SHA1 Message Date
David Cernat 5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
5 years ago
Bret Curtis 0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
Replace OpenThreads by std types
5 years ago
Bret Curtis 28d85e4030
Merge pull request #2926 from akortunov/warnfix
Use QMultiMap instead of QMap
5 years ago
Andrei Kortunov 57069f60aa
Merge pull request #2953 from akortunov/warnfix2
Mark some methds as overrides to avoid warnings
5 years ago
Andrei Kortunov 9ec61c14d2 Mark some methods as overrides to avoid warnings 5 years ago
Andrei Kortunov ce597ff908
Merge pull request #2952 from akortunov/master
Remove redundant virtual qualifier
5 years ago
Andrei Kortunov d1b5f17390 Remove redundant virtual qualifier 5 years ago
Bret Curtis c7a612a891
Merge pull request #2949 from elsid/sound_water_action
Choose next action for water sound in a separate function
5 years ago
elsid b424aac25e
Choose next action for water sound in a separate function 5 years ago
elsid 080b0d6319
Remove unused duration from updateWaterSound 5 years ago
Andrei Kortunov 349a11864f
Merge pull request #2950 from elsid/fit_stats
Make all stats fit into the window
5 years ago
elsid 56bc462007
Make all stats fit into the window 5 years ago
psi29a 08469af742 Merge branch '#5509_invisibility_fix_round_2' into 'master'
Should resolve the original cause of #5509

See merge request OpenMW/openmw!256
5 years ago
Bret Curtis 4dbc0a34ba
Merge pull request #2948 from elsid/rm_sound_local_static
Replace SoundManager local static variables by fields
5 years ago
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 5 years ago
elsid 6ab1a1f907
Make last cell a field of SoundManager and initialize 5 years ago
elsid 3fa1e7ebaf
Make time passed SoundManager field 5 years ago
psi29a 978b9e9285 Merge branch 'patch-1' into 'master'
fix typos in launcher

See merge request OpenMW/openmw!255
5 years ago
Dillon 8f9de7289d fix typos 5 years ago
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
5 years ago
Bret Curtis e9126fae54 Resolve #5509 where culling did not take invisiblity into accont 5 years ago
Bret Curtis 21d4c9fe84
Merge pull request #2947 from elsid/fix_sound_update
Clamp sound volume on settings update (fix #5507)
5 years ago
elsid a36a55bfb5
Clamp sound volume on settings update 5 years ago
Bret Curtis f639c62428
Merge pull request #2939 from elsid/more_stats
Add stats for all updates
5 years ago
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
5 years ago
Roman Siromakha 859ab63679
Merge pull request #2889 from akortunov/statswatcher
Add a separate stats watcher for GUI
5 years ago
elsid 439891ef53
Put logic to update water sound id and volume into a separate class 5 years ago
Bret Curtis 3d7f8a573a
Merge pull request #2941 from elsid/lookup_stop_sound
Lookup sound when need to stop
5 years ago
Andrei Kortunov 27f1a3376c Add a separate stats watcher for GUI 5 years ago
Alexei Dobrohotov 85b4b84342 Merge branch 'particle-lifetime' into 'master'
Do not set particle lifetime to 0 (#5472)

See merge request OpenMW/openmw!233
5 years ago
Frederic Chardon f268bc13f1 Do not set particle lifetime to 0 (#5472) 5 years ago
Bret Curtis 26024e7d0d
Merge pull request #2944 from akortunov/input
Regression fixes for input system
5 years ago
Bret Curtis 5b7f37cf46
Merge pull request #2943 from elsid/sound_update_region
Put logic for the next region sound selection into a separate class
5 years ago
Andrei Kortunov 7fb78e801f Fix mouse release injection 5 years ago
Andrei Kortunov 5f0cc87a67 Do not discard remnants 5 years ago
elsid 0594b7d1a0
Put logic for the next region sound selection into a separate class 5 years ago
elsid eb68df1a37
Add stats for all updates 5 years ago
Andrei Kortunov 829c26e904
Merge pull request #2942 from akortunov/master
Fix crash in the stateset updater
5 years ago
Andrei Kortunov ef6fe8d52a Fix crash in the stateset updater (regression #5478) 5 years ago
Alexei Dobrohotov c53516a4b7
Merge pull request #2940 from akortunov/deadzone
Make joysticks dead zone configurable
5 years ago
elsid 02587ed1e9
Remove unused SoundManager::stopSound overload 5 years ago
elsid 0ff5e9bfb9
Lookup sound when need to stop
Instead of loading.
5 years ago
Andrei Kortunov 230e06dec7 Make joysticks dead zone configurable (bug #5502) 5 years ago
Andrei Kortunov d18f1f8956 Merge branch 'fix_speed' into 'master'
Fix incorrect speed for creatures

See merge request OpenMW/openmw!250
5 years ago
Petr Mikheev a455b99ed6 Fix incorrect speed for creatures, that is caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/245/diffs?commit_id=eebbacd8b4ab22b3e824538df2d7faec0038c1a1 5 years ago
Roman Siromakha d5d5fab92e
Merge pull request #2938 from Assumeru/gtest
Update Windows CI script to Google Test 1.10.0
5 years ago
Evil Eye fcc761c13c Update Windows CI script to download a version of Google Test that can actually compile the tests 5 years ago
Bret Curtis 355996c2ff supress -> suppress 5 years ago
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
5 years ago
Petr Mikheev 63f828fea8 Bugfix for "turn to movement direction" 5 years ago