AnyOldName3
3103266406
Add correct preprocessor check when enabling extension
2021-03-13 01:31:35 +00:00
AnyOldName3
0431ba4c87
Merge branch 'alpha-meddling-shader-side-mip-meddling' into alpha-meddling
2021-03-13 01:23:30 +00:00
AnyOldName3
f09b0fc1bd
Put groundcover alphafunc where shader visitor can see it
...
I'd already made this change so don't know why it disappeared instead of
being included in b8ee32e3
2021-03-12 17:21:36 +00:00
AnyOldName3
46a1715d8a
Actually return something
2021-02-26 20:10:58 +00:00
AnyOldName3
f5a87ee46d
Refactor out duplicated RTT setup code
2021-02-26 19:01:27 +00:00
AnyOldName3
4ed67d8597
Improve A2C setting name
2021-02-24 18:01:06 +00:00
AnyOldName3
153ab57ae3
Make assignment in while loop condition obviously intentional
2021-02-24 17:45:44 +00:00
AnyOldName3
9be258d260
Make it possible to reinstate FFP state easily
2021-02-19 19:59:48 +00:00
AnyOldName3
b8ee32e317
Support A2C for groundcover
2021-02-14 23:32:04 +00:00
AnyOldName3
4f510d85ba
Merge remote-tracking branch 'upstream/master' into alpha-meddling
2021-02-14 22:42:55 +00:00
Petr Mikheev
4d3df56bf3
Merge branch 'wizard_morrowind_bsa' into 'master'
...
Wizard: Display an error if Morrowind.bsa is missing
See merge request OpenMW/openmw!571
2021-02-14 10:25:25 +00:00
psi29a
6c487c539e
Merge branch 'static-ci-filename' into 'master'
...
Give binaries static filename
See merge request OpenMW/openmw!607
2021-02-14 09:42:07 +00:00
uramer
e7afbc74d8
Wizard: Only allow to select Morrowind.esm master files, display an error if Morrowind.bsa is missing
2021-02-14 10:34:13 +01:00
AnyOldName3
5e5c0a1d89
Add branch name back to filename
...
The URL needs to contain the branch name anyway, so there's no point
removing it.
2021-02-13 00:28:18 +00:00
AnyOldName3
d47bd54bb5
Merge branch 'move_warning' into 'master'
...
Remove a new warning
See merge request OpenMW/openmw!606
2021-02-12 19:53:21 +00:00
AnyOldName3
0736fec148
Give binaries static filename
2021-02-12 19:21:07 +00:00
fredzio
c4e909c29e
Silence a clang warning:
...
warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
2021-02-12 19:36:03 +01:00
psi29a
5566f2b06b
Merge branch 'optimise-groundcover-lighting' into 'master'
...
Optimise groundcover lighting
See merge request OpenMW/openmw!600
2021-02-11 20:49:45 +00:00
psi29a
57fba8c070
Merge branch 'door_to_nothingness' into 'master'
...
Fallback to default cell name for door destination
Closes #5838
See merge request OpenMW/openmw!591
2021-02-11 08:22:47 +00:00
Evil Eye
2e73d2c145
Fallback to default cell name for door destination
2021-02-10 22:13:04 +01:00
psi29a
c33b2e0100
Merge branch 'dehardcodebaseanim' into 'master'
...
Dehardcode Base_animation and improve Collada support
See merge request OpenMW/openmw!510
2021-02-10 16:29:47 +00:00
AnyOldName3
f8f6d63d4c
Optimise groundcover lighting
2021-02-09 21:56:21 +00:00
Alexei Dobrohotov
a884146878
Merge branch 'master' into 'master'
...
Add unit test for swapEndiannessInplace(). Part of Bug #5837
See merge request OpenMW/openmw!598
2021-02-09 20:34:39 +00:00
Sergey Fukanchik
f3271cb66b
Add unit test for swapEndiannessInplace(). Part of Bug #5837
2021-02-09 13:09:36 -05:00
psi29a
e2ec3b0db7
Merge branch 'missing-inventory-icon' into 'master'
...
Use default icon.tga when inventory icon is missing
Closes #4977
See merge request OpenMW/openmw!596
2021-02-08 08:43:54 +00:00
AnyOldName3
034a7a9dbc
Add changelog entry
2021-02-07 23:45:53 +00:00
AnyOldName3
da6223fc4b
Use default icon.tga when inventory icon is missing
2021-02-07 23:27:45 +00:00
psi29a
4b7d00530d
Merge branch 'freeunrealestate' into 'master'
...
Don't check magicka when casting free spells
Closes #5841
See merge request OpenMW/openmw!589
2021-02-07 21:54:52 +00:00
psi29a
7a9eb34403
Merge branch 'master' into 'freeunrealestate'
...
# Conflicts:
# CHANGELOG.md
2021-02-07 21:03:51 +00:00
psi29a
31f41836a1
Merge branch 'no_stuck_in_proj' into 'master'
...
Don't let projectiles push actors out of the world (#5802 )
See merge request OpenMW/openmw!595
2021-02-07 20:37:46 +00:00
psi29a
21a6922caa
Merge branch 'shieldispain' into 'master'
...
Play damage sound when hurt by elemental shields
Closes #5840
See merge request OpenMW/openmw!594
2021-02-07 20:34:36 +00:00
fredzio
b78820de55
Ignore projectiles inside of MovementSolver::unstuck. It is normal for actors to be inside of a
...
projectile collision shape.
A side effect of moving actors outside of projectile collision shape is that if both the actor and the projectile are
near a wall, the actor could get moved outside of the world.
2021-02-07 18:32:03 +01:00
Evil Eye
997ff37301
Merge branch 'very_minor_docs_change' into 'master'
...
Update 'toggle sneak' documentation
Closes #5844
See merge request OpenMW/openmw!593
2021-02-07 13:04:20 +00:00
Evil Eye
af0f94f03e
Play damage sound when hurt by elemental shields
2021-02-07 12:55:10 +01:00
Jonas Tobias Hopusch
39c2c19dae
Update 'toggle sneak' documentation
...
The docs now correctly say that this setting can be changed in the launcher,
instead of insisting it's a config-file-only setting.
Closes #5844
Signed-off-by: Jonas Tobias Hopusch <jotoho-git@mailbox.org>
2021-02-07 12:53:06 +01:00
psi29a
9bd77e7d2c
Merge branch 'fix_swap_endianness' into 'master'
...
Fix implementation of Misc::swapEndiannessInplace
See merge request OpenMW/openmw!592
2021-02-07 11:26:32 +00:00
Evil Eye
f1caeea444
Don't return negative values from GetMagicka
2021-02-07 11:58:23 +01:00
Petr Mikheev
31b5150e0d
Fix implementation of Misc::swapEndiannessInplace
2021-02-07 09:12:38 +01:00
Evil Eye
e4cd89643f
Merge branch 'master' of gitlab.com:OpenMW/openmw into freeunrealestate
2021-02-07 00:17:14 +01:00
Evil Eye
6aa75c287a
Don't check magicka when casting free spells
2021-02-07 00:15:01 +01:00
psi29a
dc31e1c680
Merge branch 'refraction_shadow_fix_2' into 'master'
...
Fix shadows missing in the refraction RTT on the first and second frame
See merge request OpenMW/openmw!590
2021-02-06 20:26:46 +00:00
AnyOldName3
3e273a759a
Clarify method name now we're using it differently
2021-02-06 16:41:46 +00:00
psi29a
e6607486f5
Merge branch 'jfmherokiller-master-patch-23743' into 'master'
...
Fix the regression involving Cure
See merge request OpenMW/openmw!582
2021-02-06 15:41:24 +00:00
psi29a
f63af685c0
Merge branch 'bemorenegative' into 'master'
...
Allow negative values for ai stats
Closes #5835
See merge request OpenMW/openmw!586
2021-02-06 15:38:34 +00:00
Evil Eye
3007cb14a9
Also allow negative AI values in dialogue
2021-02-05 19:00:35 +01:00
Noah Gooder
e42b67ee50
Modified actors.cpp and Authors.md
2021-02-05 17:59:36 +00:00
Alexei Dobrohotov
ab28847eaf
Merge branch 'collisionextentsandcenter' into 'master'
...
Get collision box extents and center from btBvhTriangleMeshShape
See merge request OpenMW/openmw!579
2021-02-04 23:03:43 +00:00
Alexei Dobrohotov
cc220861e3
Merge branch 'character-preview-opacity-without-shadows' into 'master'
...
Make the dummy texture for the character preview shadow-friendly
See merge request OpenMW/openmw!585
2021-02-04 22:45:58 +00:00
unelsson
303f1912a6
less debug spam
2021-02-04 23:14:52 +02:00
unelsson
d5844b0982
Use accompanying txt file for textkeys in osgAnimation formats
2021-02-04 23:14:21 +02:00
