Alexei Dobrohotov
3d3e9f373c
Merge pull request #2384 from akortunov/ranks
...
Fix RaiseRank/LowerRank script functions
2019-05-15 01:42:59 +03:00
Capostrophic
5f7343ad7f
Don't break GetSpellEffects execution if the spell doesn't exist
2019-05-14 21:24:03 +03:00
Andrei Kortunov
f775f7977b
Fix RaiseRank/LowerRank script functions (feature #4316 )
2019-05-14 21:43:19 +04:00
Capostrophic
272df29a12
Exit waiting at the correct time when the player is in air
2019-05-14 20:38:41 +03:00
Andrei Kortunov
5266520e20
Merge pull request #2378 from Capostrophic/enchanting
...
Enchanting window stays open after a failed attempt (feature #5034 )
2019-05-14 19:49:09 +04:00
Capostrophic
485ed903c4
Enchanting window stays open after a failed attempt (feature #5034 )
2019-05-14 17:16:37 +03:00
Andrei Kortunov
5ccf7da17a
Merge pull request #2385 from akortunov/master
...
Revert MR !103 and !105
2019-05-14 14:37:09 +04:00
Andrei Kortunov
a79955352f
Revert MR !103 and !105 since they cause issues with dialogue window
2019-05-14 14:22:54 +04:00
Alexei Dobrohotov
fd204fd490
Merge pull request #2382 from Ghostbird/Ghostbird-author
...
De-pseudonymise myself on the authors list
2019-05-13 21:42:07 +03:00
Andrei Kortunov
55767eaf7e
Merge pull request #2380 from Capostrophic/faction
...
Allow scripted faction leaving using PCLowerRank (feature #5036 )
2019-05-13 21:21:47 +04:00
Gijsbert ter Horst
dc8ce4c708
De-pseudonymise myself on the authors list
...
I'm the author of commit 01283f5#151 . At that time I was just about to start a new job, and unsure how open-source contributions would be viewed by my boss. Therefore I made the pull request (but stupidly enough not the commit) under a pseudonymous account, which has since been deleted.
In the end my worries were baseless, and I would like to be listed with my full name on the authors list.
2019-05-13 17:17:04 +00:00
Andrei Kortunov
50c87bacea
Merge pull request #2381 from akortunov/warnfix
...
Fix an exception during reload when container windows is active
2019-05-13 18:14:14 +04:00
Andrei Kortunov
27737d4258
Fix an exception during reload when container windows is active.
...
It is a regression in the animated containers feature.
2019-05-13 17:59:32 +04:00
Alexei Dobrohotov
bb0c989f87
Clear expelled status when leaving faction
2019-05-13 10:22:03 +03:00
Alexei Dobrohotov
d37cb871d6
Fix last-minute typo
2019-05-13 09:50:32 +03:00
Capostrophic
555e43855d
Allow scripted faction leaving using PCLowerRank (feature #5036 )
2019-05-12 20:57:54 +03:00
Alexei Dobrohotov
8920b34b75
Merge pull request #2379 from akortunov/shaders
...
Fix a regression with variable declarations in water shader
2019-05-12 10:04:33 +03:00
Andrei Kortunov
1c545c8f6d
Fix a regression with variable declarations in water shader
2019-05-12 10:22:49 +04:00
Andrei Kortunov
004da85533
Merge pull request #2377 from Capostrophic/armor
...
Armor mitigation tweaks (feature #5033 )
2019-05-11 22:14:57 +04:00
Capostrophic
144b1b9b06
Magic armor mitigation for creatures (feature #5033 )
2019-05-11 19:21:49 +03:00
Capostrophic
c67eb6d9db
Drop bogus accounting for armor rating from weapon priority
2019-05-11 19:06:45 +03:00
Alexei Dobrohotov
4a5e2d1d4e
Merge pull request #2281 from akortunov/shaders
...
Minor water shader fixes
2019-05-11 18:07:58 +03:00
Andrei Kortunov
4af9315672
Merge pull request #2376 from Capostrophic/getweapontype
...
GetWeaponType returns -2 for picks and -3 for probes (feature #5031 )
2019-05-11 17:03:07 +04:00
Capostrophic
62482657fc
GetWeaponType returns -2 for picks and -3 for probes (feature #5031 )
2019-05-11 14:18:29 +03:00
Alexei Dobrohotov
0cea76c684
Merge pull request #2375 from akortunov/warnfix
...
Do not copy pointers during iteration
2019-05-11 14:10:01 +03:00
Andrei Kortunov
ef4042703d
Merge pull request #2373 from Capostrophic/barter
...
Make offered price caps barter-specific (bug #5028 )
2019-05-11 15:05:41 +04:00
Andrei Kortunov
9ba6f5f36c
Do not copy pointers during iteration
2019-05-11 09:44:30 +04:00
Alexei Dobrohotov
1444ef6f43
Merge pull request #2298 from akortunov/optimize
...
Do not allocate eight dummy LightStateAttribute's for every stateset
2019-05-11 02:32:34 +03:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map
...
Do not re-render maps for all active cells during cell transitions
2019-05-11 02:30:38 +03:00
Alexei Dobrohotov
41a50d8ff7
Merge branch 'fix-paths.rst' into 'master'
...
Correct Windows paths in paths.rst to work for all valid configurations
See merge request OpenMW/openmw!107
2019-05-10 19:33:07 +00:00
Andrei Kortunov
44430d9a6f
Merge pull request #2374 from akortunov/docs
...
Correct documentation about animated containers
2019-05-10 22:01:27 +04:00
Andrei Kortunov
31546ef996
Correct documentation about animated containers
2019-05-10 21:54:45 +04:00
Alexei Dobrohotov
fa4bd406a3
Merge branch 'dialogue-ptr-fix' into 'master'
...
Fix MR !103 breaking of dialogue with actors with no greetings
See merge request OpenMW/openmw!105
2019-05-09 23:28:43 +00:00
Phillip A
c4d5203e14
Fix MR !103 breaking of dialogue with actors with no greetings
2019-05-09 23:28:43 +00:00
AnyOldName3
74a93702df
Correct Windows paths in paths.rst to work for all valid configurations
2019-05-09 22:25:43 +00:00
Capostrophic
9d191055bf
Make offered price caps barter-specific (bug #5028 )
2019-05-09 21:19:10 +03:00
Bret Curtis
e0af6532ec
Merge pull request #2371 from Capostrophic/sneak
...
Don't toggle sneaking when controls are disabled
2019-05-07 09:52:21 +02:00
Alexei Dobrohotov
5a37cb6f73
Merge branch 'ingredients_magnitude' into 'master'
...
Do not show magnitude for ingredients
See merge request OpenMW/openmw!104
2019-05-06 23:48:13 +00:00
Frederic Chardon
6619150b23
Do not show magnitude for ingredients
2019-05-06 23:48:13 +00:00
Alexei Dobrohotov
310e19d47f
Merge branch 'ptr-fix' into 'master'
...
Make sure pointers are set before GUI windows are brought up
See merge request OpenMW/openmw!103
2019-05-06 20:33:25 +00:00
Phillip Andrews
a481d2dc1a
Make sure pointers are set before GUI windows are brought up
...
This most noticiably fixes an issue when resting in a bed while levitating.
2019-05-06 14:53:20 -05:00
Alexei Dobrohotov
1d12d778ea
Merge pull request #2370 from akortunov/herbalism
...
Container search tweaks
2019-05-06 22:34:12 +03:00
Capostrophic
4787e6b9a7
Don't toggle sneaking while controls are disabled
2019-05-06 22:30:07 +03:00
Andrei Kortunov
7214f24f5c
Ignore containers, when we search for owner
2019-05-06 23:06:13 +04:00
Andrei Kortunov
abe1009e98
Do not resolve container's content during search
2019-05-06 23:05:31 +04:00
Andrei Kortunov
f49ca98c8c
Merge pull request #2369 from Capostrophic/magiceffect
...
Support negative effect magnitude in spell/ingredient/potion tooltips (bug #5018 )
2019-05-06 08:11:06 +04:00
Capostrophic
cb9d16cf5f
Support negative effect magnitude in spell/ingredient/potion tooltips
2019-05-05 21:27:48 +03:00
Andrei Kortunov
30ea2a2063
Merge pull request #2368 from Capostrophic/teleport
...
Avoid using null pointer for player's cell in moveObjectImp
2019-05-05 18:17:35 +04:00
Capostrophic
458c0bba41
Avoid using null pointer for player's cell in moveObjectImp
2019-05-05 16:43:32 +03:00
Andrei Kortunov
af8a865bab
Merge pull request #2367 from akortunov/docs
...
Add a documentation for extended settings
2019-05-05 17:40:57 +04:00
