AnyOldName3
1e0df23d14
Merge branch 'shadows-bin' into 'master'
...
Use a custom renderbin to avoid pointless OpenGL state switches
See merge request OpenMW/openmw!402
2020-11-13 16:29:41 +00:00
Bret Curtis
68836aa0fd
Update .travis.yml
2020-11-13 16:44:06 +01:00
Bret Curtis
8b0475037d
Update .travis.yml
2020-11-13 16:42:10 +01:00
Evil Eye
94c89e6d5e
check ValueTs
2020-11-13 16:41:45 +01:00
Bret Curtis
e15716eb0c
Update .travis.yml
2020-11-13 16:38:53 +01:00
Bret Curtis
df2ae6e866
Update .travis.yml
2020-11-13 16:29:11 +01:00
Bret Curtis
dee91d12c2
Update .travis.yml
2020-11-13 16:26:08 +01:00
AnyOldName3
fcfd340c69
Actually copy alpha blended drawables to the new stategraph
2020-11-12 23:23:40 +00:00
psi29a
399270694f
Merge branch 'no-colour-fbo-for-shadows' into 'master'
...
Don't bind unnecessary colour buffer when drawing shadow maps
See merge request OpenMW/openmw!403
2020-11-12 22:44:09 +00:00
Evil Eye
d8897c4509
remove inline and use enable_if_t
2020-11-12 20:46:45 +01:00
Evil Eye
d8d4351962
fix MSVC2017 builds
2020-11-12 19:45:32 +01:00
AnyOldName3
55f65752fd
Don't bind unnecessary colour buffer when drawing shadow maps
2020-11-12 17:55:10 +00:00
AnyOldName3
cdbf19a508
Tidy up run-on lines
2020-11-12 17:04:23 +00:00
AnyOldName3
296dce470a
Spelling fix
2020-11-12 16:58:29 +00:00
AnyOldName3
72f7e6a702
Handle all shadow alpha uniforms in shadowsbin
2020-11-12 00:26:30 +00:00
AnyOldName3
5d046bc95d
Mark override
2020-11-11 14:58:06 +00:00
David Cernat
ec2e51825e
[Client] Set DedicatedPlayer's dynamic stats when its Ptr is enabled
...
Previously, players often started out in knockout animations when their Ptrs were first enabled because their fatigue started out at 0 and only updated itself afterwards.
2020-11-11 15:13:14 +02:00
David Cernat
4389d4417a
[Client] Add setStatsDynamic() method to DedicatedPlayer
2020-11-11 14:55:55 +02:00
psi29a
9902945c49
Merge branch 'interpolator' into 'master'
...
Read a few more NIF types
See merge request OpenMW/openmw!401
2020-11-11 09:44:28 +00:00
Alexei Dobrohotov
a46699fb1e
Handle NiGeomMorpherController interpolator list
2020-11-10 23:23:11 +03:00
Alexei Dobrohotov
f3f5dcb016
Read a few more NIF types
...
NiFloatInterpolator, NiPoint3Interpolator, NiTransformInterpolator, NiBoolInterpolator
Update a few existing controller records
Update NiSkinInstance
2020-11-10 22:37:39 +03:00
psi29a
ed8342ebc9
Merge branch 'niffile' into 'master'
...
Remove NIFFile settings manager dependency
See merge request OpenMW/openmw!398
2020-11-10 09:03:10 +00:00
corristo
73e3ee0f85
Merge branch 'update-macos-deps' into 'master'
...
[macOS, CI] Update dependencies, don't use lz4 from Homebrew
See merge request OpenMW/openmw!399
2020-11-10 08:21:47 +00:00
corristo
b8ed3b0059
[macOS, CI] Update dependencies, don't use lz4 from Homebrew
...
Also, enable double precision support for Bullet.
2020-11-10 08:21:46 +00:00
psi29a
10fc3331d5
Merge branch 'settings' into 'master'
...
Remove shader visitor settings manager dependency
See merge request OpenMW/openmw!397
2020-11-09 12:07:59 +00:00
Alexei Dobrohotov
c857588ee9
Remove NIFFile settings manager dependency
2020-11-09 14:24:48 +03:00
Alexei Dobrohotov
b523574090
Remove shader visitor settings manager dependency
2020-11-09 13:59:59 +03:00
psi29a
35115f2f24
Merge branch 'theyretakingthenifstoisengard' into 'master'
...
Read a few more NIF types
See merge request OpenMW/openmw!396
2020-11-09 06:34:07 +00:00
Alexei Dobrohotov
1d07361f08
Read a few more NIF types
...
BSXFlags, NiTransformData, BSBound, BSFadeNode, bhkBlendController
2020-11-09 00:19:35 +03:00
psi29a
6844800124
Merge branch 'nifisjustice' into 'master'
...
NIF updates
See merge request OpenMW/openmw!394
2020-11-08 17:37:54 +00:00
Alexei Dobrohotov
96769ab4a5
Try to reword unsupported NIF loading docs
2020-11-08 20:07:34 +03:00
Alexei Dobrohotov
a38c629425
Read NiSkinPartition
2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
afea11b70a
Read NiStringPalette and NiBoolData
2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
c79f509652
Misc NIF loader improvements
...
Bullet NIF loader cleanup
Collect all extra records of a node
Remove code duplication in geometry type detection in OSG-side NIF loader
2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
7e63afdecf
Allow loading arbitrary NIF files
2020-11-08 13:23:18 +03:00
Alexei Dobrohotov
f6b43b9321
Merge branch 'Changelog_Devs' into 'master'
...
Adds #4083 to the changelog
See merge request OpenMW/openmw!392
2020-11-07 15:15:17 +00:00
psi29a
1b944aeb29
Merge branch 'grammar' into 'master'
...
Improve grammar in [Physics] category of the default settings
See merge request OpenMW/openmw!393
2020-11-07 08:08:25 +00:00
Alexei Dobrohotov
9859565f8d
Improve grammar in [Physics] category of the default settings
2020-11-07 02:18:36 +03:00
David Cernat
a43ba35790
[General] Add placeholder for Variant records in RecordDynamic packet
...
Fix spacing and sorting for Sound custom records.
2020-11-06 11:44:11 +02:00
Atahualpa
64ff09883f
Add #4083 to the changelog. The entry for the release changelog is going to be included in my upcoming MR which will update the whole release changelog.
2020-11-05 13:30:56 +01:00
Bret Curtis
d9fcd3c768
Merge pull request #3026 from akortunov/iterator
...
Rework cure effects
2020-11-04 18:03:45 +01:00
Andrei Kortunov
0e971dccf0
Rework cure effects
2020-11-04 13:51:10 +04:00
Alexei Dobrohotov
37cce328ca
Merge branch 'basicmath' into 'master'
...
Compute the rotation normal relative to the door axe, not the world.
See merge request OpenMW/openmw!391
2020-11-03 14:34:25 +00:00
Bret Curtis
6efa7eea5a
Merge pull request #3025 from akortunov/iterator
...
Do not remove active effects in the active effects loop
2020-11-02 17:12:45 +01:00
Andrei Kortunov
c1d56d94c4
Do not remove active effects in loop (bug #3789 )
2020-11-02 17:51:36 +04:00
Frederic Chardon
ecd10a731e
Compute the rotation normal relative to the door axe, not the world.
2020-11-02 14:12:42 +01:00
psi29a
646760a484
Merge branch 'dont_hold_door' into 'master'
...
Do not block a door when it turns away #4083
See merge request OpenMW/openmw!390
2020-11-01 22:49:56 +00:00
fredzio
18e38d8810
Do not block a door when it turns away.
2020-11-01 23:01:18 +01:00
David Cernat
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
2020-11-01 23:17:59 +02:00
psi29a
ba3aad31c1
Merge branch 'hitdebug' into 'master'
...
Visualize hits in the debug overlay
See merge request OpenMW/openmw!379
2020-11-01 10:20:14 +00:00
