mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity
30,979 Commits 17 Branches 67 Tags
Commit Graph

30979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jvoisin
534e20cf3a Replace another assert with a throw 
It fixes the following crash:

```nasm
[----------------------------------registers-----------------------------------]
RAX: 0xffffffffffffffe4
RBX: 0x7fffffffbd88 --> 0x0
RCX: 0x555555861f01 --> 0xd6000055555582fa
RDX: 0x1
RSI: 0x0
RDI: 0xff
RBP: 0x2e94
RSP: 0x7fffffff9bb0 --> 0x0
RIP: 0x55555574e286 (<_ZN4ESM44Cell4loadERNS_6ReaderE+182>:	mov    eax,DWORD PTR [rax+0xc])
R8 : 0x0
R9 : 0x555555836bd0 --> 0x555555861f90 --> 0x100000000000000
R10: 0xffffffff
R11: 0x0
R12: 0x7fffffffbd88 --> 0x0
R13: 0x7fffffffbd30 --> 0x7fffffffbd28 --> 0xff0001
R14: 0x7fffffff9da0 --> 0x10fc
R15: 0x7fffffff9ea8 --> 0x7fffffff9eb8 --> 0x0
EFLAGS: 0x10206 (carry PARITY adjust zero sign trap INTERRUPT direction overflow)
[-------------------------------------code-------------------------------------]
   0x55555574e27c <_ZN4ESM44Cell4loadERNS_6ReaderE+172>:	mov    rdi,r12
   0x55555574e27f <_ZN4ESM44Cell4loadERNS_6ReaderE+175>:	xor    esi,esi
   0x55555574e281 <_ZN4ESM44Cell4loadERNS_6ReaderE+177>:	call   0x5555557edfb0 <_ZNK4ESM46Reader3grpEm>
=> 0x55555574e286 <_ZN4ESM44Cell4loadERNS_6ReaderE+182>:	mov    eax,DWORD PTR [rax+0xc]
   0x55555574e289 <_ZN4ESM44Cell4loadERNS_6ReaderE+185>:	cmp    eax,0xff
   0x55555574e28e <_ZN4ESM44Cell4loadERNS_6ReaderE+190>:	ja     0x55555574e314 <_ZN4ESM44Cell4loadERNS_6ReaderE+324>
   0x55555574e294 <_ZN4ESM44Cell4loadERNS_6ReaderE+196>:	cmp    al,0x5
   0x55555574e296 <_ZN4ESM44Cell4loadERNS_6ReaderE+198>:	jne    0x55555574e314 <_ZN4ESM44Cell4loadERNS_6ReaderE+324>
[------------------------------------stack-------------------------------------]
0000| 0x7fffffff9bb0 --> 0x0
0008| 0x7fffffff9bb8 --> 0x0
0016| 0x7fffffff9bc0 --> 0x0
0024| 0x7fffffff9bc8 --> 0x0
0032| 0x7fffffff9bd0 --> 0x0
0040| 0x7fffffff9bd8 --> 0x0
0048| 0x7fffffff9be0 --> 0x0
0056| 0x7fffffff9be8 --> 0x0
[------------------------------------------------------------------------------]
Legend: code, data, rodata, value
Stopped reason: SIGSEGV
0x000055555574e286 in ESM4::Cell::load (this=0x7fffffff9da0, reader=...) at /home/jvoisin/dev/openmw/openmw/components/esm4/loadcell.cpp:68
68	   if (reader.grp().type == ESM4::Grp_ExteriorSubCell && reader.grp().label.grid[1] == 0
gdb-peda$ bt
    this=<optimized out>, reader=...) at /home/jvoisin/dev/openmw/openmw/apps/esmtool/tes4.cpp:547
    recordInvocable=...) at /home/jvoisin/dev/openmw/openmw/./components/esm4/readerutils.hpp:31
    at /home/jvoisin/dev/openmw/openmw/./components/esm4/readerutils.hpp:23
    at ../csu/libc-start.c:381
```
 2023-05-21 20:07:52 +02:00
psi29a
364bc91f5b Merge branch 'fix_element_destroy' into 'master' 
Fix bug in LuaUi::Element::destroy() that sometimes leads to an infinite loop on UI cleanup

