Bret Curtis
6672014a51
make this great again
2022-01-06 15:02:24 +01:00
psi29a
d8d7a3b372
Merge branch 'softparticles_patch' into 'master'
...
Shadervisitor adjustments and Mac OS fix for soft particles
See merge request OpenMW/openmw!1380
2022-01-06 13:13:52 +00:00
psi29a
6a2cf2e358
Merge branch 'task/#6088_ffmpeg_api_deprecation_warnings' into 'master'
...
#6088 ffmpeg api deprecation warnings
Closes #6088
See merge request OpenMW/openmw!1504
2022-01-06 13:08:45 +00:00
psi29a
1d4de71d35
Merge branch 'fix2' into 'master'
...
Fixes in components/lua
Closes #6535
See merge request OpenMW/openmw!1538
2022-01-06 08:49:17 +00:00
psi29a
555e0b1f53
Merge branch 'brainfreeze' into 'master'
...
Attempt to catch freezes on Windows
See merge request OpenMW/openmw!1493
2022-01-06 08:47:23 +00:00
Petr Mikheev
6a19a66ae5
Fix #6535
2022-01-05 20:08:03 +01:00
Petr Mikheev
5eca122f04
Avoid creating multiple i18n contexts with the same name.
2022-01-05 19:50:52 +01:00
jvoisin
b56406b0ad
Merge branch 'deadcode' into 'master'
...
Remove dead code
See merge request OpenMW/openmw!1537
2022-01-05 18:29:23 +00:00
Evil Eye
cd6edb961a
Remove dead code
2022-01-05 17:22:22 +01:00
Bret Curtis
f0db576611
removed redundant get on smart pointer; made pictq_[r|w]index unsigned longs to be type compatible with std::array pictq.size(); fixes assert issue
2022-01-05 12:19:22 +01:00
psi29a
bafde5c9c4
Merge branch 'cleanup' into 'master'
...
Remove constant conditions
See merge request OpenMW/openmw!1527
2022-01-05 10:48:13 +00:00
psi29a
8355153047
Merge branch 'const_looop' into 'master'
...
Fix "warning: loop variable is copied but only used as const reference;...
See merge request OpenMW/openmw!1530
2022-01-05 10:44:44 +00:00
jvoisin
1a6be08149
Fix "warning: loop variable is copied but only used as const reference;...
2022-01-05 10:44:44 +00:00
psi29a
e0612db01c
Merge branch 'viewport_update' into 'master'
...
Use updated resolutions when setting projection matrix
See merge request OpenMW/openmw!1533
2022-01-05 10:43:30 +00:00
Cody Glassman
a7166aa05c
Use updated resolutions when setting projection matrix
2022-01-05 10:43:30 +00:00
psi29a
24b9c91ef8
Merge branch 'fix_copy_init' into 'master'
...
Fix unnecessary-copy-initialization
See merge request OpenMW/openmw!1531
2022-01-05 09:05:57 +00:00
psi29a
5eba352c98
Merge branch 'correct_depth_function' into 'master'
...
Use correct depth functions (#6537 )
Closes #6537
See merge request OpenMW/openmw!1534
2022-01-05 08:38:05 +00:00
psi29a
d8cc08a7a0
Merge branch 'ripple_fix' into 'master'
...
Fix persistent ripples (#6531 )
Closes #6531
See merge request OpenMW/openmw!1535
2022-01-05 08:37:27 +00:00
Bret Curtis
bae8713998
make use of std::array pictq.size() instead of VIDEO_PICTURE_ARRAY_SIZE; remove redundant smart-pointer .get calls; fix typos
2022-01-05 09:29:10 +01:00
Bret Curtis
4eea734551
Resolves #6088 by rolling our own PacketList that replaces the deprecated AVPacketList; initial work done by akortunov in 60aec04606; adapted and cleaned up some old cruft along the way.
2022-01-05 09:29:10 +01:00
glassmancody.info
909aa43ba1
update sky particle node correctly
2022-01-04 14:10:39 -08:00
Evil Eye
c3d3535ffd
Merge branch 'double_float_conv' into 'master'
...
Fix unnecessary float-to-double promotion
See merge request OpenMW/openmw!1532
2022-01-04 22:01:53 +00:00
jvoisin
27af776735
Fix unnecessary float-to-double promotion
2022-01-04 22:01:52 +00:00
glassmancody.info
2c52695361
fix regression where LEQUAL was used instead of LESS for depth function
2022-01-04 12:23:37 -08:00
jvoisin
421e6629ad
Fix unnecessary-copy-initialization
...
> warning: the variable 'key' is copy-constructed from a const reference but is
only used as const reference; consider making it a const reference
[performance-unnecessary-copy-initialization]
Found by clang-tidy.
2022-01-04 20:42:09 +01:00
psi29a
0eed275b74
Merge branch 'spammy' into 'master'
...
Remove -bugprone-narrowing-conversions from clang-tidy
See merge request OpenMW/openmw!1529
2022-01-04 19:32:50 +00:00
jvoisin
40faf54250
Remove -bugprone-narrowing-conversions from clang-tidy
2022-01-04 19:32:49 +00:00
psi29a
b6572fbe42
Merge branch 'warning' into 'master'
...
Silence a signed/unsigned mismatch warning
See merge request OpenMW/openmw!1528
2022-01-04 17:13:01 +00:00
Evil Eye
5a7a3a0d2d
Silence a signed/unsigned mismatch warning
2022-01-04 17:11:55 +01:00
Evil Eye
bdfad27e05
Remove constant conditions
2022-01-04 16:50:04 +01:00
psi29a
d482766fe2
Merge branch 'full_coverity' into 'master'
...
Update .gitlab-ci.yml
See merge request OpenMW/openmw!1526
2022-01-04 14:28:35 +00:00
psi29a
e743f896ef
Update .gitlab-ci.yml
2022-01-04 10:48:25 +00:00
psi29a
476d8b7e86
Merge branch 'fix_asan_error' into 'master'
...
Fix ASAN error: heap-use-after-free
See merge request OpenMW/openmw!1495
2022-01-04 10:29:37 +00:00
psi29a
0766e1310b
Merge branch 'lunacy' into 'master'
...
Don't touch base stats when turning into a werewolf
Closes #6333
See merge request OpenMW/openmw!1511
2022-01-04 10:27:48 +00:00
psi29a
e16245278e
Merge branch 'lit_ur' into 'master'
...
Fix Dagoth Ur's Fire Shield not being visible
See merge request OpenMW/openmw!1514
2022-01-04 10:22:45 +00:00
psi29a
2e43a1278b
Merge branch 'cpp17_on_mac' into 'master'
...
Update CI/before_script.osx.sh to allow full use of c++17 on macOS
See merge request OpenMW/openmw!1523
2022-01-04 09:14:16 +00:00
psi29a
1816784784
Update CI/before_script.osx.sh to allow full use of c++17 on macOS
2022-01-04 09:14:16 +00:00
psi29a
0dc4a668c3
Merge branch 'moralizing' into 'master'
...
Fix demoralize and rally being swapped
Closes #6532
See merge request OpenMW/openmw!1524
2022-01-04 08:49:10 +00:00
psi29a
74e1e1eefd
Merge branch 'recast_my_friends' into 'master'
...
Only prevent recasting by the actor who cast the spell
See merge request OpenMW/openmw!1525
2022-01-04 08:48:19 +00:00
Petr Mikheev
d1252090a4
Merge branch 'blendtec_tures' into 'master'
...
Shader-based object texture blending
See merge request OpenMW/openmw!977
2022-01-03 21:41:27 +00:00
Evil Eye
aab0473c28
Only prevent recasting by the actor who cast the spell
2022-01-03 21:05:14 +01:00
Evil Eye
97ab7cf457
Fix demoralize and rally being swapped
2022-01-03 19:17:56 +01:00
Petr Mikheev
f91bd8d9eb
Merge branch 'lua_on_mac' into 'master'
...
Update extern/i18n.lua/CMakeLists.txt to be like the rest... (make i18n work on macOS)
See merge request OpenMW/openmw!1522
2022-01-03 11:53:07 +00:00
psi29a
e4ee6ab0c1
Update extern/i18n.lua/CMakeLists.txt to be like the rest... (make i18n work on macOS)
2022-01-03 11:53:07 +00:00
psi29a
b0e2820340
Merge branch 'lua_i18n' into 'master'
...
Lua i18n
Closes #6504
See merge request OpenMW/openmw!1520
2022-01-03 09:14:45 +00:00
Petr Mikheev
0f246e7365
Use a separate instance of Lua i18n for every context
2022-01-02 09:58:51 +01:00
glassmancody.info
d5cba38f4b
shader-based object texture blending
2021-12-30 17:08:43 -08:00
Petr Mikheev
f91a5499d3
Add extern/i18n.lua
2021-12-30 00:37:54 +01:00
AnyOldName3
14a330609f
ShaderVisitor improvements
...
* Adds comments explaining the less-than-obvious aspects.
* Adds comments explaining what to do when adding new stuff.
* Some fixes caused by those comments not historically existing.
* Add a TODO comment to something which may catch fire in the future.
2021-12-29 13:45:42 -08:00
Frederic Chardon
63bf4bf868
Solve 2 bugs in projectile movement simulation:
...
- properly initialize mSimulationPosition in the constructor. Unlucky thread scheduling can cause processHits to be called before the first simulation run, causing the projectile to vanish to whatever value the variable happens to contains.
- don't continue moving the projectile after a hit. The position would continue to be updated to some senseless value.
2021-12-29 15:20:44 +01:00
