psi29a
dc1bd8ec29
Merge branch 'osgAnimation_basics' into 'master'
...
Collada animation support
See merge request OpenMW/openmw!421
2020-11-28 16:55:26 +00:00
Nelsson Huotari
55dcc6582a
Don't duplicate getFileExtension, use OpenMW's namespaces
2020-11-28 15:03:10 +02:00
Mads Buvik Sandvei
46cbb5dc74
Merge branch 'openxr_vr_clang_fixes' into 'openxr_vr'
...
Openxr vr clang fixes
See merge request madsbuvi/openmw!11
2020-11-28 11:22:21 +00:00
Mads Buvik Sandvei
2a5e552fd0
Openxr vr clang fixes
2020-11-28 11:22:21 +00:00
Mads Buvik Sandvei
d2dd01d514
Merge branch 'openxr_vr_silence_android_ninja' into 'openxr_vr'
...
Openxr vr silence android ninja
See merge request madsbuvi/openmw!10
2020-11-28 11:21:40 +00:00
Mads Buvik Sandvei
09b7884116
Openxr vr silence android ninja
2020-11-28 11:21:40 +00:00
Alexei Dobrohotov
5b6377b061
Handle multiple root nodes (bug #5604 )
2020-11-28 13:25:39 +03:00
Mads Buvik Sandvei
01add8023e
derp fix
2020-11-28 00:25:34 +01:00
Mads Buvik Sandvei
04711180bd
Continue use of ifdef pragmas until i feel like cleaning up build rules
2020-11-27 23:08:08 +01:00
Mads Buvik Sandvei
259330ab14
Drop MyGUI 3.4 requirement. Manage layer and widget focus manually.
2020-11-27 21:47:20 +01:00
Bret Curtis
829560fe5e
Merge pull request #3028 from akortunov/read_errors
...
Rework file error messages handling
2020-11-27 11:00:34 +01:00
Mads Buvik Sandvei
02c7e8ed2a
Merge branch 'openxr_vr' of https://gitlab.com/madsbuvi/openmw into openxr_vr
2020-11-27 00:36:22 +01:00
Mads Buvik Sandvei
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-11-27 00:36:10 +01:00
Mads Buvik Sandvei
18cb50ae3c
Merge remote-tracking branch 'remotes/origin/openxr_vr_gccfixes' into openxr_vr
2020-11-27 00:34:51 +01:00
Mads Buvik Sandvei
349bee3138
Fix for issue #50 , doors not working when object paging active grid is enabled
2020-11-27 00:33:31 +01:00
Andrei Kortunov
4acd910b37
Rework file error messages handling
2020-11-26 18:53:56 +04:00
Mads Buvik Sandvei
77e18a7f4b
Gcc fixes
2020-11-24 20:02:17 +01:00
psi29a
96e22bd44e
Merge branch 'fastforwardpos' into 'master'
...
Discard physics simulation results after fast forward
See merge request OpenMW/openmw!423
(cherry picked from commit ff2d7695698341ef059c75707aa092cef48deea4)
03a37433 In case of time fast forward (resting, jail), force reset of positions
2020-11-23 20:15:44 +00:00
Mads Buvik Sandvei
acdce6e0d0
Refactored OpenXRSwapchainImpl to use two private objects that instantiate a swapchain, instead of instantiating two swapchains directly. Added handling of runtime failures in xrAcquireSwapchain(), xrWaitSwapchain(), and xrReleaseSwapchain().
2020-11-22 15:23:11 +01:00
AnyOldName3
f8c791fde3
Merge branch 'physics_worker_profile' into 'master'
...
Add the async physics worker to the profiler overlay.
See merge request OpenMW/openmw!422
2020-11-21 00:18:44 +00:00
Frederic Chardon
9aba55a21a
Add the async physics worker to the profiler overlay.
2020-11-20 21:17:47 +01:00
psi29a
d0b29cf254
Merge branch 'spellSearchExtension' into 'master'
...
Improve spell/magic item search to factor in magic effect names
See merge request OpenMW/openmw!417
2020-11-20 19:38:42 +00:00
Nelsson Huotari
08dcbe30b3
Earlier nullptr check
2020-11-20 19:46:08 +02:00
Nelsson Huotari
3232faa703
Use const ref instead of value
2020-11-20 19:41:01 +02:00
Nelsson Huotari
32d4344803
Don't copy osga-data in base class keyframecontroller, fix warnings.
2020-11-20 19:38:29 +02:00
jefetienne
bc6f46465f
Add to changelog, authors. Move variable declaration inside block
2020-11-19 10:34:15 -05:00
jefetienne
2413de38b5
Extend spell/item search to search by magic effect name
2020-11-19 10:34:15 -05:00
psi29a
f95d2cf54c
Merge branch 'update_recastnavigation' into 'master'
...
Update recastnavigation
See merge request OpenMW/openmw!420
2020-11-19 06:44:46 +00:00
Nelsson Huotari
6e77ad1f6a
OSG-Collada animation support
2020-11-19 01:11:56 +02:00
Nelsson Huotari
f78a5d795c
Separate keyframes logic to provide basis for osgAnimation integration.
2020-11-18 22:48:47 +02:00
Mads Buvik Sandvei
74dab2c954
Update README.md
2020-11-18 20:02:11 +00:00
AnyOldName3
37661bffea
Merge branch 'shadowdisable-fix' into 'master'
...
Make disableShadowsForStateSet a no-op when shadows are disabled
See merge request OpenMW/openmw!205
2020-11-18 18:56:36 +00:00
psi29a
c69b407f8c
Merge branch 'close_the_window_before_you_destroy_the_world' into 'master'
...
Don't unload the world before closing containers
Closes #5689
See merge request OpenMW/openmw!419
2020-11-18 18:19:46 +00:00
psi29a
642cf8ff8e
Merge branch 'debian-gcc-first-time-timeout' into 'master'
...
Fix Debian GCC timeout on forks
See merge request OpenMW/openmw!416
2020-11-18 18:16:49 +00:00
Mads Buvik Sandvei
558b95e5f1
Merge branch 'openxr_vr' into 'openxr_vr'
...
Nicer VR meta menu
See merge request madsbuvi/openmw!9
2020-11-18 18:10:50 +00:00
psi29a
881bc49e0b
Merge branch 'no-dynamic' into 'master'
...
Make Bullet DebugDrawer's default state match the physics system
See merge request OpenMW/openmw!418
2020-11-18 18:10:31 +00:00
Mads Buvik Sandvei
e5747d572a
Merge branch 'index-binding-image' into 'openxr_vr'
...
Added binding image for Valve Index controllers
See merge request madsbuvi/openmw!8
2020-11-18 18:09:59 +00:00
elsid
9b11b8a27b
Fix boundary check
2020-11-18 18:52:00 +01:00
elsid
9363bc2d48
Update recastnavigation to 6624e7aef5e15df11cb2f5673574df8e4c96af6a
2020-11-18 18:03:29 +01:00
Evil Eye
c126d8801f
Fix #5689
2020-11-18 17:28:09 +01:00
AnyOldName3
06d1e70aac
Make Bullet DebugDrawer's default state match the physics system
2020-11-18 15:34:21 +00:00
uramer
ce455e7aaa
Nicer VR meta menu
2020-11-17 23:20:32 +01:00
psi29a
86dc6f7512
Merge branch 'nine-ten-eleven-twelve' into 'master'
...
Fix extraction with 7z 9.10
See merge request OpenMW/openmw!415
2020-11-17 17:04:30 +00:00
AnyOldName3
48ea9960b9
Fix Debian GCC timeout on forks
2020-11-17 16:45:13 +00:00
AnyOldName3
211894a178
Fix extraction with 7z 9.10
...
This is still used in the wild as lots of people install 7zip and never update it because it works. We can't check the version and abort if it's too old as the changelog doesn't make it clear which version fixed the behaviour.
2020-11-17 16:14:05 +00:00
Dean Allen
a6b5fbbdf8
Added binding image for Valve Index controllers
2020-11-17 00:16:06 -08:00
psi29a
8f2701c24b
Merge branch 'sewer-water-isn't-that-clear' into 'master'
...
Set dummy state when disabling shadows indoors
Closes #5688
See merge request OpenMW/openmw!412
2020-11-16 21:56:05 +00:00
AnyOldName3
06ae2a0536
Add changelog entry
2020-11-16 21:07:30 +00:00
AnyOldName3
7768556ce6
Set dummy state when disabling shadows indoors
...
As we don't reconfigure all shaders without shadows when we disable them
indoors (as it'd probably add a hitch to transitioning in and out) we
need to set up dummy state so the shaders don't do anything illegal.
This hadn't had symptoms for most objects as when indoors, nearly
everything would be drawn first in one of the water RTTs, which had
dummy state to disable shadows already. This wasn't true of the water
plane itself, though, yet somehow it took until just now for anyone to
report that.
This resolves vtastek's issue where the water would be invisible indoors
2020-11-16 21:01:20 +00:00
psi29a
894bcb8bcc
Merge branch 'fix_the_fix's_fix' into 'master'
...
Don't fall while teleporting
See merge request OpenMW/openmw!411
2020-11-16 13:57:33 +00:00