See merge request OpenMW/openmw!3033
 2023-05-21 17:33:56 +00:00
psi29a
458ee4abaa Merge branch 'coc_destination' into 'master' 
Improve coc destination search in ESM4 cells

See merge request OpenMW/openmw!3034
 2023-05-21 17:33:36 +00:00
psi29a
e1754b840a Merge branch 'fix_empty_vector' into 'master' 
Guard an undefined behaviour

Closes #6725

See merge request OpenMW/openmw!3037
 2023-05-21 17:33:13 +00:00
Tetramir
3d574f16a1 Merge branch 'grid_update' into 'master' 
Update mHalfGridSize in Scene::changeCellGrid before using it

See merge request OpenMW/openmw!3030
 2023-05-21 17:05:01 +00:00
Alexei Kotov
08dc48586e Merge branch 'assert_throw' into 'master' 
Replace an `assert` with a conditional throw

See merge request OpenMW/openmw!3038
 2023-05-21 15:44:52 +00:00
Petr Mikheev
9b6808f83d Improve coc destination search in ESM4 cells 2023-05-21 00:42:25 +02:00
jvoisin
81bd034a9e Guard an undefined behaviour 
`std::vector.back()` on an empty `std::vector` is undefined.
This should fix #6725.

Thanks to @Capostrophic for the investigation.
 2023-05-20 19:35:06 +02:00
jvoisin
cde7aeac3d Replace an asert with a conditional throw 
The assert is reachable, resulting in a brutal `abort`
instead of a nice exception.
 2023-05-20 19:33:14 +02:00
