jvoisin
43f64e9f75
Merge branch 'tasty_sujamma' into 'master'
...
Uncap attribute and skill damage for drain and absorb effects
See merge request OpenMW/openmw!1592
2022-01-30 17:59:49 +00:00
elsid
70623d0b23
Move FetchContent for benchmark to extern
2022-01-30 00:44:22 +01:00
psi29a
e46905450e
Merge branch 'refactor/esm-recordnew' into 'master'
...
Use unique_ptr for ESM records
See merge request OpenMW/openmw!1603
2022-01-29 22:05:39 +00:00
psi29a
7dd02076f5
Merge branch 'offset_the_deads' into 'master'
...
#6410 : Use the scaled mesh translation for collision shape position for living actors
See merge request OpenMW/openmw!1446
2022-01-29 20:28:23 +00:00
psi29a
7bab714825
Merge branch 'fix_circling_fargoth' into 'master'
...
Remove unnecessary loops from path (#6510 )
Closes #6510
See merge request OpenMW/openmw!1584
2022-01-29 19:48:02 +00:00
ζeh Matt
07eb6db030
Use unique_ptr for ESM records
2022-01-29 21:09:27 +02:00
Evil Eye
79dc600dae
Uncap attribute and skill damage for drain and absorb effects
2022-01-29 16:29:50 +01:00
elsid
8b7ae9afd8
Fix use after free and possible deadlock on exit
...
Lock Simulation weak_ptr in all visitors to avoid use after free.
And swap order for weak_ptr locking with locking collision world mutex to avoid
deadlock when underlying object tries to lock the same mutex in the destructor.
Add SimulationImpl type to avoid use of FrameData without locking weak_ptr.
2022-01-29 14:59:51 +01:00
elsid
45db56b382
Rework fixed string
...
* Avoid inheritance.
* Define equality operators out of the class definition.
* Replace toString with toStringView where it doesn't make sense to create a string.
2022-01-28 18:39:09 +01:00
Petr Mikheev
53f2dfd1c0
Merge branch 'lua_ui_templates' into 'master'
...
Lua UI templates
See merge request OpenMW/openmw!1475
2022-01-28 09:31:46 +00:00
uramer
960dd1f708
Lua UI templates
2022-01-28 09:31:45 +00:00
elsid
bf692a4bfa
Add more tests for fixed string
2022-01-28 03:39:28 +01:00
Bret Curtis
022fdc49a5
update tests to use esm3 rename
2022-01-27 21:13:38 +01:00
psi29a
84e209308d
Merge branch 'refactor/interpreter' into 'master'
...
Cleanup interpreter code a bit
Closes #6553
See merge request OpenMW/openmw!1556
2022-01-27 19:18:57 +00:00
Matt
34723c8ea8
Cleanup interpreter code a bit
2022-01-27 19:18:57 +00:00
psi29a
6f7a067e0c
Merge branch 'esmrename' into 'master'
...
esm refactor work
See merge request OpenMW/openmw!1575
2022-01-27 17:52:42 +00:00
psi29a
fac47ce0b5
Merge branch 'support_controller_gyro' into 'master'
...
Support controller gyro
Closes #6557
See merge request OpenMW/openmw!1571
2022-01-25 19:20:36 +00:00
psi29a
21ef9d4058
Merge branch 'nif_multi_parents' into 'master'
...
Support multiple parents for NIF nodes (#6552 )
Closes #6552
See merge request OpenMW/openmw!1577
2022-01-25 19:17:19 +00:00
jvoisin
4ae1ea1ee3
Merge branch 'refidref' into 'master'
...
Remove `getRefIdRef` because it is the same as `getRefId`.
See merge request OpenMW/openmw!1585
2022-01-25 16:23:51 +00:00
Evil Eye
783505011c
Merge branch 'fix_deprecated_warning' into 'master'
...
Remove usage of deprecated std::iterator
See merge request OpenMW/openmw!1589
2022-01-25 15:32:22 +00:00
Evil Eye
903ef60f9d
Merge branch 'navmesh_scene_bounds' into 'master'
...
Limit and filter navmesh input (#5858 )
Closes #5858
See merge request OpenMW/openmw!1583
2022-01-25 14:06:53 +00:00
elsid
ecc654a369
Limit and filter navmesh input ( #5858 )
2022-01-25 14:06:53 +00:00
elsid
12df2deb70
Remove usage of deprecated std::iterator
...
/home/elsid/dev/openmw/apps/openmw/mwlua/../mwbase/../mwworld/containerstore.hpp:264:23: warning: 'iterator<std::forward_iterator_tag, MWWorld::Ptr>' is deprecated [-Wdeprecated-declarations]
: public std::iterator<std::forward_iterator_tag, PtrType, std::ptrdiff_t, PtrType *, PtrType&>
^
/home/elsid/dev/openmw/apps/openmw/mwlua/../mwworld/inventorystore.hpp:79:36: note: in instantiation of template class 'MWWorld::ContainerStoreIteratorBase<MWWorld::Ptr>' requested here
ContainerStoreIterator mSelectedEnchantItem;
^
/usr/bin/../include/c++/v1/__iterator/iterator.h:27:29: note: 'iterator<std::forward_iterator_tag, MWWorld::Ptr>' has been explicitly marked deprecated here
struct _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 iterator
^
/usr/bin/../include/c++/v1/__config:1016:39: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17'
^
/usr/bin/../include/c++/v1/__config:993:48: note: expanded from macro '_LIBCPP_DEPRECATED'
^
2022-01-24 22:50:18 +01:00
elsid
7ec7c57879
Remove unnecessary loops from path
...
This prevents actors going back when a new shortest path includes a point
behind them where they were right before. Such situation can happen when path
includes off mesh connection. Resulting cost of such path can be lower than
the real one because off mesh connections are straight lines and walking
surface usually is not a plane but a surface.
Skip to path point where distance from current position to the line between
previous and this point is less than point tolerance. Which means actor is
standing very close to the edge between those points. Additionally check by
navmesh raycasting to make sure there is actually a valid path.
2022-01-24 22:32:04 +01:00
uramer
39c7325db7
Merge branch 'lua_fix_onActorActive' into 'master'
...
Validate that object exists before onActorActive Lua handler
See merge request OpenMW/openmw!1580
2022-01-24 13:25:20 +00:00
psi29a
fdc08cf01e
Merge branch 'fix_storage' into 'master'
...
Fix heap use after free in components/lua/storage.cpp
See merge request OpenMW/openmw!1586
2022-01-24 12:17:19 +00:00
Petr Mikheev
067d71f7eb
Fix heap use after free in components/lua/storage.cpp
2022-01-23 22:37:04 +01:00
Petr Mikheev
203ee492c8
Remove getRefIdRef because it is the same as getRefId.
2022-01-23 21:01:44 +01:00
Bret Curtis
74e7cfc023
remove unused includes: part1
...
remove unused imports: part2
revert one tidy we will keep for c++20
2022-01-23 17:30:25 +01:00
Bret Curtis
cdbab2325f
rename esmterrain to esm3terrain
2022-01-23 17:19:30 +01:00
Bret Curtis
d1fb854521
move most of the files from esm to esm3, keep common code in esm; this is make space for a future with esm4
...
esm typo
esm typo
2022-01-23 17:04:48 +01:00
elsid
4b59ff2060
Include headers instead of source files
2022-01-23 15:40:30 +01:00
Petr Mikheev
24989e7bc1
Validate that object exists before onActorActive Lua handler
2022-01-23 11:30:22 +01:00
uramer
a85f2b0b2a
Remove unnecessary mGuiCursorEnabled; from sensor manager
2022-01-22 13:28:07 +01:00
elsid
3f14011087
Support multiple parents for NIF nodes
...
Choose a parent base on which node is used to iterate over children nodes.
This leads to duplicate handing of child nodes. A node will be handled so many
times how many parents it has.
For example:
p1 p2
\ /
c
Will be handled as:
p1 p2
| |
c c
If c has children they will be handled X times c is handled.
2022-01-22 01:02:31 +01:00
elsid
580edf18b9
Use weak_ptr for Actor and Projectile simulations ( #6515 )
2022-01-21 00:28:56 +00:00
uramer
183ca3079e
Merge gyroaxis into gyro manager
2022-01-20 15:42:01 +01:00
uramer
57ac592973
Fix warning
2022-01-19 22:35:32 +01:00
uramer
15e9c6615c
Disable controller gyro with older SDL
2022-01-19 21:32:46 +01:00
uramer
4021d23cff
Refactor sensor manager axis correction
2022-01-19 18:09:37 +01:00
Cody Glassman
9cafc31c0d
Restore ripples with soft particles
2022-01-19 11:32:38 +00:00
uramer
a496f16cdb
Implement gyro camera for controllers
2022-01-18 22:47:49 +01:00
uramer
9fa0faf944
Refactor sensor manager to match controller manager gyro API
2022-01-18 21:11:25 +01:00
uramer
55f95f1ea3
Enable controller gyro and capture the values
2022-01-18 20:23:16 +01:00
Petr Mikheev
9d0e427ec1
Merge branch 'dispose_lua_ui_correctly' into 'master'
...
Dispose Lua UI elements correctly
See merge request OpenMW/openmw!1561
2022-01-18 08:12:56 +00:00
uramer
cc528d2e08
Dispose Lua UI elements correctly
2022-01-18 08:12:56 +00:00
uramer
d1d8f058ac
Lua bindings for Colours
2022-01-17 22:35:06 +00:00
psi29a
4e93716584
Merge branch 'always_bigobj' into 'master'
...
Always use /bigobj, clean up scattered uses into one
See merge request OpenMW/openmw!1476
2022-01-17 08:05:19 +00:00
uramer
886dee57ee
Always use /bigobj, clean up scattered uses into one
2022-01-17 08:05:19 +00:00
wareya
20cbf941fb
re-introduce short circuiting, but only under certain circumstances
2022-01-16 17:58:04 -05:00
wareya
784b1888a9
Merge branch 'upstream' into movement_tweaks
2022-01-16 17:19:20 -05:00
psi29a
fd7e0b74cc
Merge branch '6303-jail-stuck-attack' into 'master'
...
#6303 Made player stop attacking and sheathe weapon when going to jail
See merge request OpenMW/openmw!1551
2022-01-16 10:15:47 +00:00
Artem Nykolenko
a5cdc889a2
#6303 Made player stop attacking and sheathe weapon when going to jail
2022-01-16 10:15:47 +00:00
uramer
c07fb75bf7
Merge branch 'lua_settings' into 'master'
...
Permanent storage for Lua
See merge request OpenMW/openmw!1489
2022-01-15 21:52:09 +00:00
jvoisin
2142e4b241
Merge branch 'scale_your_guar' into 'master'
...
Make scaleObject a no-op when not changing scale
Closes #6551
See merge request OpenMW/openmw!1559
2022-01-15 17:17:18 +00:00
uramer
ae641811cf
Merge branch 'lua_vector' into 'master'
...
Use double precision for vectors serialization in Lua
See merge request OpenMW/openmw!1558
2022-01-15 16:14:04 +00:00
Petr Mikheev
4677912997
Remove incorrect destructor that was added in !1557 .
2022-01-15 13:59:22 +01:00
Evil Eye
5fcb2cabc8
Make scaleObject a no-op when not changing scale
2022-01-15 13:04:15 +01:00
Petr Mikheev
1b7e923b2c
Lua fixes
2022-01-15 12:01:30 +00:00
Petr Mikheev
97d56e198f
Use double precision for vectors serialization in Lua
2022-01-15 11:25:30 +01:00
Petr Mikheev
a182fdeea1
Permanent storage for Lua data
2022-01-11 11:21:03 +01:00
psi29a
781b014183
Merge branch 'toggable_daynightswitch' into 'master'
...
Toggable day night switch (#5928 )
Closes #5928
See merge request OpenMW/openmw!1549
2022-01-11 09:34:19 +00:00
Cody Glassman
8ec0a52605
Toggable day night switch ( #5928 )
2022-01-11 09:34:19 +00:00
Petr Mikheev
2d1b100239
Change terminology of gameSecond/gameHour to simulationTime/gameTime
2022-01-10 21:03:35 +01:00
Josquin Frei
d9672f7d46
Add serialization for TransformM and TransformQ
2022-01-10 12:42:03 +00:00
psi29a
a1f8db7600
Merge branch 'bright_spells' into 'master'
...
Replicate Morrowind spell lighting (#4949 )
Closes #4949
See merge request OpenMW/openmw!1544
2022-01-09 11:07:14 +00:00
cody glassman
8216410e7d
add white ambient to spell VFX as in Morrowind
2022-01-08 16:19:42 -08:00
cody glassman
e32d3d11ce
ensure readbuffer is bound before using glReadPixels
2022-01-08 16:12:24 -08:00
psi29a
011a26684a
Merge branch 'fix_wizard_dialogs' into 'master'
...
Fix wizard dialogs
See merge request OpenMW/openmw!1519
2022-01-07 14:35:12 +00:00
Josquin Frei
63a8bc5f9b
Fix wizard dialogs
2022-01-07 14:35:11 +00:00
Cody Glassman
cdae1c4c97
Heavily mitigate jittery objects far from origin
2022-01-06 22:01:28 +00: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
Evil Eye
cd6edb961a
Remove dead code
2022-01-05 17:22:22 +01: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
glassmancody.info
909aa43ba1
update sky particle node correctly
2022-01-04 14:10:39 -08: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
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
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
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
0f246e7365
Use a separate instance of Lua i18n for every context
2022-01-02 09:58:51 +01:00
Evil Eye
dc946d0a47
Fix Dagoth Ur's Fire Shield not being visible
2021-12-27 22:30:25 +01: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
ac747f02f3
Don't teleport NPCs to unknown cells
2021-12-26 15:27:25 +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
Evil Eye
c1f59b1221
Automatically drop workaround when the format is next updated
2021-12-24 23:17:50 +01:00
myrix
88fc038ceb
with mutable, without World and ESMStore interface change
2021-12-24 12:04:26 +03:00
myrix
9c7835e27f
explicit instantiation error fix
2021-12-24 02:04:26 +03:00
