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
jvoisin
23e279c23e
Merge branch 'darling_violetta' into 'master'
...
Replace magic numbers with enums
Closes #6523
See merge request OpenMW/openmw!1512
2021-12-29 12:34:12 +00:00
Evil Eye
6f870a464b
Replace magic numbers with enums
2021-12-29 12:34:12 +00:00
psi29a
cfa3c4f4a3
Merge branch 'deltravis' into 'master'
...
Get rid of travis-ci
See merge request OpenMW/openmw!1515
2021-12-28 11:55:29 +00:00
jvoisin
adefd0c9ca
Get rid of travis-ci
2021-12-28 11:55:28 +00:00
Evil Eye
dc946d0a47
Fix Dagoth Ur's Fire Shield not being visible
2021-12-27 22:30:25 +01:00
jvoisin
91b2e20477
Merge branch 'fix_coverity_issues' into 'master'
...
Fix coverity issues
See merge request OpenMW/openmw!1513
2021-12-27 16:08:00 +00:00
elsid
ba281a0da0
Fix coverity issues
2021-12-27 16:08:00 +00:00
Evil Eye
debdcf2953
Don't touch base stats when turning into a werewolf
2021-12-27 00:47:33 +01:00
Evil Eye
c166341ec0
Merge branch 'gh_sync' into 'master'
...
Resovles #6519 Do not display effects duration for ingredient
See merge request OpenMW/openmw!1506
2021-12-26 19:50:20 +00:00
psi29a
81c9ef947f
Resovles #6519 Do not display effects duration for ingredient
2021-12-26 19:50:19 +00:00
psi29a
01ac96e900
Merge branch 'stats_gave_me_a_headache' into 'master'
...
Make Set- and ModStat behave as they should
Closes #2036
See merge request OpenMW/openmw!1410
2021-12-26 19:47:09 +00:00
Evil Eye
93e355801d
Merge branch 'fix' into 'master'
...
Fix compilation error on windows: cannot convert from 'std::filesystem::path'...
See merge request OpenMW/openmw!1510
2021-12-26 18:04:21 +00:00
Petr Mikheev
7fe5351f55
Fix compilation error on windows: cannot convert from 'std::filesystem::path'...
2021-12-26 18:04:20 +00:00
Evil Eye
ea5bd822c2
Merge branch 'rehashrehashing' into 'master'
...
Rehash morph loading rehashing
See merge request OpenMW/openmw!1509
2021-12-26 17:09:44 +00:00
psi29a
d16819a5b0
Merge branch 'wilderness' into 'master'
...
Don't teleport NPCs to unknown cells
Closes #6521
See merge request OpenMW/openmw!1507
2021-12-26 15:27:25 +00:00
Evil Eye
ac747f02f3
Don't teleport NPCs to unknown cells
2021-12-26 15:27:25 +00:00
Alexei Dobrohotov
9b2978f143
Rehash morph loading rehashing
2021-12-26 17:56:19 +03:00
psi29a
4b70e67c34
Merge branch 'o0_coverity' into 'master'
...
Use `-O0` when compiling with coverity
See merge request OpenMW/openmw!1508
2021-12-26 13:58:06 +00:00
jvoisin
c61967a316
Use -O0 when compiling with coverity
2021-12-26 14:51:40 +01:00
jvoisin
1b58e10b28
Merge branch 'coverity_use_clang' into 'master'
...
have coverity use clang instead of gcc
See merge request OpenMW/openmw!1505
2021-12-26 13:26:36 +00:00
psi29a
a2a45ccdb3
have coverity use clang instead of gcc
2021-12-26 13:26:35 +00:00
psi29a
4e3e2598a2
Merge branch 'fix_6502' into 'master'
...
Fix #6502
Closes #6502
See merge request OpenMW/openmw!1491
2021-12-26 12:40:38 +00:00
AnyOldName3
fa05b0b96c
Include <atomic>
...
Should fix compilation on CI
2021-12-26 02:10:37 +00:00
AnyOldName3
0e29a760d8
Tidy up includes
2021-12-26 02:09:14 +00:00