Alexei Kotov
5b36ea0179 Merge branch 'fix_cell_settings_type' into 'master' 
Map SettingValueType Cell to float setting type (#7382)

Closes #7382

See merge request OpenMW/openmw!3035
 2023-05-20 14:44:41 +00:00
elsid
4be43a2dca
Map SettingValueType Cell to float setting type 2023-05-20 15:00:00 +02:00
Petr Mikheev
fdd80f93e9 Merge branch 'bb_fix_lua' into 'master' 
lua - fix bounding box in active grid

See merge request OpenMW/openmw!3031
 2023-05-20 10:25:57 +00:00
Petr Mikheev
c6eed2a6c6 Fix bug in LuaUi::Element::destroy() that sometimes leads to an infinite loop on UI cleanup 2023-05-20 02:34:23 +02:00
glassmancody.info
06676fd623 lua - fix bounding box in active grid 2023-05-19 14:29:01 -07:00
Petr Mikheev
1d55844f26 Update mHalfGridSize in Scene::changeCellGrid before using it. 2023-05-19 17:58:59 +02:00
Alexei Kotov
5f6ca2a6d1 Merge branch 'fix_worldspaces' into 'master' 
Bugfix: Unload active cells when teleporting to another exterior worldspace

See merge request OpenMW/openmw!3028
 2023-05-19 14:20:42 +00:00
Petr Mikheev
690c752984 Unload active cells when teleporting to another exterior worldspace 2023-05-19 14:33:16 +02:00
psi29a
1ce35fa9e7 Merge branch 'lua-bounding-box' into 'master' 
Expose game object's bounding box in lua api

See merge request OpenMW/openmw!3009
 2023-05-19 09:33:44 +00:00
psi29a
e952eac501 Merge branch 'initialize' into 'master' 
Explicitly intialize the fields in `ESM4::Cell` that don't have default constructors.

See merge request OpenMW/openmw!3027
 2023-05-18 21:14:38 +00:00
Petr Mikheev
be26fbdacb Explicitly intialize the fields in ESM4::Cell that don't have default constructors. 2023-05-18 20:21:47 +02:00
glassmancody.info
a7b7f99d72 Expose game object's bounding box in lua api 2023-05-18 11:10:10 -07:00
psi29a
a939834a8b Merge branch 'esm4refs' into 'master' 
ESM4 walking simulator improvements

See merge request OpenMW/openmw!3024
 2023-05-18 16:30:59 +00:00
Petr Mikheev
61232f4b75 Fix uninitialized mWaterLevel in esm4/loadwrld.cpp 2023-05-18 02:10:39 +02:00
Petr Mikheev
493858127a Drop NIF root node transformation for Skyrim models the same way as for Morrowind models. 2023-05-18 02:10:39 +02:00
Petr Mikheev
169859025c Don't use getTerrainHeightAt(pos) when adjusting position in ESM4 cell because this function is currently specific to ESM3. 2023-05-18 02:10:39 +02:00
Petr Mikheev
c8056f6561 Hide ESM4 LOD objects and markers 2023-05-18 02:10:39 +02:00
Petr Mikheev
29031d0586 Increase ESM4 active grid 2023-05-18 00:38:41 +02:00
Petr Mikheev
ac65246389 Speedup ESM4 cell loading; load objects from permanent cells (exterior doors in particular) 2023-05-18 00:38:41 +02:00
Petr Mikheev
b1409182bc Merge branch 'esm4_reading_fixes' into 'master' 
ESM4 reading fixes

See merge request OpenMW/openmw!3026
 2023-05-17 22:36:02 +00:00
elsid
15f3e3ae71
Support ESM4 IDLE record 2023-05-17 22:59:34 +02:00
elsid
584c0dbcdc
Support reading bool GMST by ESM4 2023-05-17 22:59:34 +02:00
elsid
ee3956e4f2
Print FormId as hex by esmtool dump 2023-05-17 22:59:34 +02:00
elsid
010db45a10
Read ESM::FormId using ESM4::Reader::getFormId 2023-05-17 22:59:29 +02:00
psi29a
99ed8557bf Merge branch 'get_rid_of_std_bind' into 'master' 
Get rid of std::bind

See merge request OpenMW/openmw!3023
 2023-05-17 10:54:43 +00:00
psi29a
952bb016be Merge branch 'navmesh_cache_metrics' into 'master' 
Navmesh cache metrics

See merge request OpenMW/openmw!3025
 2023-05-17 10:53:12 +00:00
elsid
a90aa7d8b2
Count navmeshdb reads for each reading job 2023-05-17 10:08:34 +02:00
elsid
5ae8b9cae1
Report raw navmesh cache counters 2023-05-17 10:08:33 +02:00
psi29a
2a7d5a89d7 Merge branch 'fix_navmeshtool_avoid_shape' into 'master' 
Use different object id for avoid shape

See merge request OpenMW/openmw!3021
 2023-05-17 07:59:39 +00:00
psi29a
5fba79ece3 Merge branch 'teleport' into 'master' 
Additional Lua bindings for cells and fixes for teleporting

See merge request OpenMW/openmw!3017
 2023-05-17 07:57:57 +00:00
psi29a
41c9e3c449 Merge branch 'selected_spell' into 'master' 
Lua commands getSelectedSpell/setSelectedSpell

See merge request OpenMW/openmw!3018
 2023-05-17 07:46:48 +00:00
smilczek
8cf431aeb2 Added a missing comma 2023-05-16 21:06:18 +02:00
smilczek
f27dfd3f57 Added modernize-avoid-bind to .clang-tidy 2023-05-16 20:57:34 +02:00
smilczek
027d51bfc0 fixed a mistake 2023-05-15 21:06:05 +02:00
smilczek
05a2dc985b Clang format 2023-05-14 22:51:43 +02:00
smilczek
2910e35bc2 Clarified the lambda expressions 2023-05-14 22:43:44 +02:00
smilczek
42cab989b1 got rid of auto 2023-05-14 22:43:44 +02:00
smilczek
128bb11833 done 2023-05-14 22:43:44 +02:00
elsid
2a7b105484
Use different object id for avoid shape 
Otherwise addObject will ignore it as a duplicate and resulting recastmesh will
not match generated by the engine causing navmeshdb cache miss.
 2023-05-14 18:45:40 +02:00
elsid
a8a76f9a05
Fix BulletShape copy constructor and use for BulletShapeInstance 
Copy mVisualCollisionType.
 2023-05-14 18:45:38 +02:00
elsid
04d439485b
Log more info about navmesh shapes and jobs 2023-05-14 18:34:31 +02:00