1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 18:59:57 +00:00
Commit graph

22788 commits

Author SHA1 Message Date
psi29a
30a844ae71 Merge branch 'how-do-you-ambulate' into 'master'
FEAT(types): Expose creature flags

See merge request OpenMW/openmw!4280
2024-07-29 08:07:36 +00:00
psi29a
765d55208f Merge branch 'axis-lock' into 'master'
Feat(CS): Add shortcuts for axis locking, submode selection, switching camera, and fix render arrows

See merge request OpenMW/openmw!3675
2024-07-29 08:04:48 +00:00
Dave Corley
42060be65c FEAT: Add essential and respawning flags for both NPC and Creature types 2024-07-28 17:14:09 -05:00
Dave Corley
ef9d5270a1 FEAT(types): Expose creature flags 2024-07-28 17:14:05 -05:00
elsid
5c92b18875
Avoid using string_view on a temporary 2024-07-28 23:11:15 +02:00
psi29a
fc2f30dc4a Merge branch 'anim-api-cleanup' into 'master'
Anim api cleanup (close #8081)

Closes #8081

See merge request OpenMW/openmw!4274
2024-07-28 09:17:05 +00:00
Cody Glassman
77eeb5bd92 Merge branch 'master' into 'master'
HALF_FLOAT  and normals changes

See merge request OpenMW/openmw!4240
2024-07-27 15:21:45 +00:00
Jared Davenport
349931b5cd HALF_FLOAT and normals changes 2024-07-27 15:21:44 +00:00
psi29a
2967383636 Merge branch 'dialoguesubview' into 'master'
Do not store references to disposed objects

Closes #8046

See merge request OpenMW/openmw!4272
2024-07-27 09:38:17 +00:00
psi29a
79a9f8c23c Merge branch 'thedreughtookmyenchantmentsandarentgivingthemback' into 'master'
Rebuild ESMStore indices before loading any cell or player state

See merge request OpenMW/openmw!4278
2024-07-27 09:37:44 +00:00
psi29a
f4e5d67476 Merge branch 'ridethestorm' into 'master'
Handle GetItemCount on references without a container store gracefully

See merge request OpenMW/openmw!4277
2024-07-27 09:35:58 +00:00
Alexei Kotov
8a7035020a Don't check subdirectories of valid content subdirectories (#8085) 2024-07-26 21:49:51 +03:00
Andrei Kortunov
21db4219de Use QPersistentModelIndex to react to model changes 2024-07-26 09:57:35 +04:00
Evil Eye
5c4deb3f88 Prevent older binaries from incorrectly loading newer saves 2024-07-25 22:37:44 +02:00
Evil Eye
68be9a9544 Rebuild ESMStore indices before loading any cell or player state 2024-07-25 22:22:23 +02:00
Evil Eye
63e1b0ee9d Handle GetItemCount on references without a container store gracefully 2024-07-25 18:34:53 +02:00
Alexei Kotov
03091f8ce0 Make Coverity happy about animation blending 2024-07-25 02:28:07 +03:00
Anton Uramer
a5d1db2afd Use new Context helpers for UI bindings 2024-07-24 09:28:51 +02:00
Anton Uramer
6851e6e56a Context helpers for caching packages, split up core bindings into multiple caches, remove getRealFrameDuration in global context 2024-07-24 09:28:50 +02:00
Dave Corley
9f8ebc7973 FIX: Correct keybind conflict with move submode and drop to terrain 2024-07-23 13:59:31 -05:00
Dave Corley
55ccec7ecc FIX: Update settings declarations to newer standards 2024-07-23 13:59:31 -05:00
Dave Corley
5afdcddefa Consistency fix in keybind names, simplify instancemode and remove some
dead code
2024-07-23 13:59:21 -05:00
Dave Corley
78c41d3eee Feat(instancemode.cpp): Implement keybinds for axis locking & switching submodes
Cleanup(instancemode): Make the axis shortcut using std::string instead
of format
2024-07-23 13:58:43 -05:00
Dave Corley
98750a122d Feat(worldspacewidget.cpp): store the camera mode tool & implement the
shortcut to cycle camera modes
2024-07-23 13:56:19 -05:00
Dave Corley
2e581c4d70 Feat(CS): Add shortcuts for axis locking, submode selection, and camera cycling 2024-07-23 13:56:14 -05:00
Dave Corley
86f33cb6fe CLEANUP(animationbindings): Lowercase all input groupnames 2024-07-23 11:39:06 -05:00
Dave Corley
6eee6e9468 CLEANUP(animationbindings): camelCase all the things 2024-07-23 05:58:32 -05:00
uramer
80ced23a69 Lua Context: Replace exclusive bools with type enum 2024-07-23 10:39:58 +02:00
Andrei Kortunov
355dd0bccf Do not store references to disposed objects 2024-07-23 10:27:23 +04:00
psi29a
6065dfda2d Merge branch 'gaspthemenuisawerewolf' into 'master'
Update the menu video from a separate thread and respect window resizes

Closes #8063

See merge request OpenMW/openmw!4250
2024-07-22 22:11:17 +00:00
Alexei Kotov
1f4ab3b668 Merge branch 'animationblending' into 'master'
Animation blending implementation. Flexible and moddable through .yaml blending config files.

See merge request OpenMW/openmw!3497
2024-07-22 13:16:06 +00:00
psi29a
89e8514e00 Merge branch 'qvariant_usertype' into 'master'
Improve QVariant usage

See merge request OpenMW/openmw!4261
2024-07-22 07:21:45 +00:00
psi29a
f2aa30f7a5 Merge branch 'fix_nan_get_angles' into 'master'
Avoid getting nan in conversion to euler angles (#7772)

Closes #7772

See merge request OpenMW/openmw!4258
2024-07-22 07:21:29 +00:00
psi29a
376e8a6e1f Merge branch 'bounding_box' into 'master'
lua - use loaded node when possible when calculating bounding box (#7580)

Closes #7580

See merge request OpenMW/openmw!4073
2024-07-21 09:31:22 +00:00
elsid
ad428bd23b
Add unit tests for conversion to euler angles 2024-07-21 01:26:51 +02:00
Sam Hellawell
b9a7bdc0c7 Dont use NormalizedView for yamlpath, use changeExtension, add setting to tests script 2024-07-20 20:15:17 +01:00
Andrei Kortunov
54271b872c Improve QVariant usage 2024-07-20 14:32:56 +04:00
Sam Hellawell
a7a105dfdd Copy by ref, fix unable to find rules warning garbage 2024-07-20 03:10:05 +01:00
Sam Hellawell
78e365f382 Add OpenMW-CS Terrain Equalize tool 2024-07-20 02:30:46 +01:00
Cody Glassman
8105c62a02 handle potentially empty ptrs 2024-07-19 16:10:36 -07:00
Sam Hellawell
4bd078a6db Return offset/angle by reference 2024-07-19 01:29:24 +01:00
Sam Hellawell
ecb5616b36 Use std::sin/std::cos, clarify floating point types, update comment 2024-07-19 01:29:15 +01:00
Sam Hellawell
380d357d02 Fix compilation after master merge 2024-07-19 00:06:01 +01:00
Sam Hellawell
0bcd872561 Clang format 2024-07-19 00:05:35 +01:00
Sam Hellawell
ddbd87e2a1 Fix blending with additional offsets (sneaking issue) 2024-07-19 00:05:31 +01:00
Sam Hellawell
9beb380c7d Remove M_PI, documenation cleanup 2024-07-19 00:05:16 +01:00
Sam Hellawell
5deacb82ff Use M_PI as osg::PIf is not constant 2024-07-19 00:05:16 +01:00
Sam Hellawell
1317434ac0 CI fix 2024-07-19 00:05:03 +01:00
Sam Hellawell
bce97f49b4 spring function clarification 2024-07-19 00:04:16 +01:00
Sam Hellawell
014cba807b Refactor easings, serialize per-line items, constexpr path 2024-07-19 00:04:16 +01:00
Sam Hellawell
72c95a51df Default mEasingFn in constructor 2024-07-19 00:04:16 +01:00
Sam Hellawell
eb290bebbb Refactor AnimBlendControllers 2024-07-19 00:04:16 +01:00
Sam Hellawell
4040bd9231 FIx GCC debug build error 2024-07-19 00:04:16 +01:00
Sam Hellawell
b1b2cceec6 Update translation capitalization 2024-07-19 00:04:16 +01:00
Sam Hellawell
00a7d0281f Cleanup, refactor, rename AnimBlendControllerBase -> AnimBlendController 2024-07-19 00:04:16 +01:00
Sam Hellawell
42406ed0af Use META_Object, ignore for serialize 2024-07-19 00:04:16 +01:00
Sam Hellawell
13e1df3bf0 Grammar cleanup, code cleanup, reduce logging, revert mRotation change 2024-07-19 00:04:16 +01:00
Sam Hellawell
22229dd674 Cleanup, use string_view comparison 2024-07-19 00:04:16 +01:00
Sam Hellawell
07e6ebdea1 Update english translation, add ruski translation 2024-07-19 00:04:16 +01:00
Max Yari
136be62146 Launcher checkbox
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-07-19 00:04:15 +01:00
Max Yari
55ffb6d7d2 Animation blending implementation for NIF and osgAnimation through YAML files
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-07-19 00:04:15 +01:00
psi29a
2c8d657ecb Merge branch 'luaopensesame' into 'master'
Lua door opening api

See merge request OpenMW/openmw!4251
2024-07-15 07:09:44 +00:00
MaxYari
1abe28e797 Lua door opening api 2024-07-15 07:09:44 +00:00
psi29a
3ffd6a7ae9 Merge branch 'tests_log' into 'master'
Support custom log level in tests

See merge request OpenMW/openmw!4179
2024-07-15 07:07:18 +00:00
psi29a
cc28396617 Merge branch 'evictthosewindows' into 'master'
Force windows to exit when popping their GUI mode through Lua

Closes #7834

See merge request OpenMW/openmw!4185
2024-07-15 07:07:02 +00:00
elsid
a5d9bb08e0
Support custom log level in tests 2024-07-13 11:15:34 +02:00
elsid
1bdc01273e
Move "debugging" function into Debug namespace 2024-07-13 11:15:33 +02:00
elsid
6d43aedec8
Use Lua modules in tests from the source directory 2024-07-13 11:14:55 +02:00
elsid
73d48720ef
Do not change output names for targets
Changing them does not solve any problem but only creates some.
2024-07-13 10:35:16 +02:00
elsid
b3abc436dd
Keep separation between openmw and openmw-lib on Android
They are not set up properly so CMake configuration fails because of not found
openmw-lib target since it's not defined for Android.
2024-07-13 10:35:12 +02:00
Evil Eye
de59d79388 Update the menu video from a separate thread and respect window resizes 2024-07-11 16:53:11 +02:00
Dave Corley
4cc956fdd7 TEST: Add a test to ensure invalid box extents are not assigned 2024-07-11 04:06:06 -05:00
psi29a
e9343da7a8 Merge branch 'themawithungers' into 'master'
Don't trigger onNewExterior while loading saves

See merge request OpenMW/openmw!4206
2024-07-11 09:03:01 +00:00
psi29a
1c71f12d4e Merge branch 'hopskipanimjump' into 'master'
Keep running scripts until the menu pauses the game

Closes #8056

See merge request OpenMW/openmw!4243
2024-07-09 21:33:37 +00:00
psi29a
ecb64eab8e Merge branch 'juststrummingmylute' into 'master'
Attempt to select an AI action directly instead of waiting for the next frame

Closes #7973

See merge request OpenMW/openmw!4244
2024-07-09 21:32:32 +00:00
psi29a
7d0fca1bf5 Merge branch 'noscript' into 'master'
Make mwscript return nil for records that don't have a script

See merge request OpenMW/openmw!4236
2024-07-09 07:47:24 +00:00
Evil Eye
134c099df9 Attempt to select an AI action directly instead of waiting for the next frame 2024-07-08 19:59:50 +02:00
Evil Eye
299ee1a6b1 Keep running scripts until the menu pauses the game 2024-07-08 17:07:52 +02:00
psi29a
3a5ed998e7 Merge branch 'timeplayed' into 'master'
Remove time played setting

See merge request OpenMW/openmw!4235
2024-07-08 07:29:29 +00:00
Evil Eye
ee653eb2b8 Make mwscript return nil for records that don't have a script 2024-07-07 13:58:34 +02:00
psi29a
061f10bef7 Merge branch 'enchantmentproptorecord' into 'master'
Return nil for absent values in record properties (enchant)

See merge request OpenMW/openmw!4228
2024-07-06 21:33:55 +00:00
psi29a
e8c422697f Merge branch 'first_person_mesh_distortion' into 'master'
Fix distortion breaking in first person meshes

See merge request OpenMW/openmw!4231
2024-07-06 07:46:35 +00:00
Kindi
bf9f5dc2ef dont return empty string for absent value 2024-07-06 00:40:06 +08:00
Kindi
045e6d8c4f move enchant charge and soul to itemdata 2024-07-05 23:33:55 +08:00
psi29a
ef0bb02def Merge branch 'master' into 'master'
An ability to specify attack type in controls.use value

See merge request OpenMW/openmw!4187
2024-07-05 08:12:17 +00:00
psi29a
804b589a68 Merge branch 'qt_follow_up' into 'master'
Cleanup changes in Qt applications

See merge request OpenMW/openmw!4225
2024-07-05 08:11:42 +00:00
Alexei Kotov
888abc0097 Remove time played setting 2024-07-05 07:13:45 +03:00
Cody Glassman
4d7e9bae73 ensure distortion is only rendered once 2024-07-04 21:07:40 -07:00
Andrei Kortunov
dc7407a34c Use signed variables to match an API 2024-07-04 09:54:48 +04:00
Dave Corley
fc65643224 FIX: Actually set the transform so first person camera works again 2024-07-03 23:02:20 -05:00
Cody Glassman
45cb3eb081 lua - use loaded node when possible when calculating bounding box 2024-07-03 13:29:01 -07:00
psi29a
81e59bb4aa Merge branch 'i-didnt-want-to-grow-up-to-be-this-big' into 'master'
FIX: Incorrect scaling applied when creatures rotate (close #6665)

Closes #6665

See merge request OpenMW/openmw!4219
2024-07-02 07:07:31 +00:00
Andrei Kortunov
a9108a743d Do not make redundant copy 2024-07-01 20:50:25 +04:00
psi29a
3ebeaaa3bb Merge branch 'saymyname' into 'master'
Don't use getRefIdString to get a fallback object name for non-string ids

Closes #8043

See merge request OpenMW/openmw!4217
2024-07-01 07:44:57 +00:00
psi29a
045bccb3e9 Merge branch 'copycompiler' into 'master'
Avoid a few copies in mwscript

See merge request OpenMW/openmw!4215
2024-07-01 07:43:53 +00:00
psi29a
024d1c5971 Merge branch 'interpreter_code_duplicates' into 'master'
Exit with fatal error on duplicated instruction code

See merge request OpenMW/openmw!4214
2024-07-01 07:42:50 +00:00
Evil Eye
ff72a26ef2 Don't use getRefIdString to get a fallback object name for non-string ids 2024-06-30 11:27:39 +02:00
Dave Corley
fcc58f6db3 CLEANUP(rotatecontroller): Deduplicate rotate/scale checks into the main
callback function
2024-06-29 23:15:18 -05:00
Dave Corley
cac5ae34a5 CLEANUP(character.cpp): Replace usages of biped function with isBiped var 2024-06-29 22:53:38 -05:00
Dave Corley
33cd654bf5 FIX(character.cpp): Don't allow turn to movement direction to apply to non-bipeds 2024-06-29 22:53:15 -05:00
Dave Corley
c95c7503a8 FIX(rotatecontroller): Account for parent node scale when rotating objects 2024-06-29 22:52:48 -05:00
psi29a
b1de8ed720 Merge branch 'profilersort' into 'master'
Reorder F3 profiler stats according to timeline

Closes #8005

See merge request OpenMW/openmw!4196
2024-06-29 09:21:48 +00:00
psi29a
4da35c7e7f Merge branch 'free_range_containers' into 'master'
FEAT: Add organic/respawning flags to containers (Close #8038)

Closes #8038

See merge request OpenMW/openmw!4205
2024-06-29 09:21:12 +00:00
psi29a
11d405dcdf Merge branch 'buyfrommebestprices' into 'master'
Add a showInDialogue parameter to ui.showMessage and use it for level up messages

Closes #8041

See merge request OpenMW/openmw!4209
2024-06-29 09:20:27 +00:00
Evil Eye
ad7fb3d13f Avoid a few copies in mwscript 2024-06-29 10:31:49 +02:00
elsid
89bb04e8fd
Exit with fatal error on duplicated instruction code
Instead of causing SIGABRT which is more confusing.
2024-06-28 22:24:24 +02:00
Dave Corley
77fa41b8c6 CLEANUP(container): Make organic/respawning field names more consistent 2024-06-28 09:26:35 -05:00
Dave Corley
fccf75377d FEAT: Add organic/respawning flags to containers 2024-06-28 09:21:44 -05:00
Max Yari
1497dae4fa Better mUse out-of-range handling 2024-06-28 10:00:04 +02:00
Andrei Kortunov
5390634e22 Add a missing null pointer check 2024-06-27 21:10:38 +04:00
Evil Eye
91bcd0a556 Add a showInDialogue parameter to ui.showMessage and use it for level up messages 2024-06-27 17:16:49 +02:00
Max Yari
3eadb84142 Fixed wrong mUse wrapping 2024-06-26 01:25:25 +02:00
psi29a
6754b8d941 Revert "Merge branch 'were_engineers_not_salt_miners' into 'master'"
This reverts merge request !4178
2024-06-25 20:58:31 +00:00
psi29a
8471cfb576 Merge branch 'localpairs' into 'master'
Allow mwscript variable iteration

See merge request OpenMW/openmw!4180
2024-06-25 07:20:14 +00:00
psi29a
64dd6e36d1 Merge branch 'openmw-cs-error-verify-refnums' into 'master'
OpenMW-CS verify duplicate RefNums

See merge request OpenMW/openmw!4012
2024-06-24 18:03:59 +00:00
cykoder
57e7bf3748 OpenMW-CS verify duplicate RefNums 2024-06-24 18:03:59 +00:00
psi29a
11c2cf0780 Merge branch 'esm_script' into 'master'
Make loading and saving ESM3 script record more robust

See merge request OpenMW/openmw!4195
2024-06-24 17:59:20 +00:00
Evil Eye
152073a42e Don't trigger onNewExterior while loading saves 2024-06-24 12:47:24 +02:00
psi29a
57adb93075 Merge branch 'coverity' into 'master'
Coverity fixes

See merge request OpenMW/openmw!4198
2024-06-24 07:10:28 +00:00
psi29a
b8d861ca16 Merge branch 'unscriptedrealitytv' into 'master'
Don't try to show unallocated or uninitialized profiling data

See merge request OpenMW/openmw!4188
2024-06-24 07:09:43 +00:00
psi29a
456ac2a85b Merge branch 'were_engineers_not_salt_miners' into 'master'
FEAT: Lua Engine Handler for MWScript `startscript` functionality

See merge request OpenMW/openmw!4178
2024-06-24 07:09:24 +00:00
Dave Corley
1a79e79f57 FEAT: Lua Engine Handler for MWScript startscript functionality 2024-06-24 07:09:23 +00:00
psi29a
d3c3d0cf44 Merge branch 'indexthemoon' into 'master'
Move Lua index helpers to components and make owner.factionRank match other ranks

See merge request OpenMW/openmw!4186
2024-06-24 07:06:24 +00:00
Max Yari
13918e3b70 AttackType -> ATTACK_TYPE 2024-06-24 01:15:43 +02:00
Evil Eye
5cf809f39b Merge branch 'ocd' into 'master'
Assorted nitpicks

See merge request OpenMW/openmw!4194
2024-06-23 07:10:07 +00:00
psi29a
7888a11c36 Merge branch 'lushemptyplants' into 'master'
Don't display the harvested plant if graphic herbalism is off

See merge request OpenMW/openmw!4193
2024-06-22 16:35:59 +00:00
Alexei Kotov
b0671c76d8 Throw on setting tags that can't provide the setting name 2024-06-22 14:34:09 +03:00
Alexei Kotov
43b381f592 Loop by const ref in activeSpells.add 2024-06-22 12:08:40 +03:00
psi29a
0013a44b71 Merge branch 'datadisplaydelegate' into 'master'
React to scale or color changes in editor tables

See merge request OpenMW/openmw!4098
2024-06-22 09:03:19 +00:00
holorat
cd4b7db02d Reorder profiler stats according to timeline 2024-06-22 00:27:49 +03:00
Max Yari
b01b76b81e Introduced attacktype enum, fixed lua docs 2024-06-21 23:18:48 +02:00
Max Yari
2ef0568dda Changed lua enum name, tweaked docs 2024-06-21 23:18:48 +02:00
Max Yari
7d659ae64c Added lua enum for attacktypes 2024-06-21 23:18:48 +02:00
Max Yari
22d9906978 An ability to specify attack type in controls.use value 2024-06-21 23:18:48 +02:00
elsid
5c3ae3d94c
Make loading and saving script record more robust
* Check the header presence before using it.
* Write the header based on the actual content.
2024-06-21 20:37:37 +02:00
Alexei Kotov
c6156011c8 Remove unnecessary lines in actor bindings 2024-06-21 20:22:26 +03:00
Alexei Kotov
479d4931d7 Handle negative MaxNumberRipples more sensibly 2024-06-21 20:16:43 +03:00
elsid
447c4bb6a0
Extend ESM3 Script record tests 2024-06-21 18:01:34 +02:00
elsid
4571a8b88a
Remove unused SCHD type 2024-06-21 15:39:17 +02:00
Evil Eye
2edbabd3d7 Don't display the harvested plant if graphic herbalism is off 2024-06-21 12:15:11 +02:00
Evil Eye
46c8133a72 Don't try to show unallocated or uninitialized profiling data 2024-06-20 19:36:30 +02:00
psi29a
3a686dd8af Merge branch 'lua_travel_dest_2' into 'master'
Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered

See merge request OpenMW/openmw!3592
2024-06-19 21:38:27 +00:00
Zackhasacat
533ce499e0 Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered 2024-06-19 21:38:27 +00:00
Evil Eye
6aa52c09da Shuffle code around 2024-06-19 16:47:58 +02:00
Evil Eye
d6fc0744c7 Move Lua index helpers to components and make owner.factiooRank match other ranks 2024-06-18 21:32:16 +02:00
Evil Eye
989686500c Force windows to exit when popping their GUI mode through Lua 2024-06-18 20:02:39 +02:00
Evil Eye
0f20e47e0e Add unit tests 2024-06-18 17:43:48 +02:00
Evil Eye
2adaf33fa2 Allow mwscript variable iteration 2024-06-18 17:43:48 +02:00
Kindi
ecb07c9bc7 add mwscript.isRunning 2024-06-17 08:05:52 +08:00
Alexei Kotov
39a231233c Fully reset the player's cell reference when the player is reset (#8021) 2024-06-15 11:49:12 +03:00
psi29a
218e19d8f7 Merge branch 'mapshenanigans' into 'master'
Fix local map issues

Closes #8004

See merge request OpenMW/openmw!4174
2024-06-15 08:42:36 +00:00
psi29a
05a70b29c5 Merge branch 'rangingareas' into 'master'
Don't apply area of effect for potions and improve range handling

Closes #8018

See merge request OpenMW/openmw!4172
2024-06-15 08:42:11 +00:00
psi29a
98ba2120b6 Merge branch 'zerotohero' into 'master'
Use -1 as the plugin index for LandTextures

See merge request OpenMW/openmw!4121
2024-06-14 07:22:27 +00:00
psi29a
6caac886ea Merge branch 'equalopportunity' into 'master'
Support light fade settings in legacy lighting method, remove launcher lighting settings that support runtime changes

See merge request OpenMW/openmw!4168
2024-06-14 07:21:19 +00:00
Evil Eye
5a54cd9406 Fix local map issues 2024-06-13 23:03:57 +02:00
Evil Eye
a934902f12 Don't apply area of effect for potions and improve range handling 2024-06-13 18:00:44 +02:00
Dave Corley
b7deb7e9bc Feat(CS): Make LMB the primary interaction 2024-06-12 19:36:55 -05:00
Alexei Kotov
d226b72592 Throw on invalid bone group indices in getActiveGroup 2024-06-12 23:26:16 +03:00
Alexei Kotov
6ad914919b Remove launcher lighting settings that support runtime changes
Also update lighting method descriptions
2024-06-12 22:44:12 +03:00
Evil Eye
fbc6629d40 Rework land texture handling 2024-06-12 17:09:28 +02:00
Alexei Kotov
5c6fbc332f Fix endif conditions in cmake 2024-06-12 15:43:04 +03:00
Alexei Kotov
65a9f78943 Fix flags used in terrain saving/loading tests 2024-06-12 12:50:20 +03:00
psi29a
c1d74763ed Merge branch 'i-have-no-land-and-i-must-scream' into 'master'
Fix(CS): Add landscape flag if it doesn't exist at all and improve landscape QOL

Closes #7707

See merge request OpenMW/openmw!3617
2024-06-11 11:10:33 +00:00
psi29a
61772fa234 Merge branch 'verifiers' into 'master'
Complain about fishy local variable names, improve editor effect list handling

See merge request OpenMW/openmw!4160
2024-06-11 11:10:19 +00:00
psi29a
0a7f4e5149 Merge branch 'unit_tests' into 'master'
Split openmw_test_suite into openmw and components tests

See merge request OpenMW/openmw!4166
2024-06-11 11:09:43 +00:00
elsid
1e98cc6c3b
Move EXPECT_ERROR macro to a separate header
To include it only where it's required.
2024-06-10 23:12:15 +02:00
elsid
7d1cd11ba9
Split openmw_test_suite into openmw and components tests
To avoid duplicated compilation for openmw translation units. Link openmw-lib to
openmw-tests instead.
2024-06-10 23:12:14 +02:00
elsid
9b0362fba8
Split openmw into binary and library
To make it possible to create a new binary for the tests by linking this
library to it.

Rename openmw-lib into openmw to have libopenmw.a on Linux. Do not rename it on
Windows to avoid conflict with automatically generated lib for exe due to
__declspec(dllexport) presence.
2024-06-10 23:11:34 +02:00
elsid
2e0e0f53b6
Add --coverage to openmw-cs 2024-06-10 23:04:01 +02:00
Evil Eye
965bc20bab Set mPluginIndex to -1 for textures defined in this plugin 2024-06-10 21:39:10 +02:00
Evil Eye
ed5bedb9db Use record state to determine if a LandTexture record was defined in the current plugin 2024-06-10 21:39:10 +02:00
psi29a
cbf0471d8a Merge branch 'launch_button' into 'master'
Set minimum width for Launch OpenMW button

See merge request OpenMW/openmw!4162
2024-06-10 13:51:13 +00:00
psi29a
3ef4180464 Merge branch 'soulless' into 'master'
Properly copy items between containers

See merge request OpenMW/openmw!4139
2024-06-10 13:49:51 +00:00
psi29a
56183ba982 Merge branch 'ingameppl' into 'master'
Move force per-pixel lighting setting to the in-game settings

See merge request OpenMW/openmw!4137
2024-06-10 13:49:14 +00:00
Dave Corley
659874cb65 FEAT: Update land flag representation in ESMTool 2024-06-10 02:03:02 -05:00
Dave Corley
145f9c1154 CLEANUP(CS): Do heightData check in actual implementation, revert
accidental change to land condition order
2024-06-10 02:02:31 -05:00
Dave Corley
86316fa7ab Fix(cell.cpp): Don't try to update land for interiors 2024-06-10 02:02:31 -05:00
Dave Corley
10eb807e72 Fix(Cell.hpp): Correct include path for document 2024-06-10 02:02:31 -05:00
Dave Corley
0a8fee59dd Don't store member variables from document & use simpler and safer
inputs to cell constructor. Explicitly tell the constructor whether land
should be loaded or not
2024-06-10 02:02:31 -05:00
Dave Corley
47044e1dc0 Cleanup(CS): re-add const for land collection 2024-06-10 02:02:31 -05:00
Dave Corley
89bce6f678 Fix(CS): Enum name in accordance with current standards 2024-06-10 02:02:31 -05:00
Dave Corley
6f2ae4a33b Cleanup(CS): Improve readability and clean up some implementations 2024-06-10 02:02:31 -05:00
Dave Corley
ad135e3b95 Fix(cell.cpp): Change commands.hpp to absolute include path 2024-06-10 02:02:31 -05:00
Dave Corley
d8187e40b2 Feat(CS): Create LAND record using the undo stack 2024-06-10 02:02:31 -05:00
Dave Corley
731302ecff Feat(CS): Add undo stack as a member of CSVRender::Cell 2024-06-10 02:02:31 -05:00
Dave Corley
f565730a9a Fix(cell.cpp): never try to update land for interiors 2024-06-10 01:58:34 -05:00
Dave Corley
dd7a2f22d1 Cleanup(CSVRender::Cell:updateLand): Early exit when landscape should
not be loaded
2024-06-10 01:58:34 -05:00
Dave Corley
78fd135764 Fix(CS): Remove unreachable code as land data will always be present 2024-06-10 01:58:34 -05:00
Dave Corley
3e7335ddc7 Fix(CS): Initialize landscape when opening an existing cell without VHGT 2024-06-10 01:58:34 -05:00
Dave Corley
2541b74fc6 Fix(CS): Apply land flags when appropriate edits are made 2024-06-10 01:58:34 -05:00
elsid
6ba42314df
Fix Ptr::toString 2024-06-09 04:08:18 +02:00
Andrei Kortunov
fb3687e62a Set minimum width for Launch OpenMW button 2024-06-08 17:20:54 +04:00
Alexei Kotov
dd0ff13ba9 Reset attribute/skill arguments in IngredEffectRefIdAdapter if needed 2024-06-08 13:50:40 +03:00
Alexei Kotov
3051e0834a Accept invalid effect IDs and ranges in EffectsListAdapter 2024-06-08 13:49:39 +03:00
psi29a
9087de1596 Merge branch 'esm3_land' into 'master'
Add unit tests for saving and loading ESM3 Land

See merge request OpenMW/openmw!4159
2024-06-08 10:47:58 +00:00
Alexei Kotov
252ee7f8c4 Deduplicate effect list verification
Drop Potion-specific range check, it's irrelevant
2024-06-08 06:31:18 +03:00
Alexei Kotov
ba20ba2c6c Editor: Warn if a magic effect's max magnitude is zero 2024-06-08 06:31:18 +03:00
Alexei Kotov
2fdbd6287d Editor: Verify magic effects for enchantments, ingredients and potions
Use constants for known magic effect/skill/attribute range
2024-06-08 06:31:17 +03:00
Kagernac
7d403089ec Cleaner implementation
Retrieved the Colours straight from Settings

Made tagname clearer in openmw_list.skin.xml

Fixed minor formatting issue in validate.cpp, textcolours.cpp

Updated skin variables to be const and string_view
2024-06-07 18:38:32 -07:00
psi29a
176e6490c5 Merge branch 'stufftheminasack' into 'master'
Drop 360-degree screenshot support (#7720)

Closes #7720

See merge request OpenMW/openmw!4158
2024-06-07 20:50:43 +00:00
psi29a
a80f5c109c Merge branch 'ltexerasure' into 'master'
Fix LTEX overriding and allow deletion

See merge request OpenMW/openmw!4152
2024-06-07 08:05:56 +00:00
elsid
044748725c
Add unit tests for saving and loading ESM3 Land 2024-06-07 00:22:24 +02:00
psi29a
24d8accee7 Merge branch 'lua_base_disposition_fns' into 'master'
lua - Add [get,set,mod]BaseDisposition functions to npc type

See merge request OpenMW/openmw!4142
2024-06-06 21:44:55 +00:00
Mads Buvik Sandvei
e063fa5b23 rename template_ to templatePtr 2024-06-06 16:51:51 +02:00
Alexei Kotov
93d1c6d7e0 Drop 360-degree screenshot support (#7720) 2024-06-06 14:46:01 +03:00
Mads Buvik Sandvei
90b415a8dd comments by elsid 2024-06-06 11:20:14 +02:00
Alexei Kotov
593d4ff714 Move per-pixel lighting to the in-game settings 2024-06-06 05:19:33 +03:00
psi29a
ee5ccaa760 Merge branch 'setangleaxis' into 'master'
Fix SetAngle alternative axis order

See merge request OpenMW/openmw!4155
2024-06-05 21:00:15 +00:00
Evil Eye
330f5de78d Rename ot mStatic 2024-06-05 21:48:07 +02:00
Sebastian Fieber
ed26708e4d more dry + restrict mutation of disposition to global and on self 2024-06-05 18:09:54 +02:00
Alexei Kotov
32ca57c9ad Merge branch 'unify_operation_bars' into 'master'
Unify operation progress bar appearance

See merge request OpenMW/openmw!4154
2024-06-05 11:31:27 +00:00
Kagernac
3e6ccfce1f Took @Capostrophic's suggestion about leveraging a new tag format
Removed the color settings from Textcolours, they are unneccessary

Removed the Fallback workaround as a dedicated else condition was created with the new tag "fontcolouroptional". This code section has no involvement in Fallback

openmw_list.skin.xml was updated to reflect this new tag

settings.cfg was updated with the updated variable names
2024-06-04 23:14:44 -07:00
psi29a
8f3625b6a8 Merge branch 'cleanup_object_paging' into 'master'
Cleanup object paging

See merge request OpenMW/openmw!4149
2024-06-04 20:39:37 +00:00
jvoisin
c7f3277744 Merge branch 'waterfiltering' into 'master'
Apply filtering settings to water normal map

See merge request OpenMW/openmw!4151
2024-06-04 16:37:52 +00:00
Alexei Kotov
4a394a391b Fix SetAngle alternative axis order 2024-06-04 18:44:55 +03:00
Andrei Kortunov
eac2082e82 Unify operation progress bar appearance 2024-06-04 11:07:08 +04:00
Alexei Kotov
56b31d87e3 Merge branch 'soundfixes' into 'master'
Follow-up work for Lua-based music

See merge request OpenMW/openmw!4146
2024-06-03 22:03:04 +00:00
Evil Eye
ca6baed366 Fix LTEX overriding and allow deletion 2024-06-03 16:42:27 +02:00
Alexei Kotov
c7e98fdb45 Apply filtering settings to water normal map 2024-06-03 11:12:29 +03:00
elsid
2169e22e93
Move key when inserting item to mLODNameCache 2024-06-02 13:16:22 +02:00
elsid
6e3fd34790
Calculate floor and ceil of bounds once 2024-06-02 13:16:22 +02:00
elsid
3790e97184
Clarify scope and constness of the variables 2024-06-02 13:16:22 +02:00
elsid
d9d8802f3a
Move node when inserting into a nodes map 2024-06-02 13:16:22 +02:00
elsid
aecdf04705
Use custom struct for CellRef used by object paging
ESM::CellRef is too heavy. There is no need to have all the data from there.
2024-06-02 13:16:21 +02:00
elsid
0040409a4d
Move collectESM3References to unnamed namespace 2024-06-02 13:16:21 +02:00
elsid
524af5b723
Move symbols not defined in header to unnamed namespace 2024-06-02 13:16:20 +02:00
Andrei Kortunov
7b5146e824 Do not allow Lua's "stopMusic" to interrupt MWScript's music 2024-06-02 13:18:06 +04:00
Andrei Kortunov
402e725d87 Reset music type to Normal when we are done to scripted music 2024-06-02 09:44:41 +04:00
Andrei Kortunov
e762ae9703 Move current music from MechanicsManager to SoundManager 2024-06-02 09:29:28 +04:00
psi29a
05815b3952 Merge branch 'settingswindow' into 'master'
Hide the settings window when any main menu button is pressed

See merge request OpenMW/openmw!4136
2024-06-01 15:31:56 +00:00
Mads Buvik Sandvei
a1b695a8d5 De-duplicate ManualRef constructor 2024-05-31 23:10:54 +02:00
Sebastian Fieber
da4531faa0 rename modBaseDisposition to modifyBaseDisposition 2024-05-31 19:39:02 +02:00
Sebastian Fieber
f683adeb14 Add [get,set,mod]BaseDisposition functions to npc type 2024-05-30 00:08:11 +02:00
Mads Buvik Sandvei
ae4bf04798 Fix soul gems losing their souls when splitting stacks between containers. 2024-05-28 23:35:44 +02:00
elsid
6218afa484
Cleanup object paging includes 2024-05-28 22:21:15 +02:00
elsid
b5a75ba96c
Use std::vector to collect ChunkIds to be removed
Cache does not have duplicated entries.
2024-05-28 22:21:15 +02:00
elsid
b64069156d
Convert position on construction 2024-05-28 22:21:15 +02:00
elsid
33ef7fc8ca
Make ClearCacheFunctor a class and rename to clarify the purpose 2024-05-28 22:21:14 +02:00
psi29a
e7c9574d31 Merge branch 'savetheslot' into 'master'
Convert constant effect equipment slots to refnums

Closes #7998

See merge request OpenMW/openmw!4130
2024-05-28 11:09:36 +00:00
psi29a
8cf6fde8b6 Merge branch 'fix_debug_render' into 'master'
Fix debug render for recast mesh and navmesh

See merge request OpenMW/openmw!4127
2024-05-28 07:38:00 +00:00
psi29a
af4adf41d0 Merge branch 'saveyourvanityforsomeonewhocares' into 'master'
Toggle the vanity camera off before toggling to the saved camera mode

Closes #7960

See merge request OpenMW/openmw!4135
2024-05-28 07:37:44 +00:00
psi29a
4ae29b0042 Merge branch 'log_exceptions' into 'master'
Log caught exceptions

See merge request OpenMW/openmw!4131
2024-05-28 07:36:30 +00:00
Alexei Kotov
340783e3a1 Merge branch 'modernprometheus' into 'master'
Make torches held by creatures emit light

Closes #8002

See merge request OpenMW/openmw!4134
2024-05-27 18:19:58 +00:00
Andrei Kortunov
204267d211 React to scale or color changes in editor tables 2024-05-27 18:38:33 +04:00
Alexei Kotov
131bb510e4 Merge branch 'operation_fixes' into 'master'
Improve operations widget formatting, part 2

See merge request OpenMW/openmw!4119
2024-05-27 01:07:07 +00:00
Alexei Kotov
7274d825a3 Hide the settings window when any main menu button is pressed 2024-05-26 23:49:52 +03:00
Evil Eye
9027af426b Toggle the vanity camera off before toggling to the saved camera mode 2024-05-26 11:35:13 +02:00
Evil Eye
a7026ae3e9 Make torches held by creatures emit light 2024-05-26 09:52:50 +02:00
elsid
71369be796
Log caught exceptions 2024-05-26 02:52:11 +02:00
Andrei Kortunov
2749d2a6cb Revert "Make sure that Open button becomes focused after enabling"
This reverts commit d5bbd75828.
2024-05-25 23:43:19 +04:00
Evil Eye
11e8e1eeb5 Include creatures 2024-05-25 09:58:46 +02:00
psi29a
62930cb8db Merge branch 'fix_archives_selection' into 'master'
Fix archive selection when switching profiles (#7956)

See merge request OpenMW/openmw!4118
2024-05-24 23:06:55 +00:00
Yury Stepovikov
80d2b289e7 Fix archive selection when switching profiles (#7956) 2024-05-24 23:06:55 +00:00
psi29a
6e0606b55b Merge branch 'paralysisagainagain' into 'master'
Make paralysis cancel camera mode changes (#7997)

Closes #7997

See merge request OpenMW/openmw!4122
2024-05-24 23:06:35 +00:00
psi29a
c8567e96fd Merge branch 'itsover32767' into 'master'
Use more appropriate types in terrain storage

See merge request OpenMW/openmw!4125
2024-05-24 21:56:20 +00:00
psi29a
157a5a4489 Merge branch 'l10n' into 'master'
Many localization fixes

See merge request OpenMW/openmw!4108
2024-05-24 17:46:47 +00:00
Evil Eye
cdfd305ac3 Convert constant effect equipment slots to refnums 2024-05-24 16:59:48 +02:00
elsid
d6af9305ae
Exclude debug rendering from toggleworld 2024-05-24 01:08:15 +02:00
elsid
4b8897e33e
Use state sets without transparency support for recast mesh and agents paths 2024-05-24 00:05:10 +02:00
elsid
98d530d8cb
Share state sets for recast mesh tiles and actors paths 2024-05-24 00:05:09 +02:00
Evil Eye
6a10311ae5 Use more appropriate types in terrain storage 2024-05-23 18:48:54 +02:00
psi29a
d15be7a685 Merge branch 'fix-nearest-gui-options' into 'master'
Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI

See merge request OpenMW/openmw!4114
2024-05-23 10:07:42 +00:00
psi29a
db27543ea1 Merge branch 'uniform_choice' into 'master'
Add choice widget type to postprocessing uniforms

See merge request OpenMW/openmw!3969
2024-05-23 10:06:22 +00:00
psi29a
b0aa19dc07 Merge branch 'msvc_crash_fix' into 'master'
Avoid MSVC crash in Visual Studio 17.10.0

See merge request OpenMW/openmw!4116
2024-05-23 10:05:52 +00:00
Alexei Kotov
ae7861abe4 Move paralysis god mode checks to CreatureStats 2024-05-23 11:48:59 +03:00
Kagernac
f9577d904c This commit introduces six new color settings for dialogue topic keywords
referencing settings.cfg and settings-default.cfg. These settings work similarly
to the color references found in openmw.cfg and Morrowind.ini.

Changes include:

Removal of deprecated settings:
color topic specific
color topic exhausted
Addition of six new color settings to settings.cfg and settings-default.cfg
Updated description in settings-default.cfg to reflect the new color format
2024-05-22 20:25:58 -07:00
Sam Hellawell
d3c1aa6653 Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI 2024-05-23 04:11:29 +01:00
psi29a
2be6116ef6 Merge branch 'fix_recastmesh' into 'master'
Limit number of cached tiles with recast meshes

See merge request OpenMW/openmw!4112
2024-05-22 20:38:42 +00:00
Andrei Kortunov
52de6177d1 Avoid MSVC crash in Visual Studio 17.10.0 2024-05-22 18:17:22 +04:00
Andrei Kortunov
6c83451b15 Improve operations widget formatting 2024-05-22 14:37:58 +04:00
Alexei Kotov
67c47b8603 Merge branch 'operation_fixes' into 'master'
Improve operation widget appearance

See merge request OpenMW/openmw!4110
2024-05-21 19:31:39 +00:00
Dave Corley
c87eaefd17 Merge branch 'theeditorisjustanotherengine' into 'master'
Use ESM::ReadersCache in the editor

Closes #7896

See merge request OpenMW/openmw!4111
2024-05-21 06:35:47 +00:00
psi29a
cd116ebe5f Merge branch 'dark_mode' into 'master'
Support dark mode on Windows

Closes #7985

See merge request OpenMW/openmw!4101
2024-05-20 14:51:20 +00:00
Andrei Kortunov
bf682d51a6 Support dark mode on Windows (feature 7985) 2024-05-20 16:50:24 +04:00
psi29a
fd3ae0d42a Merge branch 'dehardcode_music' into 'master'
Dehardcode music

See merge request OpenMW/openmw!3438
2024-05-20 12:49:33 +00:00
psi29a
f34994e4c8 Merge branch 'notexturetypeconfusion' into 'master'
Support defining the texture type with a state attribute (#6240)

Closes #6240

See merge request OpenMW/openmw!4079
2024-05-20 12:48:30 +00:00
psi29a
651a7d569c Merge branch 'activatebooks' into 'master'
Allow NPCs to activate in-world books for the player (part of #7959)

See merge request OpenMW/openmw!4080
2024-05-20 12:46:01 +00:00
psi29a
d67bc1defd Merge branch 'timeplayedhours' into 'master'
Improve Time Played formatting (#7971)

Closes #7971

See merge request OpenMW/openmw!4107
2024-05-20 12:45:49 +00:00
Kagernac
02730af391 Changing the skin of the widget seems to be the easiest way to have the choices in the list react to specific conditions and interactions.
Seems that changing the skin modifies some size properties so they had to be reset.

Needed to create a specific skin in order to prevent modifying unintended text.

The exhausted color is not referenced by the settings.cfg, the user will need to modify the color in the skin file.

Edit: Fixed the coding convention issues and converted the tabs into spaces in the .xml. Closed the previous merge request out of confusion, sorry new to Git.
2024-05-19 14:43:41 -07:00
Alexei Kotov
a3bfd3a337 Merge branch 'fix-infinite-fall-into-void' into 'master'
Fix infinite fall into void (#1415)

Closes #1415

See merge request OpenMW/openmw!4100
2024-05-19 20:47:13 +00:00
Alexei Kotov
e96ebec2cf Merge branch 'fix_lua_attack' into 'master'
Allow Actors to pick an attack type/animation when no AI applies (fix #7583)

Closes #7583

See merge request OpenMW/openmw!4102
2024-05-19 20:40:09 +00:00
Alexei Kotov
03652104fe Merge branch 'cleanup_preloading' into 'master'
Cleanup preloading code

See merge request OpenMW/openmw!4104
2024-05-19 20:39:28 +00:00
Evil Eye
77d554594f Add ReadersCache::clear 2024-05-19 20:39:23 +02:00
Andrei Kortunov
5a1ec8ce87 Implement Lua-based music 2024-05-19 22:10:54 +04:00
elsid
45d62ee59f
Limit RecastMeshManager range by active cell grid 2024-05-19 20:07:47 +02:00
elsid
49db37ee29
Merge setWorldspace and updateBounds 2024-05-19 20:07:47 +02:00
elsid
9854d42d56
Use ESM::RefId for worldspace type 2024-05-19 20:07:47 +02:00
elsid
5d28164416
Remove recast mesh tiles outside active range 2024-05-19 20:07:47 +02:00
elsid
4f5bdbb4fb
Remove recastmesh group for absent tile 2024-05-19 20:07:47 +02:00
Evil Eye
5f0fe8097c Use ESM::ReadersCache in the editor 2024-05-19 18:55:37 +02:00
Andrei Kortunov
3d699bd533 Improve operation widget appearance 2024-05-19 15:56:44 +04:00
Alexei Kotov
908f3891fb Add helper method for texture type recovery 2024-05-19 02:26:40 +03:00
Alexei Kotov
84f4ba4ca1 Support defining the texture type with a state attribute (#6240)
Named textures are still supported for easier native format compatibility (and so that I don't have to edit the documentation)
2024-05-18 23:11:20 +03:00
Sam Hellawell
c1cd8bd900 Check collision before findInteriorPositionfindInteriorPos 2024-05-18 06:33:06 +01:00
elsid
6f70350f2f
Remove unused arguments from preload functions 2024-05-17 19:42:44 +02:00
elsid
7290ce81c0
Avoid allocating std::vector for a single element 2024-05-17 19:42:44 +02:00
elsid
ac891a5eb1
Use algorithms to check if PositionCellGrid(s) is/are contained in a range 2024-05-17 19:42:31 +02:00
Evil Eye
c3d02c0b41 Merge branch 'cleanup_dialogue_api' into 'master'
Cleanup dialogue API

See merge request OpenMW/openmw!4088
2024-05-17 15:02:00 +00:00
psi29a
42db5f4386 Merge branch 'fix_menu_timers' into 'master'
Process menu script timers

See merge request OpenMW/openmw!4103
2024-05-17 08:54:43 +00:00
Alexei Kotov
86ecf3fa0c Make saved game dialog Health and Level lines localizable
Currently providing English, Russian and GMST-based localization.
2024-05-17 05:01:06 +03:00