mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:23:54 +00:00
Code Issues Releases Wiki Activity
35144 commits 107 branches 66 tags 133 MiB
Commit graph

2121 commits

Author SHA1 Message Date
Evil Eye
cb357997c9 Copy DIAL type to INFO when saving 2024-03-30 14:36:45 +01:00
Alexei Kotov
359600db83 Merge branch 'im-not-taking-you-anywhere' into 'master' 
Fix #7901, make teleport fields non-interactive when mTeleport is false

Closes #7901

See merge request OpenMW/openmw!3986
 2024-03-29 03:48:18 +00:00
Dave Corley
b8a17b16f7 Cleanup(CS): Make TeleportColumn take flags as argument 2024-03-27 17:53:23 -05:00
Dave Corley
4e59246d2d Fix(columnimp.hpp): Use QVariant() constructor instead of UserType to 
hide unused subs from view and make a member variable to tell if the
column is used for a door or a regular position
 2024-03-27 17:53:23 -05:00
Dave Corley
1360eeb839 Fix #7901, make teleport fields non-interactive when mTeleport is false 2024-03-27 17:53:12 -05:00
Sam Hellawell
e87c39eeb3 OpenCS: Editing and verifying of projectile speed for magic effects 2024-03-27 09:26:03 +00:00
Dave Corley
2e68786331 Fix(CS): Actually allow unlocking doors ( #7899 ) 2024-03-27 07:32:53 +00:00
psi29a
58632218fb Merge branch 'you-can-only-grow-up-to-be-so-big' into 'master' 
FIX(CS): Limit scale for references to TES3 values (Close #7898 )

Closes #7898

See merge request OpenMW/openmw!3981
 2024-03-26 09:05:21 +00:00
psi29a
012d10703f Merge branch 'spellcast-refactor' into 'master' 
Spellcast related Lua API + spellcasting/activespell refactor

See merge request OpenMW/openmw!3922
 2024-03-25 13:50:23 +00:00
Mads Buvik Sandvei
320d8ef014 Spellcast related Lua API + spellcasting/activespell refactor 2024-03-25 13:50:23 +00:00
psi29a
666d2835ab Merge branch 'mgefverify' into 'master' 
Use the right ID for magic effect verifier messages (#7894)

Closes #7894

See merge request OpenMW/openmw!3971
 2024-03-25 13:44:38 +00:00
Dave Corley
c59d097ab2 FIX(#7898): Limit scale for references TES3 values 2024-03-24 16:37:48 -05:00
Sam Hellawell
c20a23b694 Remove unused regionmap CellDescription constructor 2024-03-22 03:13:04 +00:00
Alexei Kotov
79039f88df Use the right ID for magic effect verifier messages (#7894) 2024-03-22 04:34:38 +03:00
psi29a
7dcd127295 Merge branch 'openmw-cs-regionmap-improvements' into 'master' 
OpenMW CS: Minor region map fixes and improvements

See merge request OpenMW/openmw!3959
 2024-03-19 09:24:48 +00:00
Sam Hellawell
a62da201e5 check for land index not -1, fix warning 
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
 2024-03-16 09:02:47 +00:00
Sam Hellawell
5fca45565c Feature: display different brush for land vs water 2024-03-16 07:48:40 +00:00
elsid
9ae7b542c6
Fix warning: -Wmaybe-uninitialized 
In file included from apps/opencs/model/world/pathgrid.hpp:7,
                 from apps/opencs/model/world/idcollection.hpp:15,
                 from apps/opencs/model/world/idcollection.cpp:1:
In constructor ‘constexpr ESM::Pathgrid::Pathgrid(ESM::Pathgrid&&)’,
    inlined from ‘constexpr CSMWorld::Pathgrid::Pathgrid(CSMWorld::Pathgrid&&)’ at apps/opencs/model/world/pathgrid.hpp:24:12,
    inlined from ‘constexpr CSMWorld::Record<CSMWorld::Pathgrid>::Record(CSMWorld::Record<CSMWorld::Pathgrid>&&)’ at apps/opencs/model/world/record.hpp:39:12,
    inlined from ‘std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = CSMWorld::Record<CSMWorld::Pathgrid>; _Args = {CSMWorld::Record<CSMWorld::Pathgrid>}]’ at /usr/include/c++/13.2.1/bits/unique_ptr.h:1070:30,
    inlined from ‘std::unique_ptr<CSMWorld::RecordBase> CSMWorld::Record<ESXRecordT>::modifiedCopy() const [with ESXRecordT = CSMWorld::Pathgrid]’ at apps/opencs/model/world/record.hpp:92:116:
components/esm3/loadpgrd.hpp:19:12: warning: ‘<unnamed>.CSMWorld::Record<CSMWorld::Pathgrid>::mBase.CSMWorld::Pathgrid::<unnamed>.ESM::Pathgrid::mData’ may be used uninitialized [-Wmaybe-uninitialized]
   19 |     struct Pathgrid
      |            ^~~~~~~~
In file included from apps/opencs/model/world/idcollection.hpp:8:
apps/opencs/model/world/record.hpp: In member function ‘std::unique_ptr<CSMWorld::RecordBase> CSMWorld::Record<ESXRecordT>::modifiedCopy() const [with ESXRecordT = CSMWorld::Pathgrid]’:
apps/opencs/model/world/record.hpp:92:53: note: ‘<anonymous>’ declared here
   92 |         return std::make_unique<Record<ESXRecordT>>(Record<ESXRecordT>(State_ModifiedOnly, nullptr, &(this->get())));
      |                                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2024-03-16 02:34:50 +01:00
psi29a
090e57b27c Merge branch 'esm3structs' into 'master' 
Replace fixed size writeHNT calls with decomposition

See merge request OpenMW/openmw!3914
 2024-03-15 11:02:42 +00:00
Evil Eye
0fdc432eb2 Format probability 2024-03-12 20:09:04 +01:00
Evil Eye
1d69d38081 Add an actual probability column 2024-03-12 20:09:04 +01:00
Evil Eye
cef59e8928 Replace fixed size writeHNT calls with decomposition 2024-03-03 19:39:19 +01:00
Evil Eye
958f70736f Implement auto calculated potion values 2024-03-02 12:45:48 +01:00
AnyOldName3
626f438dcc Make builtin.omwscripts actually mandatory 
Previously it was quasi-mandatory - lots of things would add it, e.g. when running openmw through the CS, but it could technically be disabled.

Now it's treated like the resources/vfs directory and implicitly added by the engine etc.
 2024-02-27 01:09:46 +00:00
Dave Corley
ce2787e15e Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub 2024-02-22 03:26:17 -06:00
Dave Corley
bb35f0366a Fix(loadcell): Save water height regardless of value, if the user actually adjusted it 2024-02-22 03:01:28 -06:00
Dave Corley
54f4c69d37 Cleanup(columnimp): Use std::clamp to limit race scaling 2024-02-15 21:25:29 -06:00
Dave Corley
54e90b4ac2 Legacy(columnimp): Add TESCS limits for race weight/height scaling 2024-02-14 20:00:22 -06:00
Dave Corley
1b1f0c4971 Switch height/weight in names and make the stats a simple struct instead 2024-02-14 18:01:31 -06:00
Dave Corley
98ad059806 Cleanup(actoradapter): Use more explicit names & vec2 for racial height/weight 2024-02-14 16:42:27 -06:00
Dave Corley
049550d73e Cleanup(Actoradapter.cpp): Create new struct for race stats, use 
std::pair instead
 2024-02-14 16:42:27 -06:00
Dave Corley
b31664a78f Fix(CS): Scale actors according to their race's stats 2024-02-14 16:42:27 -06: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
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
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
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