mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:23:53 +00:00
Code Issues Releases Wiki Activity
27280 commits 108 branches 66 tags 133 MiB
Commit graph

27280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
AnyOldName3
97396da74c Get rid of break 
It might look confusing with the breaks in the switch below
 2021-12-20 22:23:44 +00:00
AnyOldName3
fe1523d16d Fix signed/unsigned mismatch 2021-12-20 22:13:11 +00:00
Matjaž Lamut
c0d0972379 Some more tweaks and hook up the .rst file so it will show everything properly once on readthedocs. 2021-12-20 20:20:56 +00:00
jvoisin
f057713bcb Fix coverity submission. 2021-12-20 21:03:36 +01:00
psi29a
64c8ef4228 Merge branch 'master' into 'master' 
Add Ubuntu build Docker image

See merge request OpenMW/openmw!1272
 2021-12-20 07:56:51 +00:00
Matjaž Lamut
02ef6c858d Tutorial on how to get a static model from Blender to OpenMW. The existing article on Blender-OpenMW pipeline via COLLADA will be split into more in-depth articles for static and animated models respectively. 2021-12-19 21:27:00 +00:00
myrix
3a9cfbfa53 HyperTextParser as a class with proper keyword search caching 2021-12-19 14:00:49 +03:00
AnyOldName3
c746a8abb7 Attempt to catch freezes on Windows 2021-12-18 21:34:15 +00:00
myrix
0688f55171 optimized keyword parsing 2021-12-18 20:07:41 +03:00
Alexei Kotov
46564f08ad Merge branch 'wet_and_sneaky' into 'master' 
Don't consider underwater sneaking to be sneaking

See merge request OpenMW/openmw!1490
 2021-12-18 16:43:55 +00:00
Evil Eye
a2964f2244 Don't consider underwater sneaking to be sneaking 2021-12-18 15:16:37 +01:00
psi29a
97d285d1c1 Merge branch 'macos12_pipeline' into 'master' 
Add support for macOS12 with XCode13 in our CI/CD

See merge request OpenMW/openmw!1488
 2021-12-17 12:52:56 +00:00
Wassim DHIF
43b2114444 Add Ubuntu build Docker image 2021-12-17 12:26:38 +01:00
psi29a
85a52606cf Add support for macOS12 with XCode13 in our CI/CD 2021-12-17 09:33:13 +00:00
psi29a
6bd89cb6ef Merge branch 'im_walking_on_water_whoa_oh' into 'master' 
Move target checking code so it applies to all sources

Closes #6486

See merge request OpenMW/openmw!1472
 2021-12-17 09:11:30 +00:00
psi29a
f699d74057 Merge branch 'sdl' into 'master' 
Upgrade to SDL 2.0.18

Closes #4295

See merge request OpenMW/openmw!1481
 2021-12-17 08:09:12 +00:00
psi29a
0aa103c6d8 Merge branch 'fix_build' into 'master' 
Fix build on ubuntu 18.04

See merge request OpenMW/openmw!1487
 2021-12-17 07:36:31 +00:00
psi29a
844266b58e Merge branch 'restrict_navmesh_cache_writes' into 'master' 
Do not write shapes to navmeshdb when writing is disabled (#6498)

Closes #6498

See merge request OpenMW/openmw!1486
 2021-12-17 07:28:53 +00:00
psi29a
307bc57cde Merge branch 'launcher_navmesh_cache_progress' into 'master' 
Fix navmesh cache progress bar jumps (#6499)

Closes #6499

See merge request OpenMW/openmw!1485
 2021-12-17 07:23:08 +00:00
psi29a
2f7b98cecb Merge branch 'require-3.4-mygui' into 'master' 
Raise required MyGUI version to 3.4.1

See merge request OpenMW/openmw!1484
 2021-12-17 07:14:41 +00:00
elsid
b0c2317d34
Fix build on ubuntu 18.04 
/<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.cpp:213:109: error: class template argument deduction failed:
             heightfields.emplace_back(std::vector(std::begin(landData.mHeights), std::end(landData.mHeights)));
                                                                                                             ^
/<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.cpp:213:109: error: no matching function for call to ‘vector(float*, float*)’
In file included from /usr/include/c++/7/vector:64:0,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/components/esm/loadpgrd.hpp:5,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/components/misc/convert.hpp:5,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/components/bullethelpers/collisionobject.hpp:4,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.hpp:4,
                 from /<<BUILDDIR>>/openmw-0.47.0+git202112160802~ubuntu18.04.1/apps/navmeshtool/worldspacedata.cpp:1:
/usr/include/c++/7/bits/stl_vector.h:411:2: note: candidate: template<class _Tp, class _Alloc, class _InputIterator, class> vector(_InputIterator, _InputIterator, const _Alloc&)-> std::vector<_Tp, _Alloc>
  vector(_InputIterator __first, _InputIterator __last,
  ^~~~~~
 2021-12-17 00:06:38 +01:00
elsid
aaf6c82e33
Do not write shapes to navmeshdb when writing is disabled 2021-12-16 22:57:35 +01:00
elsid
8fedca5780
Fix navmesh cache progress bar jumps 
When initial approximation of maximum progress based on numer of cells is too
high comparing to real number of navmesh tiles.
 2021-12-16 21:48:50 +01:00
uramer
3f52ede9cb Remove unnecessary myguicompat 2021-12-16 19:48:10 +01:00
uramer
2bc81e47a6 Remove all MyGUI version checks 2021-12-16 19:22:07 +01:00
uramer
94b2bde48a Raise required MyGUI version to 3.4.1 2021-12-16 16:59:20 +01:00
psi29a
cc97c4450a Merge branch 'which-gpu-are-you' into 'master' 
Log OpenGL Vendor, Renderer and Version on startup

See merge request OpenMW/openmw!1482
 2021-12-16 08:02:24 +00:00