1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 00:32:49 +00:00

3754 Commits

Author SHA1 Message Date
Andrei Kortunov
7e345436f4 Localize Launcher and Wizard 2024-02-01 09:47:25 +04:00
psi29a
6136e3d8fc Merge branch 'csspellarg' into 'master'
Editor: Reset effect arguments when the effect ID changes (#7785)

Closes #7785

See merge request OpenMW/openmw!3802
2024-01-31 10:52:13 +00:00
psi29a
f656d2e380 Merge branch 'shutupverifier' into 'master'
Editor: Silence some verifier warnings

See merge request OpenMW/openmw!3814
2024-01-28 21:42:06 +00:00
psi29a
7450b11402 Merge branch 'vfs_normalized_path_1' into 'master'
Use normalized path for VFS manager and RecursiveDirectoryIterator

See merge request OpenMW/openmw!3806
2024-01-28 21:34:01 +00:00
Alexei Kotov
b83b30f0dc Editor: Reset effect arguments when the effect ID changes (#7785) 2024-01-28 15:37:53 +03:00
Evil Eye
aa9a99bde5 Merge branch 'magic_effects_fix' into 'master'
Fix magic effects in the editor

Closes #7481

See merge request OpenMW/openmw!3798
2024-01-26 16:33:51 +00:00
Alexei Kotov
70a0b7ea9c Editor: Drop zero attribute warnings 2024-01-26 19:23:03 +03:00
Alexei Kotov
48bbf0b637 Editor: Don't complain about body part references in Verify 2024-01-26 19:14:18 +03:00
elsid
70061329a1
Return Path::Normalized from RecursiveDirectoryIterator 2024-01-24 22:19:03 +01:00
jvoisin
ec6ac8058b Merge branch 'vfs_normalized_path' into 'master'
Add type for normalized VFS path and use for VFS::Manager file map key

See merge request OpenMW/openmw!3781
2024-01-23 20:42:48 +00:00
psi29a
76ad680549 Merge branch 'tools' into 'master'
Use move semantics for tools

See merge request OpenMW/openmw!3795
2024-01-22 12:18:36 +00:00
Andrei Kortunov
737d3b499b Use move semantics for tools 2024-01-21 20:20:37 +04:00
Andrei Kortunov
e01e2f1ae0 Fix magic effects in the editor 2024-01-21 17:50:45 +04:00
Andrei Kortunov
251d01304f Use move semantics for osg::ref_ptr 2024-01-21 13:48:33 +04:00
psi29a
c23cd8e544 Merge branch 'umlautontherocks' into 'master'
Convert strings in nif files to utf8

Closes #7780

See merge request OpenMW/openmw!3783
2024-01-20 11:56:59 +00:00
psi29a
6ead5f9321 Merge branch 'touch_record' into 'master'
Fix Touch command

See merge request OpenMW/openmw!3778
2024-01-19 08:32:03 +00:00
Evil Eye
0f6133b040 Merge branch 'move_editor' into 'master'
Move local variables in the editor

See merge request OpenMW/openmw!3771
2024-01-17 17:21:05 +00:00
Evil Eye
48db113149 Address feedback 2024-01-17 18:10:42 +01:00
Evil Eye
27fa411f4f Convert strings in nif files to utf8 2024-01-16 20:56:58 +01:00
elsid
a2147d70cc
Use forward declaration for some VFS types
This will allow to save on preprocessed code size in the future changes.
2024-01-16 01:32:11 +01:00
Andrei Kortunov
a91e557c68 Fix Touch command (bug 7765) 2024-01-14 22:10:18 +04:00
psi29a
2836ca2d91 Merge branch 'dynamic_casts' into 'master'
Check dynamic cast results

See merge request OpenMW/openmw!3761
2024-01-14 17:23:13 +00:00
Andrei Kortunov
f8c1d48c0b Get rid of redundant casts 2024-01-14 10:54:51 +04:00
Andrei Kortunov
074ab682ab Move local variables in the editor 2024-01-12 10:10:27 +04:00
Yury Stepovikov
52623ddd7d Set MacOS current_path before reading configuration files [#7706] 2024-01-11 00:59:27 +00:00
elsid
66f5d70550
Use settings values to declare shortcut settings 2024-01-08 21:09:12 +01: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
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
elsid
cc0b00a0d2
Use settings values to declare colour settings 2024-01-07 17:32:50 +01: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
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
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
72fa4924dc
Use settings values to declare enum settings 2024-01-03 22:55:00 +01: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
elsid
94409ce172
Add missing UniversalId::mClass initialization 2024-01-01 01:12:19 +01:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +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
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
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
elsid
0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId 2023-12-29 13:10:13 +01:00
elsid
088d4ee5ce
Use settings values to declare double settings 2023-12-28 22:08:04 +01:00
elsid
6a16686107
Use settings values to declare string settings 2023-12-27 00:33:45 +01: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
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
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