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 |
|
psi29a
|
f4d024b4f1
|
Merge branch 'ci-cache' into 'master'
Cache compilation using ccache
See merge request OpenMW/openmw!159
|
2020-07-06 05:06:09 +00:00 |
|
Icecream95
|
dc6fbd39d8
|
Cache compilation using ccache
|
2020-07-06 11:01:45 +12:00 |
|
Bret Curtis
|
2ac4a2c6e3
|
do not make package for now
|
2020-07-04 13:22:58 +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 |
|
Bret Curtis
|
db75398fba
|
only build openmw for now
|
2020-07-04 11:54:19 +02:00 |
|
Bret Curtis
|
28d85e4030
|
Merge pull request #2926 from akortunov/warnfix
Use QMultiMap instead of QMap
|
2020-07-04 11:39:11 +02:00 |
|
Andrei Kortunov
|
57069f60aa
|
Merge pull request #2953 from akortunov/warnfix2
Mark some methds as overrides to avoid warnings
|
2020-07-04 12:02:04 +04:00 |
|
Andrei Kortunov
|
9ec61c14d2
|
Mark some methods as overrides to avoid warnings
|
2020-07-04 12:00:30 +04:00 |
|
Andrei Kortunov
|
ce597ff908
|
Merge pull request #2952 from akortunov/master
Remove redundant virtual qualifier
|
2020-07-04 10:20:46 +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 |
|
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 |
|
Bret Curtis
|
3ea576efdc
|
do not build a few things; temporary disable checking package; get things compiling and cached first
|
2020-07-03 23:24:54 +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 |
|
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 |
|