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
David Cernat
bfd7c83c4d
[Client] Fix backwards logic when setting type for AI attacks
2018-10-16 21:18:41 +03: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
David Cernat
d9dd7073cf
[General] Send certain packets only when logged in
...
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.
To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
2018-10-13 15:36:13 +03:00
David Cernat
66d666d60c
[Client] Use less confusing terminology when displaying plugin mismatch
2018-10-13 14:40:49 +03: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
David Cernat
bb834748c5
[Server] Log player kicks
2018-10-13 09:34:29 +03:00
David Cernat
a3111fbcc1
[Server] Use clearer error message when failing to bind port
2018-10-13 08:35:07 +03: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
David Cernat
3d40a162bc
Merge pull request #476 from SamHellawell/0.7.0-fix-equipcrash-linux-cleanup
...
Cleanup fix for equip item crash on Linux
2018-10-11 22:52:24 +03:00
Sam Hellawell
df1667b6e4
Cleanup fix for equip item crash on Linux
...
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2018-10-11 21:49:24 +01:00
David Cernat
db2b3e95b8
Merge pull request #475 from SamHellawell/0.7.0-fix-equipcrash-linux
...
Fix crash when equipping item on linux
2018-10-11 22:40:09 +03:00
Sam Hellawell
1e171ad9fd
Fix crash when equipping item on linux
...
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2018-10-11 20:13:22 +01: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
David Cernat
e402a17757
[Client] Don't cast non-weapons to weapons in isUsingRangedWeapon()
...
This makes lockpicks and probes work again.
2018-10-09 09:54:13 +03: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
