mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 08:45:36 +00:00
Code Issues Releases Wiki Activity
34406 commits 108 branches 66 tags 134 MiB
Commit graph

3866 commits

Author SHA1 Message Date
Andrei Kortunov
1bb48bcef7 Treat editor icons as scalable 2024-04-21 20:56:06 +04:00
Andrei Kortunov
2264d067fc Clamp widgets coordinates to avoid crashes 2024-04-21 17:15:33 +04:00
psi29a
2438fb4c98 Merge branch 'windows_qt6' into 'master' 
Use Qt6 on Windows by default

See merge request OpenMW/openmw!4016
 2024-04-20 16:39:47 +00:00
psi29a
f21453f0b7 Merge branch 'twoahahidles' into 'master' 
Change wander package column names to match reality

See merge request OpenMW/openmw!4032
 2024-04-20 16:38:41 +00:00
AnyOldName3
04f1dc282b Merge branch 'fix-osga-rotate-wildly' into 'master' 
Fix OSGAnimation issues

See merge request OpenMW/openmw!3989
 2024-04-20 15:37:09 +00:00
elsid
e11a5a4352
Use normalized path for SoundManager::playPlaylist 2024-04-19 22:43:20 +02:00
psi29a
3600c6c7c7 Merge branch 'filterview' into 'master' 
Validate INFO filters when loading the record

See merge request OpenMW/openmw!4003
 2024-04-17 13:08:49 +00:00
Andrei Kortunov
d06e8e2c24 Use Qt6 on Windows by default 2024-04-17 08:58:18 +04:00
psi29a
e1be24e7fc Merge branch 'svg_icons' into 'master' 
Rework editor icons

See merge request OpenMW/openmw!4024
 2024-04-16 20:26:19 +00:00
Evil Eye
963035fe47 Change wander package column names to match reality 2024-04-15 18:20:57 +02:00
Andrei Kortunov
1ad9e5f9e8 Rework editor icons 2024-04-14 08:17:10 +04:00
Evil Eye
6e79064a57 Fix editor oddities 2024-04-12 18:32:47 +02:00
Evil Eye
a4625ea784 Deduplicate dialogue filter parsing 2024-04-11 22:29:33 +02:00
Sam Hellawell
c3420ed306 Fix build 2024-04-11 03:01:00 +01:00
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
Alexei Kotov
d7257e056c Merge branch 'remove-unused-regionmap-constructor' into 'master' 
Minor cleanup: Remove unused regionmap CellDescription constructor

See merge request OpenMW/openmw!3973
 2024-03-24 13:08:24 +00:00
Evil Eye
781e797810 Merge branch 'instanceselectionmode' into 'master' 
Fix instance selection mode destruction (#7447)

Closes #7447

See merge request OpenMW/openmw!3945
 2024-03-23 08:08:15 +00: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
Sam Hellawell
aa0c9fb4cb Fix: cannot drag region into map, map columns are rectangular 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
Alexei Kotov
cdbe6adfc3 Fix instance selection mode destruction (#7447) 2024-03-12 03:39:14 +03:00
elsid
5859fd464c
Add option to disable precompiled headers 
To be able to use ccache.

Also fix compilation errors appeared due to absence of precompiled
headers.
 2024-03-08 02:11:51 +01:00
psi29a
9434f52c14 Merge branch 'fix/less-strict-ids' into 'master' 
Fix(idvalidator): Allow any printable character in refIds

Closes #7721

See merge request OpenMW/openmw!3896
 2024-03-05 09:23:44 +00:00
psi29a
e340b06411 Merge branch 'get-glextensions-properly' into 'master' 
Get the GLExtensions instance when a context is created

Closes #7351

See merge request OpenMW/openmw!3022
 2024-03-04 15:05:23 +00: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
AnyOldName3
36a75cdb29 Get the GLExtensions instance when a context is created 2024-02-23 00:15:23 +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
090a389feb Cleanup(idvalidator): Just don't use isValid function and instead 
directly check if input is a printable char
 2024-02-22 02:52:58 -06:00
Dave Corley
9fc66d5de6 Fix(idvalidator): Allow any printable character in refIds 2024-02-21 15:25:13 -06:00
elsid
e9c672b297
Fix build with cmake flag BUILD_SHARED_LIBS=ON 
Always build opencs-lib as static library instead of BUILD_SHARED_LIBS deciding
whether it's static or shared library.
 2024-02-18 19:35:32 +01: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
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