Commit Graph

3916 Commits (master)

Author SHA1 Message Date
Andrei Kortunov 1bb48bcef7 Treat editor icons as scalable 8 months ago
Andrei Kortunov 2264d067fc Clamp widgets coordinates to avoid crashes 8 months ago
psi29a 2438fb4c98 Merge branch 'windows_qt6' into 'master'
Use Qt6 on Windows by default

See merge request OpenMW/openmw!4016
8 months ago
psi29a f21453f0b7 Merge branch 'twoahahidles' into 'master'
Change wander package column names to match reality

See merge request OpenMW/openmw!4032
8 months ago
AnyOldName3 04f1dc282b Merge branch 'fix-osga-rotate-wildly' into 'master'
Fix OSGAnimation issues

See merge request OpenMW/openmw!3989
8 months ago
elsid e11a5a4352
Use normalized path for SoundManager::playPlaylist 8 months ago
psi29a 3600c6c7c7 Merge branch 'filterview' into 'master'
Validate INFO filters when loading the record

See merge request OpenMW/openmw!4003
9 months ago
Andrei Kortunov d06e8e2c24 Use Qt6 on Windows by default 9 months ago
psi29a e1be24e7fc Merge branch 'svg_icons' into 'master'
Rework editor icons

See merge request OpenMW/openmw!4024
9 months ago
Evil Eye 963035fe47 Change wander package column names to match reality 9 months ago
Andrei Kortunov 1ad9e5f9e8 Rework editor icons 9 months ago
Evil Eye 6e79064a57 Fix editor oddities 9 months ago
Evil Eye a4625ea784 Deduplicate dialogue filter parsing 9 months ago
Sam Hellawell c3420ed306 Fix build 9 months ago
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
9 months ago
Alexei Kotov f2e0129436 Convert water/ripple defines to camelCase 9 months ago
uramer 3b930e4471 Restore !613 9 months ago
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
9 months ago
Dave Corley 7a291e5025 FIX(CS): Re-add gold value column for objects 9 months ago
Evil Eye cb357997c9 Copy DIAL type to INFO when saving 9 months ago
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
9 months ago
Dave Corley b8a17b16f7 Cleanup(CS): Make TeleportColumn take flags as argument 9 months ago
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
9 months ago
Dave Corley 1360eeb839 Fix #7901, make teleport fields non-interactive when mTeleport is false 9 months ago
Sam Hellawell e87c39eeb3 OpenCS: Editing and verifying of projectile speed for magic effects 9 months ago
Dave Corley 2e68786331 Fix(CS): Actually allow unlocking doors ( #7899 ) 9 months ago
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
9 months ago
psi29a 012d10703f Merge branch 'spellcast-refactor' into 'master'
Spellcast related Lua API + spellcasting/activespell refactor

See merge request OpenMW/openmw!3922
9 months ago
Mads Buvik Sandvei 320d8ef014 Spellcast related Lua API + spellcasting/activespell refactor 9 months ago
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
9 months ago
Dave Corley c59d097ab2 FIX(#7898): Limit scale for references TES3 values 9 months ago
Alexei Kotov d7257e056c Merge branch 'remove-unused-regionmap-constructor' into 'master'
Minor cleanup: Remove unused regionmap CellDescription constructor

See merge request OpenMW/openmw!3973
9 months ago
Evil Eye 781e797810 Merge branch 'instanceselectionmode' into 'master'
Fix instance selection mode destruction (#7447)

Closes #7447

See merge request OpenMW/openmw!3945
9 months ago
Sam Hellawell c20a23b694 Remove unused regionmap CellDescription constructor 9 months ago
Alexei Kotov 79039f88df Use the right ID for magic effect verifier messages (#7894) 9 months ago
psi29a 7dcd127295 Merge branch 'openmw-cs-regionmap-improvements' into 'master'
OpenMW CS: Minor region map fixes and improvements

See merge request OpenMW/openmw!3959
9 months ago
Sam Hellawell a62da201e5 check for land index not -1, fix warning
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
10 months ago
Sam Hellawell 5fca45565c Feature: display different brush for land vs water 10 months ago
Sam Hellawell aa0c9fb4cb Fix: cannot drag region into map, map columns are rectangular 10 months ago
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())));
      |                                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10 months ago
psi29a 090e57b27c Merge branch 'esm3structs' into 'master'
Replace fixed size writeHNT calls with decomposition

See merge request OpenMW/openmw!3914
10 months ago
Evil Eye 0fdc432eb2 Format probability 10 months ago
Evil Eye 1d69d38081 Add an actual probability column 10 months ago
Alexei Kotov cdbe6adfc3 Fix instance selection mode destruction (#7447) 10 months ago
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.
10 months ago
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
10 months ago
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
10 months ago
Evil Eye cef59e8928 Replace fixed size writeHNT calls with decomposition 10 months ago
Evil Eye 958f70736f Implement auto calculated potion values 10 months ago
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.
10 months ago
AnyOldName3 36a75cdb29 Get the GLExtensions instance when a context is created 10 months ago
Dave Corley ce2787e15e Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub 10 months ago
Dave Corley bb35f0366a Fix(loadcell): Save water height regardless of value, if the user actually adjusted it 10 months ago
Dave Corley 090a389feb Cleanup(idvalidator): Just don't use isValid function and instead
directly check if input is a printable char
10 months ago
Dave Corley 9fc66d5de6 Fix(idvalidator): Allow any printable character in refIds 10 months ago
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.
10 months ago
Dave Corley 54f4c69d37 Cleanup(columnimp): Use std::clamp to limit race scaling 11 months ago
Dave Corley 54e90b4ac2 Legacy(columnimp): Add TESCS limits for race weight/height scaling 11 months ago
Dave Corley 1b1f0c4971 Switch height/weight in names and make the stats a simple struct instead 11 months ago
Dave Corley 98ad059806 Cleanup(actoradapter): Use more explicit names & vec2 for racial height/weight 11 months ago
Dave Corley 049550d73e Cleanup(Actoradapter.cpp): Create new struct for race stats, use
std::pair instead
11 months ago
Dave Corley b31664a78f Fix(CS): Scale actors according to their race's stats 11 months ago
Andrei Kortunov 7e345436f4 Localize Launcher and Wizard 11 months ago
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
11 months ago
psi29a f656d2e380 Merge branch 'shutupverifier' into 'master'
Editor: Silence some verifier warnings

See merge request OpenMW/openmw!3814
11 months ago
psi29a 7450b11402 Merge branch 'vfs_normalized_path_1' into 'master'
Use normalized path for VFS manager and RecursiveDirectoryIterator

See merge request OpenMW/openmw!3806
11 months ago
Alexei Kotov b83b30f0dc Editor: Reset effect arguments when the effect ID changes (#7785) 11 months ago
Evil Eye aa9a99bde5 Merge branch 'magic_effects_fix' into 'master'
Fix magic effects in the editor

Closes #7481

See merge request OpenMW/openmw!3798
11 months ago
Alexei Kotov 70a0b7ea9c Editor: Drop zero attribute warnings 11 months ago
Alexei Kotov 48bbf0b637 Editor: Don't complain about body part references in Verify 11 months ago
elsid 70061329a1
Return Path::Normalized from RecursiveDirectoryIterator 11 months ago
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
11 months ago
psi29a 76ad680549 Merge branch 'tools' into 'master'
Use move semantics for tools

See merge request OpenMW/openmw!3795
11 months ago
Andrei Kortunov 737d3b499b Use move semantics for tools 11 months ago
Andrei Kortunov e01e2f1ae0 Fix magic effects in the editor 11 months ago
Andrei Kortunov 251d01304f Use move semantics for osg::ref_ptr 11 months ago
psi29a c23cd8e544 Merge branch 'umlautontherocks' into 'master'
Convert strings in nif files to utf8

Closes #7780

See merge request OpenMW/openmw!3783
11 months ago
psi29a 6ead5f9321 Merge branch 'touch_record' into 'master'
Fix Touch command

See merge request OpenMW/openmw!3778
11 months ago
Evil Eye 0f6133b040 Merge branch 'move_editor' into 'master'
Move local variables in the editor

See merge request OpenMW/openmw!3771
12 months ago
Evil Eye 48db113149 Address feedback 12 months ago
Evil Eye 27fa411f4f Convert strings in nif files to utf8 12 months ago
elsid a2147d70cc
Use forward declaration for some VFS types
This will allow to save on preprocessed code size in the future changes.
12 months ago
Andrei Kortunov a91e557c68 Fix Touch command (bug 7765) 12 months ago
psi29a 2836ca2d91 Merge branch 'dynamic_casts' into 'master'
Check dynamic cast results

See merge request OpenMW/openmw!3761
12 months ago
Andrei Kortunov f8c1d48c0b Get rid of redundant casts 12 months ago
Andrei Kortunov 074ab682ab Move local variables in the editor 12 months ago
Yury Stepovikov 52623ddd7d Set MacOS current_path before reading configuration files [#7706] 12 months ago
elsid 66f5d70550
Use settings values to declare shortcut settings 12 months ago
Evil Eye 64673ea21f Merge branch 'editor_colour_settings' into 'master'
Use settings values to declare colour settings (#6876)

See merge request OpenMW/openmw!3747
12 months ago
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
12 months ago
elsid cc0b00a0d2
Use settings values to declare colour settings 12 months ago
psi29a eedb96863e Merge branch 'editor_enum_settings' into 'master'
Use settings values to declare enum settings (#6876)

See merge request OpenMW/openmw!3724
12 months ago
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.
12 months ago
Dave Corley c563219b61 Cleanup(CS): Pass const ref when applicable for selection groups 12 months ago
Dave Corley 3ff1bae372 Cleanup(CS): More consistent names for selection group configs 12 months ago
Dave Corley c93b6dca0a Fix(CS): Add record type to selection groups to fix #7759 12 months ago
elsid 72fa4924dc
Use settings values to declare enum settings 1 year ago
jvoisin 29c20cdb41 Merge branch 'fix_universal_id' into 'master'
Add missing UniversalId::mClass initialization

See merge request OpenMW/openmw!3707
1 year ago
elsid 94409ce172
Add missing UniversalId::mClass initialization 1 year ago
Evil Eye e63933efa6 Use NAM9 for stack count 1 year ago
Alexei Kotov 0f9eb3d85a Merge branch 'editor_double_settings' into 'master'
Use settings values to declare double settings (#6876)

See merge request OpenMW/openmw!3701
1 year ago
Alexei Kotov 8a91e7057f Merge branch 'ref_id_universal_id' into 'master'
Fix RefId based UniversalId (#7747)

Closes #7747

See merge request OpenMW/openmw!3702
1 year ago
psi29a cb24475662 Merge branch 'what-a-selection-you-have' into 'master'
Feat(CS): Add More Selection Controls

See merge request OpenMW/openmw!3674
1 year ago
elsid 39dd73263d
Avoid converting UniversalId to a different type via string 1 year ago
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.
1 year ago
elsid 0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId 1 year ago
elsid 088d4ee5ce
Use settings values to declare double settings 1 year ago
elsid 6a16686107
Use settings values to declare string settings 1 year ago
psi29a a2c6009352 Merge branch 'editor_bool_settings' into 'master'
Use settings values to declare bool settings (#6876)

See merge request OpenMW/openmw!3679
1 year ago
jvoisin f80ba4e28c Apply 1 suggestion(s) to 1 file(s) 1 year ago
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
1 year ago
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.
1 year ago
Andrei Kortunov 1ca2a0ef66 Store generated UI by pointer to avoid redundant processing 1 year ago
Alexei Kotov 51b05647e2 Merge branch 'move_files' into 'master'
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
1 year ago
elsid edaac852d1
Use settings values to declare bool settings 1 year ago
Dave Corley 25f3e09da9 Fix(CS): Correct build issues on some compilers 1 year ago
Dave Corley 33ce7782e9 Feat(worldspacewidget.cpp): Add shortcut to clear selection 1 year ago
Dave Corley a7f8ee1106 Feat(instancemode.cpp): Implement save/load selection group functions 1 year ago
Dave Corley 23e75bed8f Feat(object.cpp): Make object outline an optional argument when selecting it 1 year ago
Dave Corley f287914f1e Feat(cell.cpp): Add select/unhide functions in cell.cpp 1 year ago
Dave Corley 8edc148418 Feat(CS): Implement select/unhide functions into interior & exterior
worldspace widgets
1 year ago
Dave Corley 94eadd436d Feat(worldspacewidget.cpp): Implement shortcut for visibility switching
& unhiding all instances
1 year ago
Dave Corley 9d155afc15 Feat(worldspacewidget.hpp): Add virtual decs for selection functions 1 year ago
Dave Corley cf098033b9 Feat(Mask.hpp): Add mask for hidden objects 1 year ago
Dave Corley 0ec6dcbf1f Feat(Settings): Implement shortcuts for hiding refs & selection groups 1 year ago
Dave Corley 24443e00bf Feat(CS): Implement selection groups into data model 1 year ago
Alexei Kotov c6a1196ec7 Merge branch 'editor_int_settings' into 'master'
Use settings values to declare int settings (#6876)

See merge request OpenMW/openmw!3668
1 year ago
jvoisin 2873f971a6 Merge branch 'downsized' into 'master'
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
1 year ago
elsid 66b1745520
Use settings values to declare int settings 1 year ago
Andrei Kortunov e6690bbcc7 Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR 1 year ago
Evil Eye 36b61d7074 Merge branch 'copy-that' into 'master'
Feat(CS): Implement Instance Cloning

See merge request OpenMW/openmw!3654
1 year ago
Andrei Kortunov 2e041073fc Move *.ui files for different applications to different folders 1 year ago
Alexei Kotov 7922f0e7f8 Merge branch 'editor_modifier_settings' into 'master'
Use settings values to declare modifier settings (#6876)

See merge request OpenMW/openmw!3656
1 year ago
Evil Eye 37415b0382 Don't use getExact to read structs 1 year ago
Evil Eye a9e6e63c4e Remove fixed size reads 1 year ago
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.
1 year ago
elsid 11db9eec1d
Use settings values to declare modifier settings 1 year ago
Dave Corley bc662aeb63 Fix(CS): Fix minor issue in deleteSelectedInstances impl which caused it
to run twice
1 year ago
Dave Corley 7069a970ae Feat(CS): Implement instance cloning 1 year ago
Dave Corley 2bb8ceef56 Fix(CS): Correct invalid refNum for cloned objects so they actually
appear ingame
1 year ago
Dave Corley 2a747529bb Feat(CS): Add new shortcut for duplicating instances 1 year ago
Evil Eye 78da1eb41f Merge branch 'settings_values_editor_2' into 'master'
Use settings values for editor (#6876)

See merge request OpenMW/openmw!3633
1 year ago
Andrei Kortunov 6f68df9ac2 Avoid redundant copies 1 year ago
elsid e1a68d8cf5
Ignore absent default setting value 1 year ago
elsid 4c13ecea23
Use settings values for editor 1 year ago
elsid 88a6ecabae
Add lookup index to editor settings category
Prevent adding duplicate settings there.
1 year ago
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
1 year ago
elsid fb0b95a2dd
Define editor settings as typed struct members 1 year ago
elsid 755fef62f7
Mark State copy constructor and assignment operators as delete 1 year ago
elsid e07d8f3066
Add separate setting type for subcategory 1 year ago