1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 09:15:38 +00:00
Commit graph

7883 commits

Author SHA1 Message Date
elsid
dd706aab0e
Add missing SubPass::mMinMap initialization 2024-01-13 01:08:57 +01:00
uramer
7cc0eae461 Fix Menu Lua settings reset between states 2024-01-13 00:46:24 +01:00
elsid
1bfcfaff34
Use proper naming for member variable 2024-01-12 03:40:54 +01:00
elsid
35da9f8c50
Remove redundant SizeProxy and RenderTarget constructors 2024-01-12 01:49:17 +01:00
elsid
3ad79e3b3e
Pregenerate glow texture names
To avoid strings generation and allocations every time model is added to a
scene.
2024-01-11 23:54:20 +01:00
Evil Eye
1880894f4a Use ciEqual to detect missing content files 2024-01-11 19:05:37 +01:00
Evil Eye
2fc87efa8f Merge branch 'cleanup_navmesh_updater' into 'master'
Cleanup navmesh updater

See merge request OpenMW/openmw!3763
2024-01-11 17:50:12 +00:00
Yury Stepovikov
52623ddd7d Set MacOS current_path before reading configuration files [#7706] 2024-01-11 00:59:27 +00:00
uramer
dd6017e81e Avoid making engine handler methods public 2024-01-11 00:55:29 +01:00
uramer
4ed2af7666 Merge branch 'master' into menuscripts 2024-01-10 23:21:42 +01:00
uramer
1afc7ecd58 Test Lua widgets for text inputs correctly 2024-01-10 23:13:27 +01:00
uramer
79deb5f559 Remove settings pages in Lua 2024-01-10 23:13:27 +01:00
uramer
2107bbc01d Reuse input engine handlers in menu scripts 2024-01-10 23:13:23 +01:00
uramer
962ecc4329 Allow menu scripts to read global sections while a game is loaded 2024-01-10 22:28:57 +01:00
Andrei Kortunov
0e1bb45345 Cleanup navmesh updater 2024-01-10 15:28:26 +04:00
Alexei Kotov
78d8cf86c3 Merge branch 'pickme' into 'master'
Override launcher file info with higher priority info

Closes #7733 and #7103

See merge request OpenMW/openmw!3743
2024-01-09 21:42:45 +00:00
Evil Eye
d05f5e84ff Merge branch 'missing_assert' into 'master'
Add missing assertion

See merge request OpenMW/openmw!3751
2024-01-09 18:17:31 +00:00
Evil Eye
0db8026356 Stop adding and deleting rows 2024-01-09 17:45:48 +01:00
Evil Eye
672cefd594 Track checked EsmFile pointers instead of full paths 2024-01-09 17:40:14 +01:00
Evil Eye
521394d67b Override launcher file info with higher priority info 2024-01-09 17:40:14 +01:00
elsid
69cf507db8
Fix navmesh update on player changing tile
In cases when objects are not present on the scene (e.g. generated exterior
cells) navmesh is not updated because area that suppose to be covered with it
was not updated. It was updated only during cell change. This is a regression
from d15e1dca84.

Set TileCachedRecastMeshManager range on NavMeshManager update to make sure it
always covers correct area around player.

Return a union of objects, heightfields and water ranges from
getLimitedObjectsRange intersected with range provided above.
2024-01-09 01:18:45 +01:00
Andrei Kortunov
d1a7dfee87 Add missing assertion 2024-01-08 16:19:40 +04:00
jvoisin
57066bcac1 Merge branch 'more_cleanup' into 'master'
Code cleanup

See merge request OpenMW/openmw!3746
2024-01-08 11:35:24 +00:00
uramer
a6e2ceebb8 Don't clear menu UI on game load 2024-01-07 23:29:20 +01:00
uramer
d1268acf95 Merge branch 'master' into menuscripts 2024-01-07 23:15:21 +01:00
jvoisin
bb22c6e739 Merge branch 'navmesh_cleanup' into 'master'
Small cleanup for navmesh related code

See merge request OpenMW/openmw!3734
2024-01-07 22:14:52 +00:00
Alexei Kotov
14c8103a9e Merge branch 'dripdrop' into 'master'
Drop support for save game format 4

Closes #6624

See merge request OpenMW/openmw!3737
2024-01-07 18:01:20 +00:00
elsid
b0b6c48a88
Add clarifying comments to detournavigator coordinates conversion functions 2024-01-07 17:57:53 +01:00
elsid
afd6f0739c
Format box shape indices grouping by triangle 2024-01-07 17:57:53 +01:00
Andrei Kortunov
828c40c710 Do not copy due to auto misuse 2024-01-07 18:52:10 +04:00
psi29a
bfb60c5504 Merge branch 'compileerror' into 'master'
Contect selector: fix ESM date and version data encoding/decoding (#7764)

Closes #7764

See merge request OpenMW/openmw!3742
2024-01-07 14:15:52 +00:00
Alexei Kotov
327fafe739 Contect selector: fix ESM date and version data encoding/decoding (#7764) 2024-01-07 07:16:42 +03:00
Alexei Kotov
bd2ea715b4 Bring ESM4 head part reading up-to-date with FO76 2024-01-07 04:55:39 +03:00
Alexei Kotov
0b63fafc6d Bring ESM4 global variable reading up-to-date with FO76 2024-01-07 04:55:39 +03:00
Alexei Kotov
f9825328d2 Bring ESM4 texture set reading up-to-date with FO76 2024-01-07 04:55:39 +03:00
Alexei Kotov
18982ea4a0 Read FO76 plugin header 2024-01-07 04:55:39 +03:00
Evil Eye
a11ff46e82 Drop support for save game format 4 2024-01-06 14:59:22 +01:00
psi29a
21f177daac Merge branch 'shininess' into 'master'
Silence OSG shininess limit warnings

See merge request OpenMW/openmw!3725
2024-01-06 11:26:40 +00:00
psi29a
459aa69b87 Merge branch 'clampunclamped' into 'master'
Manually clamp controller time (#7523)

Closes #7523

See merge request OpenMW/openmw!3713
2024-01-05 09:43:23 +00:00
Alexei Kotov
c5a3b516d6 Merge branch 'init_variables' into 'master'
Add missing initialization

See merge request OpenMW/openmw!3722
2024-01-04 20:31:55 +00:00
Alexei Kotov
3ba03782c0 Silence OSG shininess limit warnings 2024-01-04 01:02:33 +03:00
Andrei Kortunov
8d3efd27ba Add missing initialization 2024-01-03 19:25:33 +04:00
Alexei Kotov
b132fd4373 Merge branch 'lua_action_fixes' into 'master'
Lua Action fixes

See merge request OpenMW/openmw!3717
2024-01-03 15:19:18 +00:00
Alexei Kotov
19a6fd4e1b Merge branch 'display_esm_version' into 'master'
Improve format version in content selector

See merge request OpenMW/openmw!3709
2024-01-02 17:32:21 +00:00
uramer
e9b48e35c0 Coverity defects 2024-01-02 13:54:02 +01:00
uramer
1d8ee7984f Make input.triggers[] consistent with input.actions[] 2024-01-02 13:45:45 +01:00
Alexei Kotov
04b714198a Manually clamp controller time (#7523) 2024-01-01 20:59:33 +03:00
Andrei Kortunov
93e50cc7aa Improve format version in content selector 2024-01-01 18:16:58 +04:00
Evil Eye
b835114ce2 Prevent input type assertion 2024-01-01 12:48:12 +01:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +00:00
Evil Eye
c97d0b5252 Merge branch 'weather' into 'master'
Make rain and snow ripple settings global rather than per-weather (#7748)

See merge request OpenMW/openmw!3706
2023-12-31 11:01:14 +00:00
psi29a
67955ac55f Merge branch 'treejunk' into 'master'
Discard additional tokens in non-expression contexts

See merge request OpenMW/openmw!3700
2023-12-30 09:42:26 +00:00
psi29a
cb24475662 Merge branch 'what-a-selection-you-have' into 'master'
Feat(CS): Add More Selection Controls

See merge request OpenMW/openmw!3674
2023-12-30 09:40:29 +00:00
Alexei Kotov
640fa53bb8 Make rain and snow ripple settings global rather than per-weather (#7748) 2023-12-30 04:24:18 +03:00
Evil Eye
01eb333fad Merge branch 'generic_object_cache' into 'master'
Refactor GenericObjectCache and add unit tests

See merge request OpenMW/openmw!3689
2023-12-29 21:22:30 +00:00
psi29a
e9f3e5c6d1 Merge branch 'lua_actions_electric_boogaloo' into 'master'
Lua actions take 3

See merge request OpenMW/openmw!2628
2023-12-29 18:56:59 +00:00
uramer
0e2e386dc9 Lua actions take 3 2023-12-29 18:56:59 +00:00
elsid
7a817d3147
Apply project naming styleguide to GenericObjectCache 2023-12-28 21:58:42 +01:00
elsid
45b1b4f1e0
Remove redundant ObjectCacheMap alias 2023-12-28 21:58:42 +01:00
elsid
7b1ee2780b
Use ranged for loops in GenericObjectCache 2023-12-28 21:58:42 +01:00
elsid
2f0613c8d4
Remove user defined destructor for GenericObjectCache 2023-12-28 21:58:42 +01:00
elsid
fd2fc63dd3
Support heterogeneous lookup in GenericObjectCache 2023-12-28 21:58:41 +01:00
elsid
56401a90a1
Merge GenericObjectCache update and remove functions
They are always called together. Single iteration over the items is more
efficient along with locking the mutex only once.
2023-12-28 21:58:33 +01:00
Evil Eye
02775c490b Discard additional tokens in non-expression contexts 2023-12-28 21:49:25 +01:00
alekulyn
f71862fb76 Remove unnecessary code 2023-12-27 22:30:04 -06:00
alekulyn
310b8206dd Fix #7696 2023-12-27 22:15:48 -06:00
Alexei Kotov
f1782ad8df Merge branch 'rm_unused_vfs' into 'master'
Remove unused vfs argument from correctMeshPath

See merge request OpenMW/openmw!3691
2023-12-27 17:23:16 +00:00
Evil Eye
c6e5a28241 Merge branch 'crime_disposition' into 'master'
Implement crime disposition modifier

Closes #4683

See merge request OpenMW/openmw!3448
2023-12-27 11:53:56 +00:00
AnyOldName3
a497d40689 Merge branch 'vfs_string_view' into 'master'
Use string_view for VFS (#6125)

See merge request OpenMW/openmw!3688
2023-12-26 18:40:25 +00:00
AnyOldName3
4567374e1f Merge branch 'localize_tooltip' into 'master'
Make content selector tooltip localizable

See merge request OpenMW/openmw!3687
2023-12-26 18:38:35 +00:00
jvoisin
c3dfc8c213 Merge branch 'detour_alloc' into 'master'
Use RecastGlobalAllocator for Detour

See merge request OpenMW/openmw!3678
2023-12-26 13:44:00 +00:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath 2023-12-26 14:14:52 +01:00
psi29a
5d53eb7566 Merge branch 'russianroulette' into 'master'
BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children

See merge request OpenMW/openmw!3634
2023-12-26 10:33:20 +00:00
psi29a
ff514df5a1 Merge branch 'distortion' into 'master'
Distortion

See merge request OpenMW/openmw!3536
2023-12-26 10:31:51 +00:00
Andrei Kortunov
ffffb427f5 Implement crime disposition modifier (bug 4683) 2023-12-26 14:04:23 +04:00
elsid
851bad4262 Merge branch 'precipitationripples' into 'master'
Use fallback weather ripple settings (bug #7292)

Closes #7292

See merge request OpenMW/openmw!3671
2023-12-26 09:51:23 +00:00
elsid
71e33cf8b2
Add unit tests for GenericObjectCache 2023-12-25 14:12:16 +01:00
elsid
0d8dc5aabc
Use string_view for VFS lookups 2023-12-25 12:21:01 +01:00
elsid
3363616f56
Remove redundant startsWith function 2023-12-25 11:43:02 +01:00
Andrei Kortunov
f2c284688b Make content selector tooltip localizable 2023-12-25 11:29:36 +04:00
Andrei Kortunov
1ca2a0ef66 Store generated UI by pointer to avoid redundant processing 2023-12-24 20:35:19 +04:00
Alexei Kotov
51b05647e2 Merge branch 'move_files' into 'master'
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
2023-12-24 09:58:24 +00:00
elsid
329500b087
Remove redundant return 2023-12-24 00:24:32 +01:00
elsid
0cf55d3617
Use RecastGlobalAllocator for Detour 2023-12-24 00:24:27 +01:00
Dave Corley
24443e00bf Feat(CS): Implement selection groups into data model 2023-12-23 15:05:13 -06:00
Dave Corley
5c10727380 Feat(CS): Add definition files for selection group record type 2023-12-23 15:05:13 -06:00
Alexei Kotov
099c39ae87 Use fallback weather ripple settings (bug #7292) 2023-12-23 11:46:08 +03:00
elsid
995f0e4865
Fix unused-but-set-variable warning
components/esm3/inventorystate.cpp:18:18: warning: variable 'index' set but not used [-Wunused-but-set-variable]
        uint32_t index = 0;
                 ^
2023-12-22 14:43:38 +01:00
Cody Glassman
187f63d3d3 support postprocess distortion 2023-12-21 10:56:38 -08:00
Evil Eye
3e101ab409 Add a variadic getHNOT 2023-12-20 12:28:34 +01:00
Andrei Kortunov
e6690bbcc7 Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR 2023-12-19 19:58:52 +04:00
Andrei Kortunov
2e041073fc Move *.ui files for different applications to different folders 2023-12-19 15:21:08 +04:00
Evil Eye
9f38ee82f4 Fix misaligned address 2023-12-17 21:30:04 +01:00
Evil Eye
37415b0382 Don't use getExact to read structs 2023-12-17 15:16:32 +01:00
Evil Eye
c10b9297f0 Remove Sized methods from ESMReader 2023-12-17 14:05:10 +01:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01:00
Alexei Kotov
46dc290b75 Merge branch 'more_localizable' into 'master'
Make hardcoded strings in Launcher and Wizard localizable

See merge request OpenMW/openmw!3630
2023-12-15 04:41:31 +00:00
jvoisin
3b1df3dd07 Merge branch 'tangentspace' into 'master'
Untangle tangent space handling and parallax

See merge request OpenMW/openmw!3648
2023-12-14 20:01:39 +00:00
Alexei Kotov
7e3270abc9 Merge branch 'unsave' into 'master'
Drop support for saves made prior to 0.40

See merge request OpenMW/openmw!3645
2023-12-13 00:33:20 +00:00
Alexei Kotov
4a96885323 Untangle normals and parallax handling
Move tangent space generation to the vertex shaders
Support diffuse parallax when no normal map is present
Don't use diffuse parallax if there's no diffuse map
Generalize normal-to-view conversion
Rewrite parallax
2023-12-12 22:42:53 +03:00
jvoisin
abbb620ea2 Merge branch 'nifogproperty' into 'master'
Handle NiFogProperty (feature #5173)

Closes #5173

See merge request OpenMW/openmw!3642
2023-12-12 18:30:11 +00:00
Evil Eye
78da1eb41f Merge branch 'settings_values_editor_2' into 'master'
Use settings values for editor (#6876)

See merge request OpenMW/openmw!3633
2023-12-12 17:00:43 +00:00
Andrei Kortunov
ca19f7006c Make hardcoded strings in Launcher and Wizard localizable 2023-12-11 12:02:43 +04:00
jvoisin
e3e9b39a16 Merge branch 'skinning' into 'master'
Streamline passing influence data to skinning

See merge request OpenMW/openmw!3641
2023-12-10 12:56:08 +00:00
jvoisin
47b87f1ff2 Merge branch 'reanimaterescaling' into 'master'
Restore animated collision shape rescaling (take 3)

See merge request OpenMW/openmw!3635
2023-12-10 12:55:57 +00:00
Evil Eye
b0ef42ae3c Drop support for save game format 3 2023-12-09 18:05:57 +01:00
Evil Eye
becc5ef8fa Drop support for save game format 2 2023-12-09 17:45:42 +01:00
Evil Eye
521cff08f8 Drop support for save game format 1 2023-12-09 17:22:11 +01:00
Alexei Kotov
9cdaf2c29b Handle NiFogProperty (feature #5173) 2023-12-09 17:13:16 +03:00
Alexei Kotov
c1088e5f70 Streamline passing influence data to skinning 2023-12-08 20:58:34 +03:00
Devin Alexander Torres
8161771969 Add sol::lib::jit to actually enable JIT 2023-12-07 04:57:52 -06:00
jvoisin
b67d89f2e0 Merge branch 'saveformat' into 'master'
Drop support for old saves

See merge request OpenMW/openmw!3629
2023-12-06 12:33:07 +00:00
Alexei Kotov
754c5a8e2a Restore animated collision shape rescaling 2023-12-06 00:54:54 +03:00
Mads Buvik Sandvei
f6a6c278dd More cleanup of scripted animations 2023-12-05 14:13:35 +00:00
Evil Eye
7cdf702a14 Merge branch 'niftestbsatool' into 'master'
bsatool and NIF debugging improvements

See merge request OpenMW/openmw!3619
2023-12-04 19:24:10 +00:00
Alexei Kotov
b93291840e BulletNifLoader: Handle NiSkinPartition
Add NiSkinPartition recovery helper method
2023-12-04 15:53:24 +03:00
Alexei Kotov
6e7661ca87 BulletNifLoader: Handle only the first child of NiSwitchNode and NiFltAnimationNode
To prevent duplicated collisions in general cases when the node states are similar or only one child is ever active.
For NiLODNode this is definitely not going to work
2023-12-04 01:22:13 +03:00
Alexei Kotov
53f5e4dd3c Merge branch 'highlight_color' into 'master'
Highlight new items in launcher by text formatting, not by color

See merge request OpenMW/openmw!3625
2023-12-03 20:29:25 +00:00
AnyOldName3
952bf58bc1 Merge branch 'turnitup' into 'master'
Support Oblivion parallax setup

See merge request OpenMW/openmw!3620
2023-12-03 18:52:17 +00:00
elsid
e1a68d8cf5
Ignore absent default setting value 2023-12-03 17:18:26 +01:00
Alexei Kotov
7c63522870 Merge branch 'settings_values_editor_1' into 'master'
Define editor settings as typed struct members (#6876)

See merge request OpenMW/openmw!3597
2023-12-02 13:51:00 +00:00
Evil Eye
194bcb0187 Drop support for save game format 0 (pre 0.37) 2023-12-01 16:37:29 +01:00
Evil Eye
23aacbd914 Introduce a minimum supported save game format 2023-12-01 16:37:29 +01:00
Evil Eye
8d8e970aba Merge branch 'message_formatting' into 'master'
Do not include formatting spaces to localizable strings

See merge request OpenMW/openmw!3624
2023-12-01 15:36:22 +00:00
Andrei Kortunov
c5b16d1ba2 Do not include formatting spaces to localizable strings 2023-11-30 13:06:50 +04:00
Evil Eye
f52e8f76c6 Use std::erase instead of using std::remove without erasing 2023-11-29 16:59:01 +01:00
Evil Eye
fe67407f74 Merge branch 'bullettotheheart' into 'master'
BulletNifLoader: Move NiGeometry triangulation to NiGeometry

See merge request OpenMW/openmw!3613
2023-11-29 15:49:19 +00:00
jvoisin
d230c89a56 Merge branch 'rework_resolutions' into 'master'
Rework resolution selection

Closes #7709

See merge request OpenMW/openmw!3622
2023-11-29 13:18:20 +00:00
Andrei Kortunov
5e96825e6b Highlight new items in launcher by text formatting, not by color 2023-11-29 11:14:44 +04:00
Zackhasacat
ae3f9f8dcf Merge branch 'lua_ui_child_element' into 'master'
Lua Element as layout children

See merge request OpenMW/openmw!3582
2023-11-28 21:54:55 +00:00
Andrei Kortunov
623510c073 Use multiplication character in the launcher instead of 'x' 2023-11-28 22:47:27 +04:00
Alexei Kotov
99024d3826 Revamp NIF debug logging
Disabled by default
Extend it to supported files
Log more version info
Reduce noise
2023-11-28 21:46:29 +03:00
Andrei Kortunov
81a6a7cd2f Rework resolution selection (feature 7709) 2023-11-28 22:22:34 +04:00
Alexei Kotov
9c94058727 Support Oblivion parallax setup 2023-11-27 03:41:51 +03:00
Alexei Kotov
9a43ca2d00 Move NiGeometry triangulation to NiGeometry 2023-11-24 23:39:49 +03:00
uramer
9403f06618 Fix visibility breaking after multiple updates 2023-11-24 20:36:45 +01:00
uramer
d214f6f6ef Get rid of unncesesary onCoordChange 2023-11-24 20:36:45 +01:00
uramer
f3a7b087eb Clean up unncesesary namespace prefixes 2023-11-24 20:36:45 +01:00
uramer
86ea12a458 Handle moving element into another element layout 2023-11-24 20:36:45 +01:00
uramer
cf84386cc2 Use Element Content children for Settings UI 2023-11-24 20:36:45 +01:00
uramer
4ba2aca3d3 Handle Element root changing type 2023-11-24 20:36:45 +01:00
uramer
919e067ab7 Error when encountering destroyed widgets 2023-11-24 20:36:45 +01:00
uramer
a36360cbde Update parent coords when updating element 2023-11-24 20:36:45 +01:00
uramer
4a4cef5709 Attach elements to each other, safely destroy 2023-11-24 20:36:45 +01:00
uramer
f037dc814d Allow UI Elements in UI Content 2023-11-24 20:36:45 +01:00
elsid
f08ab9af56
Use SDL2 generate cmake files to find the package 2023-11-24 15:56:54 +01:00
Zackhasacat
5623a5cf01 Merge branch 'lua_sgetcurrent_conditionofitem_itemdata_idea' into 'master'
Lua API to get/set item condition

See merge request OpenMW/openmw!3421
2023-11-23 23:10:39 +00:00
jvoisin
08538dd137 Merge branch 'rm_unused_variable' into 'master'
Remove unused variable

See merge request OpenMW/openmw!3607
2023-11-22 19:46:38 +00:00
Zackhasacat
a38d17a918 Merge branch 'api_inconsistencies' into 'master'
Minor API inconsistencies

See merge request OpenMW/openmw!3601
2023-11-21 03:04:24 +00:00
uramer
c9eaeb47d5 Minor API inconsistencies 2023-11-21 03:04:24 +00:00