Bret Curtis
354447cc45
Merge pull request #1987 from nikolaykasyanov/macos-ci-downgrade-mygui
...
Use dependencies with downgraded MyGUI, fixing #4665
2018-10-26 22:04:03 +02:00
Nikolay Kasyanov
f62ca24356
[macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665
2018-10-26 19:33:04 +02:00
Marc Zinnschlag
3ead33814f
Merge remote-tracking branch 'upstream/master'
2018-10-26 13:02:06 +02:00
Marc Zinnschlag
032278929b
Merged pull request #1985
2018-10-26 12:59:44 +02:00
Bret Curtis
a8d38726e8
Merge pull request #1984 from akortunov/absorption
...
Make spell absorption multiplicative
2018-10-26 12:41:29 +02:00
Capostrophic
19ce1abcdf
Fix selected weapon HUD durability percentage
2018-10-26 12:53:15 +03:00
Andrei Kortunov
bf9e8c4556
Make spell absorption multiplicative (bug #4684 )
2018-10-26 12:36:58 +04:00
Bret Curtis
0fad2449f3
Merge pull request #1982 from Capostrophic/condition
...
Avoid item condition and charge zero divisions
2018-10-25 17:22:02 +02:00
Capostrophic
c3e8d536cd
Implement getNormalizedEnchantmentCharge() method and use it
2018-10-25 16:16:07 +03:00
Capostrophic
54bd7b2dcf
Implement getItemNormalizedHealth() method and use it
2018-10-25 15:45:31 +03:00
Marc Zinnschlag
2c8bbde7ef
Merged pull request #1979
2018-10-25 11:16:26 +02:00
Marc Zinnschlag
4d88d6dd58
Merged pull request #1980
2018-10-25 11:06:22 +02:00
Bret Curtis
375354ab6b
Merge pull request #1974 from akortunov/coverity
...
Fix some issues found by Coverity Scan
2018-10-25 09:42:51 +02:00
Capostrophic
67de61e1fb
Avoid item condition and charge zero divisions
2018-10-24 19:06:55 +03:00
Bret Curtis
ecc671bfb9
Merge pull request #1981 from Capostrophic/fixme
...
[Regression] Fix fixme behavior in interiors
2018-10-24 07:50:33 +02:00
Capostrophic
4ce35c6ad5
Fix fixme behavior in interiors
2018-10-24 01:43:38 +03:00
Andrei Kortunov
61e6e359c4
Allow creatures to use the autogenerated collision box (feature #2787 )
2018-10-22 15:48:23 +04:00
Capostrophic
9809eef18e
Utilize the default soundgen entries when necessary (bug #4689 )
2018-10-21 11:32:23 +03:00
Andrei Kortunov
229d1bb425
Backport loop from tinyxml 2.6 to avoid CVE
2018-10-19 19:43:19 +04:00
Andrei Kortunov
41e90bd56c
Unify random generator usage
2018-10-19 16:16:18 +04:00
Andrei Kortunov
46bf45a6e2
Remove redundant code
2018-10-19 16:16:18 +04:00
Bret Curtis
6c4116cc8b
Merge pull request #1972 from akortunov/equipfix
...
Force actor to the 'weapon equipped' state if the weapon disappeared in the middle of attack
2018-10-18 16:43:05 +02:00
Bret Curtis
a5fc4db2d7
Merge pull request #1973 from akortunov/soundfix
...
Catch exceptions inside the loadVoice()
2018-10-18 16:40:01 +02:00
Andrei Kortunov
8fa0ffcfe4
Catch exceptions inside the loadVoice() (bug #4685 )
2018-10-18 15:02:23 +04:00
Andrei Kortunov
d7d9050d4a
Force actor to the 'weapon equipped' state if the weapon disappeared in the middle of attack (bug #4646 )
2018-10-18 11:42:03 +04:00
Bret Curtis
e406c5ff81
Merge pull request #1946 from akortunov/backupfix
...
Combat AI: check for obstacle before back up
2018-10-16 21:47:21 +02:00
Bret Curtis
e99edfd954
Merge pull request #1971 from akortunov/meshfallback
...
Try to use collisions from basic actor model if an animated one has no collisions
2018-10-16 21:45:48 +02:00
Andrei Kortunov
13bd81f896
Try to use collisions from basic actor model if an animated one has no collisions (feature #4682 )
2018-10-16 22:28:19 +04:00
Bret Curtis
358a702869
Merge branch 'master' into 'master'
...
Unified settings list and cfg file names. Added brief tutorial.
See merge request OpenMW/openmw!41
2018-10-15 12:48:25 +00:00
Bret Curtis
8cb407cfdf
Merge pull request #1969 from Capostrophic/soundgen
...
Support soundgen calls for activators (feature #4285 )
2018-10-15 14:43:11 +02:00
Bret Curtis
f561ab547a
Merge pull request #1970 from Capostrophic/landing
...
Re-enable handling soundgen land for creatures
2018-10-15 07:29:19 +02:00
Capostrophic
bf3f82b9d4
Cleanup
2018-10-14 21:28:43 +03:00
Capostrophic
6ef7be3fd3
Re-enable using soundgen land for creatures
2018-10-14 20:18:17 +03:00
Capostrophic
19fd404b7b
Support soundgen calls for activators (feature #4285 )
2018-10-14 15:36:07 +03:00
Bret Curtis
53ccce1867
Merge pull request #1966 from akortunov/logfix
...
Allow apps without logging system to display log messages
2018-10-14 11:20:36 +02:00
Andrei Kortunov
ca07e3a364
Check for obstacle before back up (bug #4656 )
2018-10-14 12:22:43 +04:00
Andrei Kortunov
b5df385111
Allow apps without logging system to display log messages
2018-10-14 12:07:15 +04:00
Marc Zinnschlag
60241431ab
Merged pull request #1965
2018-10-13 11:19:53 +02:00
Marc Zinnschlag
b30e309532
Merged pull request #1967
2018-10-13 11:15:45 +02:00
Marc Zinnschlag
26f867d7c5
Merged pull request #1968
2018-10-13 11:14:58 +02:00
rhtucker
292f4fcafe
Unified settings list and cfg file names. Added brief tutorial.
2018-10-12 21:09:27 -07:00
Andrei Kortunov
dad0b78901
Avoid overflow when handling output characters (bug #4676 )
2018-10-12 20:41:03 +04:00
jvoisin
ca8744af56
Fix crash in the ESM reader, when SCVR has no variable names
...
Fixes bug [#4678 ](https://gitlab.com/OpenMW/openmw/issues/4678 )
The `loadSCVR` method assumes that the list of variable
names won't be empty, which it might.
Instead of crashing, we show a warning and ignore the record.
2018-10-12 11:28:14 +02:00
Bret Curtis
602a314669
Merge pull request #1964 from akortunov/readfix
...
Fix crash in the ESM reader, when list is empty
2018-10-12 10:21:26 +02:00
Andrei Kortunov
f9271fd7f0
Fix crash in the ESM reader, when list is empty (bug #4677 )
2018-10-12 10:38:32 +04:00
Capostrophic
47b1b0ac39
Re-fix water reflections while making a no-GUI screenshot
2018-10-10 22:44:26 +03:00
Bret Curtis
c45ec9171b
Merge pull request #1963 from Capostrophic/journal
...
Disallow to open the journal while settings window is open (bug #4674 )
2018-10-10 20:55:32 +02:00
Capostrophic
4ec727c50b
Disallow to open the journal while settings window is open (bug #4674 )
2018-10-10 18:33:56 +03:00
Marc Zinnschlag
2d87d1d9d2
Merged pull request #1959
2018-10-10 15:05:29 +02:00
Marc Zinnschlag
d466785aa7
Merged pull request #1958
2018-10-10 15:04:32 +02:00
