mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 13:15:35 +00:00
Code Issues Releases Wiki Activity
33852 commits 109 branches 66 tags 134 MiB
Commit graph

2076 commits

Author SHA1 Message Date
psi29a
8037a6e765 Merge branch 'portable-launcher' into 'master' 
Portable Launcher (plus a whole slew of bugs fixes for problems I found that I suspect aren't on the tracker)

Closes #6846

See merge request OpenMW/openmw!3925
 2024-04-10 09:53:07 +00:00
Alexei Kotov
f2e0129436 Convert water/ripple defines to camelCase 2024-04-04 21:12:47 +03:00
uramer
3b930e4471 Restore !613 2024-04-03 07:12:53 +00:00
psi29a
b83ffdc357 Merge branch 'i-have-value-too' into 'master' 
FIX(CS): Re-add gold value column for objects

See merge request OpenMW/openmw!3991
 2024-04-02 07:34:51 +00:00
Dave Corley
7a291e5025 FIX(CS): Re-add gold value column for objects 2024-03-31 05:34:11 -05:00
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