1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 11:45:35 +00:00
Commit graph

22604 commits

Author SHA1 Message Date
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