1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 16:45:43 +00:00
Commit graph

2076 commits

Author SHA1 Message Date
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
Andrei Kortunov
074ab682ab Move local variables in the editor 2024-01-12 10:10:27 +04:00
elsid
66f5d70550
Use settings values to declare shortcut settings 2024-01-08 21:09:12 +01: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
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
jvoisin
f80ba4e28c Apply 1 suggestion(s) to 1 file(s) 2023-12-26 13:54:23 +00:00
elsid
edaac852d1
Use settings values to declare bool settings 2023-12-24 00:25:18 +01: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
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
elsid
66b1745520
Use settings values to declare int settings 2023-12-20 12:26:36 +01: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
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
Evil Eye
37415b0382 Don't use getExact to read structs 2023-12-17 15:16:32 +01:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01: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
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
elsid
e1a68d8cf5
Ignore absent default setting value 2023-12-03 17:18:26 +01:00
elsid
4c13ecea23
Use settings values for editor 2023-12-03 17:18:26 +01:00
elsid
88a6ecabae
Add lookup index to editor settings category
Prevent adding duplicate settings there.
2023-12-03 17:18:25 +01:00
Alexei Kotov
7c63522870 Merge branch 'settings_values_editor_1' into 'master'
Define editor settings as typed struct members (#6876)

See merge request OpenMW/openmw!3597
2023-12-02 13:51:00 +00:00
elsid
fb0b95a2dd
Define editor settings as typed struct members 2023-11-16 22:14:58 +01:00
elsid
755fef62f7
Mark State copy constructor and assignment operators as delete 2023-11-16 22:05:05 +01:00
elsid
e07d8f3066
Add separate setting type for subcategory 2023-11-16 22:05:05 +01:00
elsid
fb6e429dad
Remove "separators" from cs settings
Those are just empty widgets which do not make significant visible difference in
the UI.
2023-11-16 22:05:05 +01:00
elsid
335dbffe6e
Avoid std::string to QString conversion for label 2023-11-16 22:05:05 +01:00
Andrei Kortunov
ba71eefbae Fix GCC warnings 2023-11-16 18:53:46 +04:00
Evil Eye
fbafa13b3d Appease the compiler 2023-10-14 17:01:55 +02:00
Evil Eye
514723a4e6 Use fixed size ints for Region and use an array for weather odds 2023-10-14 16:36:45 +02:00
Evil Eye
b99f58613e Remove signed/unsigned conversions in pathgrid loading code and use meaningful member names 2023-10-06 16:46:09 +02:00
elsid
1d94527a19
Avoid using settings in components to get actor model
Settings::Values are initialized only for engine. Accessing them from other
binaries leads to a crash.
2023-09-27 21:00:46 +02:00
Evil Eye
b59739a529 Replace more sized reads 2023-09-13 21:51:42 +02:00
elsid
053a3caf7b
Pass cache expiry delay to GenericResourceManager constructor 2023-09-09 19:35:20 +02:00
Alexei Kotov
16cc1ad59f Editor: Disable Training service for creatures 2023-09-02 17:52:15 +03:00
Petr Mikheev
32f3a16db3 Change FormId::toString to be consistent with RefId. Remove FormIdRefId. 2023-08-27 09:55:06 +02:00
psi29a
4aaffa72e5 Merge branch 'more_coverity_fixes' into 'master'
More coverity fixes

See merge request OpenMW/openmw!3304
2023-08-03 07:15:34 +00:00
Andrei Kortunov
d3d7a663c6 Move some objects instead of copying 2023-07-31 20:43:46 +04:00
Andrei Kortunov
b1c8a968ae Do not use invalid iterators 2023-07-31 17:53:33 +04:00
Andrei Kortunov
d8ec78d732 Fix some Coverity warnings 2023-07-28 20:58:18 +04:00
Evil Eye
cd8f2355c0 Only allow StringRefId for Skill ids 2023-07-14 17:33:32 +02:00
Evil Eye
967b5d205b Use StringRefId for skills 2023-07-13 18:55:22 +02:00
Evil Eye
ac9378fa08 Replace Skill::mIndex with Skill::refIdToIndex 2023-07-13 18:55:21 +02:00
psi29a
6601b0cb15 Merge branch 'fastandloose' into 'master'
Drop support for --fs-strict

Closes #7394

See merge request OpenMW/openmw!3093
2023-07-02 19:24:14 +00:00
Evil Eye
73c2387708 Merge schools into skills 2023-06-26 20:42:52 +02:00
Evil Eye
bac6777fae Reduce the number of magic numbers 2023-06-18 16:21:06 +02:00
Evil Eye
eeda48ec50 Drop support for --fs-strict 2023-06-08 21:10:09 +02:00
psi29a
25c1e6abee Merge branch 'clickbait' into 'master'
Use std::array in various ESM structs

See merge request OpenMW/openmw!3103
2023-06-05 07:19:38 +00:00
Evil Eye
6b7e7acd16 Replace a number of incorrect index types 2023-06-03 16:30:35 +02:00
Evil Eye
dd83da5eba Use std::array in FADTstruct 2023-06-03 13:11:49 +02:00
Evil Eye
7be005c9a5 Use std::array in CLDTstruct 2023-06-03 11:58:09 +02:00
Evil Eye
8a474b9807 Use std::array in RADTstruct 2023-06-03 10:45:32 +02:00
elsid
4a8471ce78
Use original RefId to remove info from InfoOrder 2023-06-03 01:12:21 +02:00
elsid
6a3b6c6e4f
Fix handling deleted DIAL records
* Use composite RefId to remove INFO record of deleted DIAL record. OrderedInfo
  stores original RefId while InfoCollection stores composite one.
* Do not erase deleted topic from InfoOrderByTopic map. To keep all deleted
  record ids for InfoCollection::sort call to make sure reorderRowsImp is called
  with correct number of indices.
2023-06-01 23:35:40 +02:00
Evil Eye
9214ffb50b Replace some empty constructors and destructors with default 2023-05-29 13:37:19 +02:00
elsid
dc8dfe81ce
Add more details to exceptions 2023-05-25 20:56:07 +02:00
elsid
d852ac20f5
Log loading content file 2023-05-25 20:56:07 +02:00
elsid
8f47da46ec
Show magic effect name instead of IndexRefId 2023-05-22 18:02:21 +02:00
elsid
63e01d86a3
Use string based UniversalId to check script for blacklist
Blacklist is a vector of strings and isBlacklisted internally calls getId which
throws exception for RefId based UniversalId.
2023-05-22 03:14:00 +02:00
elsid
0aa569d4fe
Add UniversalId argument type to exception message on invalid access 2023-05-22 03:14:00 +02:00
elsid
292983d57a
Show UniversalId value for all argument types in reports 2023-05-22 03:14:00 +02:00
elsid
7ba397da7d
Use std::span and std::string to define UniversalId related TypeData 2023-05-22 03:14:00 +02:00
elsid
ceab7557f3
Add rudimentary support for ESM::RefId in UniversalId
Ideally std::string support should be removed but this may affect too much code.
2023-05-22 03:12:16 +02:00
elsid
4cd5efc6ee
Implement UniversalId with std::variant 2023-05-22 03:03:05 +02:00
elsid
f2a3462e59
Fix UniversalId constructor from ESM::RefId 2023-05-22 02:47:06 +02:00
elsid
6541ac43f5
Add UniversalId unit tests 2023-05-22 02:47:04 +02:00
florent.teppe
56cb2a83ec removed sDefaultWorldspace, only sDefaultWorldspaceId now.
sDefaultWorldspaceId is a StringRefId to be able to getvalue easily.
2023-05-12 22:05:53 +02:00
psi29a
83203ae4d9 Merge branch 'minor_header_cleanup_clion' into 'master'
Minor header cleanup

See merge request OpenMW/openmw!2991
2023-05-01 10:46:55 +00:00
jvoisin
c7a3f43915 Minor header cleanup
This has been done via CLion's "unused include directive",
set to "detect completely unused".
2023-04-30 16:26:03 +02:00
florent.teppe
b5f774ae64 fixes the issues with the addons
the OpenCS reference's cellId uses a string to be sure it is coherent with the cell's Id type in the editor.
2023-04-21 14:55:24 +02:00
florent.teppe
6b5d9f3344 fixes reference saving stage 2023-04-20 10:03:35 +02:00
florent.teppe
3bbf60373a Keep things coherent between references and and cell table 2023-04-20 10:03:34 +02:00
florent.teppe
69f2285a95 fix issue #7335 2023-04-20 09:55:17 +02:00
Petr Mikheev
f09a689a4f Merge ESM::RefNum and ESM4::FormId 2023-04-09 00:23:32 +02:00
psi29a
ebb5820dd1 Merge branch 'pathgridgraph' into 'master'
Refactor pathgrid indices to use size_t instead of int

See merge request OpenMW/openmw!2900
2023-04-08 00:32:43 +00:00
Evil Eye
8d8207b734 Refactor pathgrid indices to use size_t instead of int 2023-04-08 00:32:43 +00:00
psi29a
c8f41f1c34 Merge branch 'slowfilter' into 'master'
Speedup filter in the CS

See merge request OpenMW/openmw!2901
2023-04-07 16:50:47 +00:00
fredzio
8717e8e487 Create the QRegularExpression in the TextNode constructor instead of for
each row in the filtered table.
On a table of more than 1M entries it speeds up filtering almost tenfold (from 35s to 4s).
2023-04-07 15:34:26 +02:00
florent.teppe
d782d37ee2 Make sure Vec2iRefId is trivially copyable on GCC 11.3
std::pair<int, int> isn't trivially copyable on some compilers
so a specific struct is defined, it's an int pair, but it should be recognised by GCC 11.3 as trivially copyable

Vec2iRefId => ESM3ExteriorCellRefId

more explcit name and use mX,mY instead of pair
renamed files and enum
2023-04-03 14:17:31 +02:00
florent.teppe
53b14c8b42 fix tests
hopefully also fixes clang tidy
2023-04-03 14:17:17 +02:00
florent.teppe
c2182c2fcc Get Rid of ESM::CellId almost everywhere
it was a competing concept from using RefIds for cell.
There is almost no point to it now, except to load older data.
2023-04-03 14:16:05 +02:00