1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-24 01:23:53 +00:00
Commit graph

27759 commits

Author SHA1 Message Date
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
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
psi29a
a3d3c29ff9 Merge branch 'only_cmake' into 'master'
Only run static jobs when cmake-related things are modified

Closes #6492

See merge request OpenMW/openmw!1498
2021-12-25 16:00:56 +00:00
psi29a
5c67c5316d Merge branch 'issue_6501' into 'master'
Fix Stuttering in the dialogue menu #6501

See merge request OpenMW/openmw!1492
2021-12-25 16:00:15 +00:00
psi29a
04346b43b0 Merge branch 'keychain' into 'master'
Rehash key group and morph loading (bug #6517)

Closes #6517

See merge request OpenMW/openmw!1500
2021-12-25 15:58:57 +00:00
psi29a
9ba093a438 Merge branch 'fix-tutorial-docs' into 'master'
Fix links in the collada documentation.

See merge request OpenMW/openmw!1501
2021-12-25 15:57:40 +00:00
psi29a
5386124a56 Merge branch 'gold_plz' into 'master'
Automatically drop workaround when the format is next updated

See merge request OpenMW/openmw!1502
2021-12-25 15:48:40 +00:00
Evil Eye
c1f59b1221 Automatically drop workaround when the format is next updated 2021-12-24 23:17:50 +01:00
Matjaž Lamut
58697d98b2 Fix links in the collada documentation. Exporter now points to OpenMW's official repo and the example suite link now points to the actual place it needs to. 2021-12-24 18:16:34 +00:00
myrix
88fc038ceb with mutable, without World and ESMStore interface change 2021-12-24 12:04:26 +03:00
Alexei Dobrohotov
26dfce1114 Rehash key group and morph loading (bug #6517) 2021-12-24 07:21:30 +03:00
myrix
9c7835e27f explicit instantiation error fix 2021-12-24 02:04:26 +03:00
myrix
27cc7a5172 caching dialog keyword search in Store<ESM::Dialogue> 2021-12-24 00:54:00 +03:00
Petr Mikheev
b06248a31f Fix #6502 2021-12-23 12:33:14 +01:00
jvoisin
826553f2be Merge branch 'more_silencer' into 'master'
Silence `apt-get install` even more

See merge request OpenMW/openmw!1499
2021-12-22 22:43:24 +00:00
jvoisin
c9fb4ee2ed Silence apt-get install even more 2021-12-22 22:43:23 +00:00
jvoisin
ca45391079 Only run static jobs when cmake-related things are modified 2021-12-22 12:01:22 +01:00
AnyOldName3
f05cd901cf Show messagebox while OpenMW appears to be frozen
If it thaws, the messagebox disappears again.
The user can press the Abort button to kill OpenMW and generate a crash
dump.
2021-12-21 23:19:13 +00:00
jvoisin
bf019bf280 Merge branch 'factorise_apt' into 'master'
Factorise `add-apt-repository -y ppa:openmw/openmw`

See merge request OpenMW/openmw!1494
2021-12-21 14:53:31 +00:00
jvoisin
766cb52523 Factorise add-apt-repository -y ppa:openmw/openmw 2021-12-21 14:53:31 +00:00
psi29a
da3c718fe2 Merge branch 'i_am_the_caster_now' into 'master'
Preserve the original caster if classic reflected absorb spells behaviour is on

Closes #6511

See merge request OpenMW/openmw!1497
2021-12-21 12:01:09 +00:00
Evil Eye
55b066d2bd Preserve the original caster if classic reflected absorb spells behaviour is on 2021-12-21 10:50:28 +01:00
psi29a
ef60f2d191 Merge branch 'doc-static-models' into 'master'
Documentation: how to get a static model from Blender to OpenMW.

See merge request OpenMW/openmw!1496
2021-12-20 23:23:12 +00:00
elsid
ed3286994c
Fix ASAN error: heap-use-after-free
=================================================================
==20931==ERROR: AddressSanitizer: heap-use-after-free on address 0x607000206030 at pc 0x7fc8b0f3a72b bp 0x7ffcee176860 sp 0x7ffcee176008
READ of size 13 at 0x607000206030 thread T0
    #0 0x7fc8b0f3a72a in __interceptor_strlen /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:389
    #1 0x562e069a0af7 in QString::fromUtf8(char const*, int) /usr/include/qt/QtCore/qstring.h:706
    #2 0x562e069a0af7 in Launcher::AdvancedPage::AdvancedPage(Config::GameSettings&, QWidget*) /home/elsid/dev/openmw/apps/launcher/advancedpage.cpp:29
    #3 0x562e06959613 in Launcher::MainDialog::createPages() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:127
    #4 0x562e069691d2 in Launcher::MainDialog::setup() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:228
    #5 0x562e06969d88 in Launcher::MainDialog::showFirstRunDialog() /home/elsid/dev/openmw/apps/launcher/maindialog.cpp:188
    #6 0x562e06957025 in main /home/elsid/dev/openmw/apps/launcher/main.cpp:35
    #7 0x7fc8ad0d9b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
    #8 0x562e0690fced in _start (/home/elsid/dev/openmw/build/gcc/asan/openmw-launcher+0x56ced)

0x607000206030 is located 16 bytes inside of 64-byte region [0x607000206020,0x607000206060)
freed by thread T0 here:
    #0 0x7fc8b0fb3f19 in __interceptor_free /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cpp:127
    #1 0x7fc8b0de3388  (/usr/lib/libopenal.so.1+0x40388)

previously allocated by thread T0 here:
    #0 0x7fc8b0fb4fd6 in __interceptor_posix_memalign /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cpp:226
    #1 0x7fc8b0e379cb  (/usr/lib/libopenal.so.1+0x949cb)

SUMMARY: AddressSanitizer: heap-use-after-free /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:389 in __interceptor_strlen
Shadow bytes around the buggy address:
  0x0c0e80038bb0: 00 00 00 00 00 00 00 00 00 fa fa fa fa fa 00 00
  0x0c0e80038bc0: 00 00 00 00 00 00 00 fa fa fa fa fa 00 00 00 00
  0x0c0e80038bd0: 00 00 00 00 00 fa fa fa fa fa 00 00 00 00 00 00
  0x0c0e80038be0: 00 00 02 fa fa fa fa fa 00 00 00 00 00 00 00 00
  0x0c0e80038bf0: 02 fa fa fa fa fa fd fd fd fd fd fd fd fd fa fa
=>0x0c0e80038c00: fa fa fa fa fd fd[fd]fd fd fd fd fd fa fa fa fa
  0x0c0e80038c10: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c20: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c30: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c40: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x0c0e80038c50: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07
  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb
  Shadow gap:              cc
==20931==ABORTING
2021-12-20 23:32:47 +01:00
AnyOldName3
d15c2922a9 Stop monitoring closed windows
If it gets repalced, the new one will be watched instead
2021-12-20 22:24:47 +00:00