Alexei Dobrohotov
b29e797b27
Merge branch 'seventh_time_is_the_charm' into 'master'
...
Unbreak again NPC teleport
See merge request OpenMW/openmw!760
2021-04-18 16:36:11 +00:00
Petr Mikheev
5fe10e8e7f
Merge branch 'fix-headtracking' into 'master'
...
Fix headtracking while invisible
See merge request OpenMW/openmw!743
2021-04-18 10:54:57 +00:00
Jacob Turnbull
f49b9e3806
Fix headtracking while invisible
2021-04-18 10:54:56 +00:00
fredzio
36bb2d5f15
An actor needs not be in active cell. As such we can't use
...
PhysicsSystem::getActor() to determine that a ptr is not actor.
2021-04-18 08:45:43 +02:00
psi29a
50db75bd13
Merge branch 'settingstocs_csmprefs' into 'master'
...
Dehardcode animations in OpenMW-CS (CSMPrefs method)
See merge request OpenMW/openmw!742
2021-04-17 20:00:07 +00:00
Andrei Kortunov
57b501ad13
Merge pull request #3067 from akortunov/master
...
Limit pointers cache size to avoid possible bad_alloc errors
2021-04-17 10:31:47 +04:00
unelsson
06fda4c5a1
QLineEdit for setting base animation files
2021-04-16 23:12:14 +03:00
unelsson
95272e0f14
String setting to CSMPrefs, part of dehardcoding animation files
2021-04-16 23:12:14 +03:00
psi29a
d0883f9a0d
Merge branch 'light_settings_tweak' into 'master'
...
Lighting patch
Closes #5957 and #5959
See merge request OpenMW/openmw!752
2021-04-16 19:47:26 +00:00
glassmancody.info
16856d45c5
Lighting Patch
...
Fixes build errors with older OSG builds and some issues with 'shared' layout.
Bring back ambient in inventory through lightmodel instead of sun ambient, mirrors scene ambient/sunlight relationship.
Forces shaders when certain lighting methods are enabled and finalize settings.
Correctly override sun for localmap.
2021-04-16 11:55:40 -07:00
fredzio
f137b7341f
Another fallout from MR 722: objects were treated like actors by
...
accident. Net effect was that calls to Move/MoveWorld didn't update
position of collision object.
2021-04-16 16:12:31 +02:00
Andrei Kortunov
5de72c94ab
Limit pointers cache size to avoid possible bad_alloc errors
2021-04-16 08:10:31 +04:00
psi29a
af8bc7d120
Merge branch 'fixagainsetposforgoodthistimeitwillnotbreakanything' into 'master'
...
Fix #5961 : Follow up MR 722: do not apply mPositionOffset twice when we teleport.
Closes #5961
See merge request OpenMW/openmw!744
2021-04-15 22:09:44 +00:00
fredzio
e31cf7e6ac
Follow up MR 722: do not apply mPositionOffset twice when we teleport.
...
Previous MR change the meaning of mPositionOffset: it is now just a log
of relative movement that were already applied to allow the physics
simulation to catch up, instead of changes that needs to be applied. As
such, after a teleport we need to reset it. Also, since mWorldPosition
is already with the offset we should not update its value in
applyPositionOffset().
2021-04-15 22:32:42 +02:00
Andrei Kortunov
33b8233887
Validate GUI scaling and place it to the launcher
2021-04-15 15:18:32 +04:00
Andrei Kortunov
db1428de18
Move container unresolving to the separate method
2021-04-14 23:03:35 +04:00
Bret Curtis
4f72fa2615
Merge pull request #3063 from akortunov/master
...
Code cleanup, part 2
2021-04-14 10:03:07 +02:00
fredzio
9d8fcec642
Remove bogus warning. It is a normal situation for projectiles to be
...
in-flight after the caster is gone.
2021-04-14 09:01:37 +02:00
Andrei Kortunov
016a1d45df
Remove outdated field - remnant from earlier implementation
2021-04-14 10:58:44 +04:00
Andrei Kortunov
388573cf60
Fix uninitialized fields in the essimporter
2021-04-14 08:07:08 +04:00
elsid
0fae6d9a0a
Add walk and swim flags when corresponding speed is positive
...
This allows to avoid finding path over area that will should have infinite
cost (area_cost = area_cost_factor / area_speed).
2021-04-13 23:27:18 +02:00
elsid
3c4a9069ae
Do not use infinite area cost
...
Division by zero causes float value to be infinite. When infinite cost is
multiplied by zero distance the result is NaN. After this pathfinding algorithm
state is broken.
2021-04-13 23:27:18 +02:00
psi29a
f1cfdafd4d
Merge branch 'why_are_the_christmas_lights_still_up' into 'master'
...
Remove 8 light limit and add configurable lighting enhancements
See merge request OpenMW/openmw!618
2021-04-13 19:15:08 +00:00
glassmancody.info
531a6e1979
Code review fixes, remove implicit GLSL casts
2021-04-13 11:09:54 -07:00
glassmancody.info
582f7b52cf
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:09:52 -07:00
glassmancody.info
9e80091aff
clear up force shaders and make it less convoluted
2021-04-13 11:09:49 -07:00
glassmancody.info
b7adb9d088
use true default settings
2021-04-13 11:09:49 -07:00
glassmancody.info
d4e7d25d14
Make life not suck for whoever wants to edit lighting shaders
2021-04-13 11:09:49 -07:00
glassmancody.info
16f80ec6f3
Update settings when using fallback
2021-04-13 11:09:49 -07:00
glassmancody.info
4ba473b684
Finalize settings, torch fix
2021-04-13 11:09:49 -07:00
glassmancody.info
71c30a31df
in-game settings, some require restart
2021-04-13 11:09:49 -07:00
glassmancody.info
3d713e8602
Fix incorrect minimum ambient
2021-04-13 11:09:49 -07:00
glassmancody.info
280fd2b162
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:09:35 -07:00
glassmancody.info
cc31e1eea1
Ambient luminance threshold setting
2021-04-13 11:09:35 -07:00
glassmancody.info
690995988b
More formatting, OpenCS cells are unbroken
2021-04-13 11:09:35 -07:00
glassmancody.info
142c6d2993
Enable groundcover lighting for non FFP
2021-04-13 11:09:35 -07:00
glassmancody.info
328ec85757
Code review cleanup, add setting documentation
2021-04-13 11:09:35 -07:00
glassmancody.info
7370acdf54
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:09:19 -07:00
glassmancody.info
43ac32921c
Rewrite, support different lighting methods
2021-04-13 11:09:19 -07:00
glassmancody.info
9d9074c244
Add shared UBO
2021-04-13 11:07:48 -07:00
glassmancody.info
c5ea966f24
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
2021-04-13 11:06:16 -07:00
glassmancody.info
dda735c54a
initial commit
2021-04-13 11:06:16 -07:00
psi29a
0a6ef9c1bd
Merge branch 'swim_when_follow' into 'master'
...
Allow actors to find path over water surface (#5943 )
See merge request OpenMW/openmw!731
2021-04-13 07:19:54 +00:00
Evil Eye
56ede535b5
Don't perform a hit test outside the page's bounds
2021-04-12 08:31:45 +02:00
psi29a
0818a10df2
Merge branch 'baby_dont_throw_me_no_more' into 'master'
...
Catch exceptions in ResolutionListener
Closes #5946
See merge request OpenMW/openmw!727
2021-04-12 06:12:19 +00:00
elsid
28fc21792e
Allow water walking actors to find path over water surface
2021-04-11 21:59:28 +02:00
elsid
634556be9d
Add setting to allow following creatures to find path over water surface
2021-04-11 21:59:28 +02:00
fredzio
32981bcd88
Constify a few things
2021-04-11 14:46:51 +02:00
fredzio
efb241f1de
Use override instead of virtual
2021-04-11 14:46:51 +02:00
fredzio
fda639eb57
Remove unused forward declarations
2021-04-11 14:46:51 +02:00