21770 commits

Author	SHA1	Message	Date
psi29a	a0c0509e3f	Merge branch 'rm_unused_apps_includes' into 'master' ... Use "" to quote apps/openmw includes and remove unused See merge request OpenMW/openmw!3727	2024-01-09 08:59:23 +00:00
psi29a	5bd2020c23	Merge branch 'inactiveeffects' into 'master' ... Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs Closes #7440 See merge request OpenMW/openmw!3735	2024-01-09 08:58:42 +00: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
uramer	539dc1ee43	Remove confusing addPlayerQuestBindings method	2024-01-08 21:57:59 +01:00
Alexei Kotov	9e3b427a98	Unbreak un-paging (#7768)	2024-01-08 23:41:51 +03:00
elsid	66f5d70550	Use settings values to declare shortcut settings	2024-01-08 21:09:12 +01:00
Evil Eye	164b6309a7	Improve legibility	2024-01-08 18:08:17 +01:00
Alexei Kotov	5043e67e06	Replicate recent save loading prompt behavior (bug #7617)	2024-01-08 19:53:52 +03:00
Evil Eye	97dee00263	Merge branch 'remove_klass' into 'master' ... Replace 'klass' by meaningful names See merge request OpenMW/openmw!3745	2024-01-08 16:50:40 +00:00
Evil Eye	64673ea21f	Merge branch 'editor_colour_settings' into 'master' ... Use settings values to declare colour settings (#6876) See merge request OpenMW/openmw!3747	2024-01-08 16:48:18 +00:00
Evil Eye	6756b8613d	Restore beast race animations	2024-01-08 17:18:08 +01:00
Andrei Kortunov	9102fd4d57	Remove unused code	2024-01-08 15:57:18 +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
Alexei Kotov	3af28439d6	Interrupt thunder SFX indoors (bug #6402)	2024-01-08 12:06:51 +03:00
psi29a	1bccd8483f	Merge branch 'cs-icon-fix' into 'master' ... Add OpenMW-CS RC file to app rather than static lib See merge request OpenMW/openmw!3740	2024-01-08 08:00:06 +00:00
psi29a	7019405278	Merge branch 'rainloop' into 'master' ... Support playing ambient and rain weather SFX at the same time (bug #7761) Closes #7761 See merge request OpenMW/openmw!3738	2024-01-08 07:59:55 +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
elsid	067957f57b	Use "" to quote apps/openmw includes and remove unused ... Using "" makes clangd to find unused includes which makes it quite easy to remove them.	2024-01-07 17:57:11 +01:00
elsid	cc0b00a0d2	Use settings values to declare colour settings	2024-01-07 17:32:50 +01:00
Andrei Kortunov	084fc80efd	Use string_view for readonly string properties	2024-01-07 19:21:45 +04:00
Andrei Kortunov	8879d89e4a	Replace 'klass' by meaningful names	2024-01-07 19:12:49 +04:00
Andrei Kortunov	4f65b7167a	Do not copy vector for every door marker	2024-01-07 18:53:07 +04:00
Andrei Kortunov	828c40c710	Do not copy due to auto misuse	2024-01-07 18:52:10 +04:00
psi29a	eedb96863e	Merge branch 'editor_enum_settings' into 'master' ... Use settings values to declare enum settings (#6876) See merge request OpenMW/openmw!3724	2024-01-07 10:14:07 +00:00
Alexei Kotov	9b8d685578	Expose requested apparent sun position (not normalized) to post-processing	2024-01-07 04:57:02 +03:00
Alexei Kotov	1f26485c47	Fix exterior sun direction/position (bug #4898)	2024-01-07 04:57:02 +03:00
Alexei Kotov	ed31a0354a	Support playing ambient and rain weather SFX at the same time (bug #7761)	2024-01-07 04:56:36 +03:00
Alexei Kotov	01dcca3363	Make scripted animations shut down pathfinding (bug #5065)	2024-01-07 04:55:49 +03:00
Alexei Kotov	c1c774e11d	Update the spells window when constant effects are added/removed (bug #7475)	2024-01-07 04:55:29 +03:00
Alexei Kotov	961c53f1c4	Merge branch 'clickcrash' into 'master' ... Don't crash when clicking the logo video See merge request OpenMW/openmw!3736	2024-01-07 01:21:56 +00:00
Alexei Kotov	dfc29974d0	Merge branch 'water_walking_cost' into 'master' ... Use walking speed for swimming actor with water walking for pathfinding (#7758) Closes #7758 See merge request OpenMW/openmw!3732	2024-01-07 01:19:43 +00:00
Alexei Kotov	8fff7215f4	Merge branch 'i-dont-have-a-type' into 'master' ... Selection Groups Cleanup Closes #7759 See merge request OpenMW/openmw!3731	2024-01-07 01:18:26 +00:00
AnyOldName3	6d37618301	Add OpenMW-CS RC file to app rather than static lib ... Static libraries on Windows can't have embedded resources, so this mean the icon for the CS wasn't used. This could have also been resolved by explicitly requesting the library type as OBJECT rather than letting it default to STATIC (as object libraries aren't a thing on-disk and are just an abstraction in CMake so you can use the same object files in different targets), but this seemed less invasive. I also made it Win32-only as a Windows .rc file is meaningless on Unix, but it shouldn't be MSVC-only as MinGW can consume them.	2024-01-06 16:56:52 +00:00
Evil Eye	72c382aca6	Don't crash when clicking the logo video	2024-01-06 14:23:08 +01:00
Evil Eye	74a6c81d53	Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs	2024-01-06 14:14:29 +01:00
psi29a	c3c8fa1e61	Merge branch 'sceneleak' into 'master' ... Set paged refs' base node to null (#6335) Closes #6335 See merge request OpenMW/openmw!3715	2024-01-06 11:07:07 +00:00
Dave Corley	c563219b61	Cleanup(CS): Pass const ref when applicable for selection groups	2024-01-05 19:39:53 -06:00
Dave Corley	3ff1bae372	Cleanup(CS): More consistent names for selection group configs	2024-01-05 19:39:53 -06:00
Dave Corley	c93b6dca0a	Fix(CS): Add record type to selection groups to fix #7759	2024-01-05 19:39:53 -06:00
elsid	903299ce50	Avoid recomputing navigator flags when getting area costs	2024-01-06 02:39:42 +01:00
elsid	594bd6e136	Use walking speed for swimming actor with water walking for pathfinding ... This will make them find shorter paths nearby shores.	2024-01-06 02:39:40 +01:00
jvoisin	689efa6d69	Merge branch 'mapnotes' into 'master' ... Shorten global map marker notes like vanilla (bug #7619) Closes #7619 See merge request OpenMW/openmw!3719	2024-01-05 13:05:56 +00:00
jvoisin	5837f97b99	Merge branch 'nonexclusivesettings' into 'master' ... Downgrade Settings GUI mode to a modal (bug #6758) Closes #6758 See merge request OpenMW/openmw!3720	2024-01-05 13:04:20 +00:00
Alexei Kotov	19a7d50a3f	Merge branch 'error_codes' into 'master' ... Use error messages instead of unhandled exceptions See merge request OpenMW/openmw!3723	2024-01-04 20:35:37 +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
elsid	72fa4924dc	Use settings values to declare enum settings	2024-01-03 22:55:00 +01:00
Andrei Kortunov	7ffb2bc3c4	Use error messages instead of unhandled exceptions	2024-01-03 21:48:25 +04:00
Andrei Kortunov	8d3efd27ba	Add missing initialization	2024-01-03 19:25:33 +04:00
Alexei Kotov	febfccb356	Merge branch 'move_class_text' into 'master' ... Avoid redundant string copies See merge request OpenMW/openmw!3718	2024-01-03 15:24:22 +00: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	7310418984	Downgrade Settings GUI mode to a modal (bug #6758)	2024-01-02 22:32:52 +03: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
Alexei Kotov	14942d7541	Shorten global map marker notes like vanilla (bug #7619)	2024-01-02 18:50:32 +03:00
Andrei Kortunov	fb16871c80	Avoid redundant string copies	2024-01-02 18:30:35 +04:00
uramer	e9b48e35c0	Coverity defects	2024-01-02 13:54:02 +01:00
Alexei Kotov	2ff2e3c2ef	Merge branch 'raceless' into 'master' ... Replace missing NPC races and default animations Closes #6754 See merge request OpenMW/openmw!3703	2024-01-02 12:37:03 +00:00
Alexei Kotov	2fbdde34c6	Set paged refs' base node to null (#6335)	2024-01-02 02:31:47 +03:00
jvoisin	29c20cdb41	Merge branch 'fix_universal_id' into 'master' ... Add missing UniversalId::mClass initialization See merge request OpenMW/openmw!3707	2024-01-01 23:05:57 +00:00
Andrei Kortunov	93e50cc7aa	Improve format version in content selector	2024-01-01 18:16:58 +04:00
Evil Eye	ef4e5b45e3	Don't add custom anim source if it's a default animation but keep the skeleton	2024-01-01 15:06:32 +01:00
Evil Eye	03c791e61a	Move animation handling to NpcAnimation	2024-01-01 13:58:55 +01:00
Evil Eye	84c15344ee	Address feedback	2024-01-01 13:07:43 +01:00
Evil Eye	4636ab3f3e	Update cmakelists	2024-01-01 13:07:43 +01:00
Evil Eye	5bd5c84018	Replace missing NPC races and default animations	2024-01-01 13:07:43 +01:00
elsid	94409ce172	Add missing UniversalId::mClass initialization	2024-01-01 01:12:19 +01:00
Alexei Kotov	78459314bf	Merge branch 'impartialplayerbelike' into 'master' ... Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us Closes #7645 See merge request OpenMW/openmw!3650	2023-12-31 17:33:08 +00:00
jvoisin	31ac993374	Merge branch 'allthatglitters' into 'master' ... Use NAM9 for stack count Closes #2566 See merge request OpenMW/openmw!3698	2023-12-31 17:12:46 +00:00
Evil Eye	e63933efa6	Use NAM9 for stack count	2023-12-31 17:12:46 +00:00
jvoisin	6180ad0e51	Merge branch 'sunlighting' into 'master' ... Fix interior sun direction (bug #7585) Closes #7585 See merge request OpenMW/openmw!3699	2023-12-31 17:12:32 +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
Alexei Kotov	7e162a0d7c	Merge branch 'lua_real_frame_time' into 'master' ... Pass real frame duration to onFrame See merge request OpenMW/openmw!3621	2023-12-31 01:21:41 +00:00
Alexei Kotov	0f9eb3d85a	Merge branch 'editor_double_settings' into 'master' ... Use settings values to declare double settings (#6876) See merge request OpenMW/openmw!3701	2023-12-30 15:20:25 +00:00
Alexei Kotov	8a91e7057f	Merge branch 'ref_id_universal_id' into 'master' ... Fix RefId based UniversalId (#7747) Closes #7747 See merge request OpenMW/openmw!3702	2023-12-30 10:59:03 +00:00
psi29a	7647af6e4e	Merge branch 'friendlyhit' into 'master' ... Correct friendly fire reaction for different damage sources (bug #7646) Closes #7646 See merge request OpenMW/openmw!3694	2023-12-30 09:43:19 +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
Evil Eye	3f6c3e24f4	Merge branch 'autoequipcrash' into 'master' ... Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll (#7744) Closes #7744 See merge request OpenMW/openmw!3697	2023-12-29 14:30:49 +00:00
elsid	39dd73263d	Avoid converting UniversalId to a different type via string	2023-12-29 14:15:28 +01:00
elsid	7b5310b569	Write StringRefId as is when converting UniversalId to string ... To avoid adding quotes which on conversion ESM::StringRefId -> UniversalId -> std::string -> UniversalId changes the string value adding quotes.	2023-12-29 14:12:36 +01:00
psi29a	2fde1ef3d8	Merge branch 'bodypartanimation' into 'master' ... NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822) Closes #4822 See merge request OpenMW/openmw!3653	2023-12-29 13:09:56 +00:00
elsid	0fc78aa173	Make ESM::StringRefId compatible with std::string UniversalId	2023-12-29 13:10:13 +01:00
Alexei Kotov	abbbd8cf69	Fix interior sun direction (bug #7585)	2023-12-29 02:21:39 +03:00
elsid	088d4ee5ce	Use settings values to declare double settings	2023-12-28 22:08:04 +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
jvoisin	c9d4ca5320	Merge branch 'editor_string_settings' into 'master' ... Use settings values to declare string settings (#6876) See merge request OpenMW/openmw!3695	2023-12-28 14:51:09 +00:00
AnyOldName3	647bd2b572	Merge branch 'revert-78a8f9d6' into 'master' ... Revert "Merge branch 'skating-olympics' into 'master'" See merge request OpenMW/openmw!3696	2023-12-28 00:59:07 +00:00
jvoisin	dcb403c114	Merge branch 'training' into 'master' ... Use modified value for governing attribute training limit (#7742) Closes #7742 See merge request OpenMW/openmw!3692	2023-12-27 22:49:23 +00:00
Alexei Kotov	30cff6f6ee	Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll	2023-12-28 01:49:18 +03:00
Mads Buvik Sandvei	9d3ede7575	Revert "Merge branch 'skating-olympics' into 'master'" ... This reverts merge request !3631	2023-12-27 19:11:49 +00: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
Alexei Kotov	ca5e7d1ccb	Merge branch 'fix_fallout3' into 'master' ... Make traits and base data optional for ESM4 NPC See merge request OpenMW/openmw!3682	2023-12-27 17:10:13 +00:00
Alexei Kotov	d5428b23d8	Disable voiced responses to magical friendly hits (bug #7646) ... Disable ranged friendly fire	2023-12-27 20:05:08 +03:00
Alexei Kotov	94c052dfef	Classify the damage passed to Class::onHit	2023-12-27 20:05:08 +03: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
elsid	13c8e04b27	Make traits and base data optional for ESM4 NPC ... Fallout 3 is not fully supported and it causes failures to load NPCs. Log errors and make sure there is no nullptr dereference.	2023-12-27 10:07:48 +01:00
jvoisin	291d19af48	Merge branch 'rm_ref_ptr' into 'master' ... Avoid using osg::ref_ptr when reference is enough See merge request OpenMW/openmw!3690	2023-12-27 08:03:16 +00:00
elsid	6a16686107	Use settings values to declare string settings	2023-12-27 00:33:45 +01:00
Alexei Kotov	1834597361	Move friendly fire logic to onHit	2023-12-27 01:03:23 +03:00
Alexei Kotov	1b594d874e	Use modified value for governing attribute training limit (#7742)	2023-12-26 21:53:49 +03: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
Cody Glassman	8f85c9194d	lua - add bindings to get frame duration	2023-12-26 09:15:55 -08:00
psi29a	a2c6009352	Merge branch 'editor_bool_settings' into 'master' ... Use settings values to declare bool settings (#6876) See merge request OpenMW/openmw!3679	2023-12-26 15:31:14 +00:00
jvoisin	f80ba4e28c	Apply 1 suggestion(s) to 1 file(s)	2023-12-26 13:54:23 +00:00
elsid	81a483fc7f	Remove unused vfs argument from correctMeshPath	2023-12-26 14:14:52 +01:00
elsid	145f7b5672	Avoid using osg::ref_ptr when reference is enough	2023-12-26 11:35:03 +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
psi29a	f80bbd4e39	Merge branch 'these-are-the-datas-youre-looking-for' into 'master' ... Add game-independent VFS directory to CS' VFS See merge request OpenMW/openmw!3683	2023-12-26 10:21:58 +00:00
Andrei Kortunov	ffffb427f5	Implement crime disposition modifier (bug 4683)	2023-12-26 14:04:23 +04:00
jvoisin	b39a6ae9cd	Merge branch 'smoothbraincriminal' into 'master' ... End pursue package if the target doesn't have a bounty See merge request OpenMW/openmw!3677	2023-12-26 09:59:24 +00: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	dc8c979d1a	Merge branch 'avoid_duplication' into 'master' ... Store generated UI by pointer to avoid redundant processing See merge request OpenMW/openmw!3680	2023-12-26 09:39:47 +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
AnyOldName3	01e2e56f97	Add game-independent VFS directory to CS' VFS ... This should have been like this all along - all the other applications that use the game's VFS do this.	2023-12-24 17:55:49 +00:00
Andrei Kortunov	1ca2a0ef66	Store generated UI by pointer to avoid redundant processing	2023-12-24 20:35:19 +04:00
Andrei Kortunov	81f7149f42	Use a multiplication sign for custom resolution	2023-12-24 19:00:16 +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	edaac852d1	Use settings values to declare bool settings	2023-12-24 00:25:18 +01:00
Dave Corley	25f3e09da9	Fix(CS): Correct build issues on some compilers	2023-12-23 15:05:13 -06:00
Dave Corley	33ce7782e9	Feat(worldspacewidget.cpp): Add shortcut to clear selection	2023-12-23 15:05:13 -06:00
Dave Corley	a7f8ee1106	Feat(instancemode.cpp): Implement save/load selection group functions	2023-12-23 15:05:13 -06:00
Dave Corley	23e75bed8f	Feat(object.cpp): Make object outline an optional argument when selecting it	2023-12-23 15:05:13 -06:00
Dave Corley	f287914f1e	Feat(cell.cpp): Add select/unhide functions in cell.cpp	2023-12-23 15:05:13 -06:00
Dave Corley	8edc148418	Feat(CS): Implement select/unhide functions into interior & exterior ... worldspace widgets	2023-12-23 15:05:13 -06:00
Dave Corley	94eadd436d	Feat(worldspacewidget.cpp): Implement shortcut for visibility switching ... & unhiding all instances	2023-12-23 15:05:13 -06:00
Dave Corley	9d155afc15	Feat(worldspacewidget.hpp): Add virtual decs for selection functions	2023-12-23 15:05:13 -06:00
Dave Corley	cf098033b9	Feat(Mask.hpp): Add mask for hidden objects	2023-12-23 15:05:13 -06:00
Dave Corley	0ec6dcbf1f	Feat(Settings): Implement shortcuts for hiding refs & selection groups	2023-12-23 15:05:13 -06:00
Dave Corley	24443e00bf	Feat(CS): Implement selection groups into data model	2023-12-23 15:05:13 -06:00
Alexei Kotov	c6a1196ec7	Merge branch 'editor_int_settings' into 'master' ... Use settings values to declare int settings (#6876) See merge request OpenMW/openmw!3668	2023-12-23 15:48:43 +00:00
Evil Eye	af40d7ce80	End pursue package if the target doens't have a bounty	2023-12-23 15:50:36 +01:00
Alexei Kotov	099c39ae87	Use fallback weather ripple settings (bug #7292)	2023-12-23 11:46:08 +03:00
elsid	4067e10f3f	Use gamepad cursor speed setting	2023-12-22 19:24:02 +01:00
AnyOldName3	8cafcf702f	Merge branch 'sdl_errors' into 'master' ... Handle and log some controller related SDL errors (#7728) Closes #7728 See merge request OpenMW/openmw!3669	2023-12-22 14:57:21 +00:00
Alexei Kotov	f11c66794b	Merge branch 'advancedalchemy' into 'master' ... Make ingredient order affect effect order Closes #7676 See merge request OpenMW/openmw!3667	2023-12-22 08:25:24 +00:00
jvoisin	2873f971a6	Merge branch 'downsized' into 'master' ... Remove explicitly sized reads See merge request OpenMW/openmw!3663	2023-12-21 22:50:10 +00:00
Cody Glassman	187f63d3d3	support postprocess distortion	2023-12-21 10:56:38 -08:00
Alexei Kotov	51cb3b08cb	Merge branch 'followthecrab' into 'master' ... Stop combat when stacking a new AI package Closes #7661 See merge request OpenMW/openmw!3665	2023-12-21 07:08:36 +00:00
elsid	78a0e0eb3b	Handle and log some controller related SDL errors ... SDL_GameControllerNameForIndex may return nullptr indicating an error which causes a crash when passed to log.	2023-12-21 02:19:24 +01:00
Evil Eye	532a330aac	mac plz	2023-12-20 13:58:43 +01:00
Evil Eye	3e101ab409	Add a variadic getHNOT	2023-12-20 12:28:34 +01:00
elsid	66b1745520	Use settings values to declare int settings	2023-12-20 12:26:36 +01:00
Evil Eye	1223d12b29	Make ingredient order affect effect order	2023-12-20 11:56:12 +01:00
Alexei Kotov	78a8f9d692	Merge branch 'skating-olympics' into 'master' ... De-jank stationary animations Closes #3330 See merge request OpenMW/openmw!3631	2023-12-20 12:35:41 +03:00
Alexei Kotov	d97563c830	Merge branch 'csicorruption' into 'master' ... Allow ModPCCrimeLevel to clear crimes and cap bounties Closes #7416 See merge request OpenMW/openmw!3664	2023-12-20 08:24:14 +00:00
Alexei Kotov	7074ea02b7	Merge branch 'qt_fix' into 'master' ... Register language selector properly Closes #7727 See merge request OpenMW/openmw!3666	2023-12-20 04:15:17 +00:00
Evil Eye	8a1ca870eb	Stop infighting when gaining new allies	2023-12-19 21:23:10 +01:00
Andrei Kortunov	e6690bbcc7	Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR	2023-12-19 19:58:52 +04:00
Evil Eye	36b61d7074	Merge branch 'copy-that' into 'master' ... Feat(CS): Implement Instance Cloning See merge request OpenMW/openmw!3654	2023-12-19 11:27:51 +00:00
Andrei Kortunov	2e041073fc	Move *.ui files for different applications to different folders	2023-12-19 15:21:08 +04:00
Andrei Kortunov	8d06a99507	Register language selector properly	2023-12-19 10:20:31 +04:00
Mads Buvik Sandvei	00b1cd8c08	Replace movement() with eraseMovementIf()	2023-12-18 22:50:45 +01:00
Mads Buvik Sandvei	5a6dbf8714	Comments	2023-12-18 22:43:45 +01:00
Evil Eye	94b129cc62	Stop combat when stacking a new AI package	2023-12-18 22:18:26 +01:00
Evil Eye	77cf9284b7	Allow ModPCCrimeLevel to clear crimes and cap bounties	2023-12-18 21:52:17 +01:00
Alexei Kotov	7922f0e7f8	Merge branch 'editor_modifier_settings' into 'master' ... Use settings values to declare modifier settings (#6876) See merge request OpenMW/openmw!3656	2023-12-18 00:37:55 +00:00
jvoisin	2c1810c6db	Merge branch 'hoteltransylvania' into 'master' ... Outlaw vampires and werewolves (bugs #7723, #7724) Closes #7723 and #7724 See merge request OpenMW/openmw!3661	2023-12-17 19:08:32 +00:00
Evil Eye	88731f864e	Add imports	2023-12-17 15:21:12 +01:00
Evil Eye	37415b0382	Don't use getExact to read structs	2023-12-17 15:16:32 +01:00
Evil Eye	dbf9d42cc5	Remove sized reads from essimporter	2023-12-17 14:03:45 +01:00
Evil Eye	a9e6e63c4e	Remove fixed size reads	2023-12-17 13:00:14 +01:00
Alexei Kotov	82982bbc05	Outlaw vampires and werewolves (bugs #7723, #7724)	2023-12-15 23:46:10 +03:00
jvoisin	ec480db9ac	Merge branch 'constanteffect' into 'master' ... For constant enchantments, allow on-self range for any effect (bug #7643) Closes #7643 See merge request OpenMW/openmw!3657	2023-12-15 13:35:47 +00: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
Alexei Kotov	ba7932f21c	Merge branch 'fix_cs_settings_key_bindings_page' into 'master' ... Fix CS Key Binding settings page See merge request OpenMW/openmw!3655	2023-12-15 03:31:55 +00:00
jvoisin	c969aa42b7	Merge branch 'aifollow' into 'master' ... Base AiFollow activation range on follow distance (bug #7685) Closes #7685 See merge request OpenMW/openmw!3652	2023-12-14 20:14:20 +00:00
Alexei Kotov	27bd70a976	For constant enchantments, allow on-self range for any effect (bug #7643)	2023-12-14 15:55:24 +03:00
elsid	a29ae07957	Fix CS Key Binding settings page ... This got broken by e07d8f3066. Creating QGridLayout with parent and setting it later has not the same effect.	2023-12-14 00:29:18 +01:00
elsid	11db9eec1d	Use settings values to declare modifier settings	2023-12-13 23:29:35 +01:00
Dave Corley	bc662aeb63	Fix(CS): Fix minor issue in deleteSelectedInstances impl which caused it ... to run twice	2023-12-13 16:06:46 -06:00
Dave Corley	7069a970ae	Feat(CS): Implement instance cloning	2023-12-13 16:06:46 -06:00
Dave Corley	2bb8ceef56	Fix(CS): Correct invalid refNum for cloned objects so they actually ... appear ingame	2023-12-13 16:06:46 -06:00
Dave Corley	2a747529bb	Feat(CS): Add new shortcut for duplicating instances	2023-12-13 16:06:46 -06:00
Alexei Kotov	2628b02b4e	NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822)	2023-12-14 00:48:40 +03:00
Alexei Kotov	5b02b77a39	Base AiFollow activation range on follow distance (bug #7685)	2023-12-13 20:18:20 +03:00
Alexei Kotov	4dfd2b0f46	Merge branch 'lessassertiveschooling' into 'master' ... Don't assert that spells have a school See merge request OpenMW/openmw!3651	2023-12-13 17:14:29 +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
Evil Eye	a0694d4134	Don't assert that spells have a school	2023-12-12 22:11:32 +01:00
Evil Eye	f80cd06256	Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us	2023-12-12 22:06:52 +01: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
Alexei Kotov	ad8392b7d1	Merge branch 'awholelottanothing' into 'master' ... Don't crash on spells or enchantments without effects Closes #7712 See merge request OpenMW/openmw!3643	2023-12-11 13:02:51 +00:00
Alexei Kotov	21ca9ba34b	Merge branch 'crashtainer' into 'master' ... Use the right getContainerStore Closes #7658 See merge request OpenMW/openmw!3644	2023-12-11 12:25:33 +00:00
Andrei Kortunov	ca19f7006c	Make hardcoded strings in Launcher and Wizard localizable	2023-12-11 12:02:43 +04: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
Mads Buvik Sandvei	76232c49df	clang format	2023-12-09 20:42:14 +01:00
Alexei Kotov	f269b25bd0	Remove unused field	2023-12-09 22:00:35 +03:00
Evil Eye	7b8c0d1d88	Remove dropped formats from tests	2023-12-09 19:00:42 +01:00
Evil Eye	41dc409238	Don't consider empty effect lists exceptional	2023-12-09 18:20:10 +01:00
Evil Eye	521cff08f8	Drop support for save game format 1	2023-12-09 17:22:11 +01:00
Mads Buvik Sandvei	c79446818e	Add a flag for jump when queueing movement, so inertia can be added accurately.	2023-12-09 16:48:04 +01:00
Evil Eye	4062f0225b	Use the right getContainerStore	2023-12-09 16:13:56 +01:00
Mads Buvik Sandvei	32d391f548	Revert accumulating movement in the reset accum root callback.	2023-12-09 15:50:17 +01:00