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
Marc Zinnschlag
38a3632be7
Merged pull request #1960
2018-10-10 14:56:51 +02:00
Bret Curtis
e2dbb115f0
Merge pull request #1961 from akortunov/crossbowfix
...
Improve pitch factor handling for crossbow animations
2018-10-09 13:56:43 +02:00
Andrei Kortunov
5617bb3f0c
Improve pitch factor handling for crossbow animations (bug #4672 )
2018-10-09 11:35:28 +04:00
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
2018-10-09 10:21:12 +04:00
Capostrophic
09aecb955c
getSkill usage cleanup (bug #4671 )
2018-10-08 17:06:30 +03:00
Capostrophic
cae2e84ab4
Trace the player down after enabling collision with TCL (bug #4669 )
2018-10-08 16:15:15 +03:00
Bret Curtis
6540ef68a7
Merge pull request #1957 from Capostrophic/appveyor
...
Fix AppVeyor build
2018-10-07 20:41:26 +02:00
Bret Curtis
5b4a8237fb
Merge pull request #1956 from Capostrophic/lightcolor
...
Editor: display light source color as a color (bug #4668 )
2018-10-07 20:24:14 +02:00
Capostrophic
e627f49df4
Fix AppVeyor build
2018-10-07 20:22:52 +03:00
Capostrophic
768c532b8f
Editor: display light source color as a color (bug #4668 )
2018-10-07 19:43:51 +03:00
Marc Zinnschlag
71f80db886
Merged pull request #1954
2018-10-07 11:25:32 +02:00
Bret Curtis
585313a71f
Merge pull request #1953 from Capostrophic/animation
...
Fix first person swimming animations
2018-10-06 14:24:48 +02:00
Capostrophic
03788edd63
Fix redundant drag call in instance dragging (bug #4593 )
2018-10-05 18:48:17 +03:00
Capostrophic
34e45efac3
Fix first person swimming animations
2018-10-05 17:29:49 +03:00
Marc Zinnschlag
503352e840
Merged pull request #1951
2018-10-03 13:23:56 +02:00
Marc Zinnschlag
b410d87aae
Merged pull request #1952
2018-10-03 13:19:28 +02:00
Andrei Kortunov
07ccc5abdb
Remove non-looping effects after rest
2018-10-01 21:57:13 +04:00
Andrei Kortunov
3896a2eba6
Do not use a PartHolder for spell effect node
2018-10-01 20:18:20 +04:00
Andrei Kortunov
632045e145
Improve the 'part has no parents' warning
2018-10-01 20:18:19 +04:00
Andrei Kortunov
4dc424036f
Cleanup magic effects, when create a new ActorAnimation
2018-10-01 20:17:58 +04:00
