Alexei Dobrohotov
|
8a6d3d1b4f
|
Minor fixes
Fix extra semicolon
Disable collision avoidance if AI is disabled
|
2020-11-13 22:53:12 +03:00 |
|
AnyOldName3
|
981fffe590
|
Merge branch 'itsakindoftemplatemagic' into 'master'
Fix MSVC2017 builds
See merge request OpenMW/openmw!404
|
2020-11-13 17:22:22 +00:00 |
|
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 |
|
Evil Eye
|
94c89e6d5e
|
check ValueTs
|
2020-11-13 16:41:45 +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 |
|
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 |
|
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 |
|
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 |
|
psi29a
|
7ee7041399
|
Merge branch 'stretch' into 'master'
Put a stretch menu background checkbox into the launcher (#5672)
Closes #5672
See merge request OpenMW/openmw!387
|
2020-11-01 09:26:19 +00:00 |
|
Alexei Dobrohotov
|
f49bf028b9
|
Put a stretch menu background checkbox into the launcher (#5672)
|
2020-11-01 02:14:25 +03:00 |
|
Alexei Dobrohotov
|
53f91a3aa5
|
Merge pull request #3018 from akortunov/emplace
Use emplace_back instead of push_back
|
2020-11-01 01:58:56 +03:00 |
|
Alexei Dobrohotov
|
942334c489
|
Merge branch 'changelog' into 'master'
Add missing changelog entries
See merge request OpenMW/openmw!386
|
2020-10-31 22:48:41 +00:00 |
|
Alexei Dobrohotov
|
73f866fc65
|
Add missing changelog entries
|
2020-11-01 01:32:36 +03:00 |
|
AnyOldName3
|
449506fef1
|
Attempt to explain what shadowsbin is doing
|
2020-10-31 19:06:20 +00:00 |
|
AnyOldName3
|
3c5d025849
|
Merge branch 'fallinglift' into 'master'
Unbreak elevators (#5670)
See merge request OpenMW/openmw!385
|
2020-10-31 00:12:26 +00:00 |
|