1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-24 12:53:52 +00:00
Commit graph

23916 commits

Author SHA1 Message Date
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
Bret Curtis
1e23d007dd Use Debug instead of Release to increase build time (passing -O0) 2020-07-01 22:23:02 +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
Bret Curtis
a62e3a7b35 What happens when I remove the sysroot line? 2020-07-01 18:50:41 +02:00
Bret Curtis
3eeee4bc94 drop need to upgrade qt, 5.15 is by default installed; add CXX_FLAGS; retarget SYSROOT to 10.15 2020-07-01 17:52:34 +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
f53f049a64 give MacOS 10.15 a spin 2020-07-01 17:42:18 +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
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
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
AnyOldName3
0d7b9c51fd Log misparsed stuff as it caused an unexpected CI failure 2020-06-28 03:51:41 +01: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
AnyOldName3
bf69f90f80 Revert "Make build succeed so cache is kept"
This reverts commit 53be725df2.

It was only needed for CI reasons.
2020-06-27 03:28:42 +01:00
AnyOldName3
53be725df2 Make build succeed so cache is kept 2020-06-27 03:26:42 +01:00
AnyOldName3
d6ab2f9659 Disallow failure 2020-06-27 03:23:59 +01:00
AnyOldName3
c7cf163667 Don't keep whole build directory. 2020-06-27 03:23:12 +01:00
AnyOldName3
decf59d20e Don't try and activate MSVC when using MSBuild 2020-06-27 02:30:51 +01:00
AnyOldName3
82882beee6 Fix missing line breaks 2020-06-27 02:08:25 +01:00
AnyOldName3
edd6df1857 Try enabling Windows Shared Runners again.
Hopefully this will work now https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/autoscaler/-/merge_requests/99 is merged.
2020-06-27 02:05:17 +01: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