1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-09-13 16:24:06 +00:00
Commit graph

3955 commits

Author SHA1 Message Date
Evil Eye
ea52a5f4bd Clarify that topics should be written after journals 2024-10-21 19:57:18 +02:00
Dave Corley
dbb29b2391 FIX: Serialize journal records first when saving plugins 2024-10-16 02:01:58 -07:00
psi29a
3e3ff00c72 Merge branch 'dialoguestuff' into 'master'
Improve TESCS dialogue compatibility

Closes #8181

See merge request OpenMW/openmw!4396
2024-10-15 07:42:47 +00:00
psi29a
ef708c9cf0 Merge branch 'consistentcaptioncapitalization' into 'master'
Make OpenMW-CS preferences and OMWMusic lines more stylistically consistent

See merge request OpenMW/openmw!4394
2024-10-07 20:01:27 +00:00
Evil Eye
c9ef03fdd1 Change INFO id generation to not exceed 31 characters 2024-10-03 22:24:08 +02:00
Evil Eye
df757b9e4d Count DIAL and INFO records in the HEDR 2024-10-03 22:23:37 +02:00
Evil Eye
6644a7f27b Use more sensible types in pathgridutil 2024-10-02 21:10:51 +02:00
Alexei Kotov
4dd11d91f3 Editor: Make setting captions stylistically consistent, improve grammar 2024-10-02 19:30:37 +03:00
Andrei Kortunov
8dc16f0a17 Improve screen detection for editor's widgets 2024-09-28 10:19:30 +04:00
Alexei Kotov
0b1465446d Editor: Improve Models category layout
Increase minimum input field width and give proper labels to string settings
2024-09-20 05:12:38 +03:00
elsid
1fd6ac6438
Use normalized path in ImageManager 2024-09-17 00:49:57 +02:00
elsid
d8189a5aa1
Use normalized path in SceneManager 2024-09-13 14:21:49 +02:00
psi29a
e1875d459a Merge branch 'boost-config-required' into 'master'
Modernise Boost CMake stuff

Closes #8100

See merge request OpenMW/openmw!4307
2024-09-04 19:04:57 +00:00
Dave Corley
daf82d40b9 FIX(CSVRender::Object): Clamp scale edits in render window too 2024-08-25 10:23:04 -07:00
AnyOldName3
387b63909b Remove vestigial Boost libraries
Boost::zlib is basically part of Boost::iostreams, and depending on how you configure Boost, it can either be a separate library or get embedded into iostreams.
With the third-party-but-linked-on-Boost's-website package we've been using for years, it's a separate library.
Before https://gitlab.com/OpenMW/openmw/-/merge_requests/4307, we needed to explicitly link with it as CMake wasn't handling transitive dependencies for us.
With vcpkg, it's embedded, and doesn't have its own CMake config, so we couldn't explicitly link with it even if we wanted to.

Now CMake *is* handling transitive dependencies for us, we don't even need to think about this library.
It's all automatic.

Boost::locale, on the other hand, used to be something we used directly (I think for doing UTF-16/UTF-8 conversions when dealing with Windows paths).
However, it isn't anymore, and we just didn't purge it from our CMake when we should have.
It can go.
2024-08-23 14:06:13 +01:00
AnyOldName3
26be98966f Modernise Boost CMake stuff
Resolves https://gitlab.com/OpenMW/openmw/-/issues/8100

Also removes some old crud.
Hopefully the old crud is all:
* Handled automatically by CMake now we're using the modern approach.
* A hack-fix for a problem caused by not using the modern approach.
* Massively outdated so no longer necessary.

If it turns out this makes CI fail, I'll tweak things as necessary.

Changes that might not be wanted include:
* Getting rid of our BOOST_STATIC CMake option. In cases where the CMake config doesn't make the one correct choice from the build environment (i.e. because there's a choice) the CMake config exposes the option already.
  However, we were forcing this on for Windows, so that might matter.
  It seems to default to static on my machine even though I thought I read something suggesting otherwise, so we'll see how things go with that.
  If we eventually put CMake in charge of installing dependency DLLs this will be a moot point as we won't need to care.
* Bumping the minimum version of Boost to 1.70.0, as that's the first with working CMake config.
  It's from 2019, so plausibly there are distros too scared to use a library from five years ago as it can't legally drink in the US (although it could in limited quantities with parental supervision in the UK, as long as it's just something inconsequential like a single sip of beer).
2024-08-23 14:06:13 +01:00
psi29a
dc9c68f61b Merge branch 'fix_android_openmw' into 'master'
Keep separation between openmw and openmw-lib on Android

See merge request OpenMW/openmw!4221
2024-08-14 19:18:32 +00:00
psi29a
765d55208f Merge branch 'axis-lock' into 'master'
Feat(CS): Add shortcuts for axis locking, submode selection, switching camera, and fix render arrows

See merge request OpenMW/openmw!3675
2024-07-29 08:04:48 +00:00
Andrei Kortunov
21db4219de Use QPersistentModelIndex to react to model changes 2024-07-26 09:57:35 +04:00
Dave Corley
9f8ebc7973 FIX: Correct keybind conflict with move submode and drop to terrain 2024-07-23 13:59:31 -05:00
Dave Corley
55ccec7ecc FIX: Update settings declarations to newer standards 2024-07-23 13:59:31 -05:00
Dave Corley
5afdcddefa Consistency fix in keybind names, simplify instancemode and remove some
dead code
2024-07-23 13:59:21 -05:00
Dave Corley
78c41d3eee Feat(instancemode.cpp): Implement keybinds for axis locking & switching submodes
Cleanup(instancemode): Make the axis shortcut using std::string instead
of format
2024-07-23 13:58:43 -05:00
Dave Corley
98750a122d Feat(worldspacewidget.cpp): store the camera mode tool & implement the
shortcut to cycle camera modes
2024-07-23 13:56:19 -05:00
Dave Corley
2e581c4d70 Feat(CS): Add shortcuts for axis locking, submode selection, and camera cycling 2024-07-23 13:56:14 -05:00
Andrei Kortunov
355dd0bccf Do not store references to disposed objects 2024-07-23 10:27:23 +04:00
psi29a
89e8514e00 Merge branch 'qvariant_usertype' into 'master'
Improve QVariant usage

See merge request OpenMW/openmw!4261
2024-07-22 07:21:45 +00:00
Andrei Kortunov
54271b872c Improve QVariant usage 2024-07-20 14:32:56 +04:00
Sam Hellawell
78e365f382 Add OpenMW-CS Terrain Equalize tool 2024-07-20 02:30:46 +01:00
elsid
1bdc01273e
Move "debugging" function into Debug namespace 2024-07-13 11:15:33 +02:00
elsid
73d48720ef
Do not change output names for targets
Changing them does not solve any problem but only creates some.
2024-07-13 10:35:16 +02:00
Andrei Kortunov
dc7407a34c Use signed variables to match an API 2024-07-04 09:54:48 +04:00
Andrei Kortunov
a9108a743d Do not make redundant copy 2024-07-01 20:50:25 +04:00
Andrei Kortunov
5390634e22 Add a missing null pointer check 2024-06-27 21:10:38 +04:00
psi29a
64dd6e36d1 Merge branch 'openmw-cs-error-verify-refnums' into 'master'
OpenMW-CS verify duplicate RefNums

See merge request OpenMW/openmw!4012
2024-06-24 18:03:59 +00:00
cykoder
57e7bf3748 OpenMW-CS verify duplicate RefNums 2024-06-24 18:03:59 +00:00
psi29a
0013a44b71 Merge branch 'datadisplaydelegate' into 'master'
React to scale or color changes in editor tables

See merge request OpenMW/openmw!4098
2024-06-22 09:03:19 +00:00
psi29a
98ba2120b6 Merge branch 'zerotohero' into 'master'
Use -1 as the plugin index for LandTextures

See merge request OpenMW/openmw!4121
2024-06-14 07:22:27 +00:00
Dave Corley
b7deb7e9bc Feat(CS): Make LMB the primary interaction 2024-06-12 19:36:55 -05:00
Evil Eye
fbc6629d40 Rework land texture handling 2024-06-12 17:09:28 +02:00
psi29a
c1d74763ed Merge branch 'i-have-no-land-and-i-must-scream' into 'master'
Fix(CS): Add landscape flag if it doesn't exist at all and improve landscape QOL

Closes #7707

See merge request OpenMW/openmw!3617
2024-06-11 11:10:33 +00:00
psi29a
61772fa234 Merge branch 'verifiers' into 'master'
Complain about fishy local variable names, improve editor effect list handling

See merge request OpenMW/openmw!4160
2024-06-11 11:10:19 +00:00
elsid
2e0e0f53b6
Add --coverage to openmw-cs 2024-06-10 23:04:01 +02:00
Evil Eye
965bc20bab Set mPluginIndex to -1 for textures defined in this plugin 2024-06-10 21:39:10 +02:00
Evil Eye
ed5bedb9db Use record state to determine if a LandTexture record was defined in the current plugin 2024-06-10 21:39:10 +02:00
Dave Corley
145f9c1154 CLEANUP(CS): Do heightData check in actual implementation, revert
accidental change to land condition order
2024-06-10 02:02:31 -05:00
Dave Corley
86316fa7ab Fix(cell.cpp): Don't try to update land for interiors 2024-06-10 02:02:31 -05:00
Dave Corley
10eb807e72 Fix(Cell.hpp): Correct include path for document 2024-06-10 02:02:31 -05:00
Dave Corley
0a8fee59dd Don't store member variables from document & use simpler and safer
inputs to cell constructor. Explicitly tell the constructor whether land
should be loaded or not
2024-06-10 02:02:31 -05:00
Dave Corley
47044e1dc0 Cleanup(CS): re-add const for land collection 2024-06-10 02:02:31 -05:00
Dave Corley
89bce6f678 Fix(CS): Enum name in accordance with current standards 2024-06-10 02:02:31 -05:00
Dave Corley
6f2ae4a33b Cleanup(CS): Improve readability and clean up some implementations 2024-06-10 02:02:31 -05:00
Dave Corley
ad135e3b95 Fix(cell.cpp): Change commands.hpp to absolute include path 2024-06-10 02:02:31 -05:00
Dave Corley
d8187e40b2 Feat(CS): Create LAND record using the undo stack 2024-06-10 02:02:31 -05:00
Dave Corley
731302ecff Feat(CS): Add undo stack as a member of CSVRender::Cell 2024-06-10 02:02:31 -05:00
Dave Corley
f565730a9a Fix(cell.cpp): never try to update land for interiors 2024-06-10 01:58:34 -05:00
Dave Corley
dd7a2f22d1 Cleanup(CSVRender::Cell:updateLand): Early exit when landscape should
not be loaded
2024-06-10 01:58:34 -05:00
Dave Corley
78fd135764 Fix(CS): Remove unreachable code as land data will always be present 2024-06-10 01:58:34 -05:00
Dave Corley
3e7335ddc7 Fix(CS): Initialize landscape when opening an existing cell without VHGT 2024-06-10 01:58:34 -05:00
Dave Corley
2541b74fc6 Fix(CS): Apply land flags when appropriate edits are made 2024-06-10 01:58:34 -05:00
Alexei Kotov
dd0ff13ba9 Reset attribute/skill arguments in IngredEffectRefIdAdapter if needed 2024-06-08 13:50:40 +03:00
Alexei Kotov
3051e0834a Accept invalid effect IDs and ranges in EffectsListAdapter 2024-06-08 13:49:39 +03:00
Alexei Kotov
252ee7f8c4 Deduplicate effect list verification
Drop Potion-specific range check, it's irrelevant
2024-06-08 06:31:18 +03:00
Alexei Kotov
ba20ba2c6c Editor: Warn if a magic effect's max magnitude is zero 2024-06-08 06:31:18 +03:00
Alexei Kotov
2fdbd6287d Editor: Verify magic effects for enchantments, ingredients and potions
Use constants for known magic effect/skill/attribute range
2024-06-08 06:31:17 +03:00
psi29a
a80f5c109c Merge branch 'ltexerasure' into 'master'
Fix LTEX overriding and allow deletion

See merge request OpenMW/openmw!4152
2024-06-07 08:05:56 +00:00
Andrei Kortunov
eac2082e82 Unify operation progress bar appearance 2024-06-04 11:07:08 +04:00
Evil Eye
ca6baed366 Fix LTEX overriding and allow deletion 2024-06-03 16:42:27 +02:00
Andrei Kortunov
204267d211 React to scale or color changes in editor tables 2024-05-27 18:38:33 +04:00
Alexei Kotov
131bb510e4 Merge branch 'operation_fixes' into 'master'
Improve operations widget formatting, part 2

See merge request OpenMW/openmw!4119
2024-05-27 01:07:07 +00:00
Andrei Kortunov
2749d2a6cb Revert "Make sure that Open button becomes focused after enabling"
This reverts commit d5bbd75828.
2024-05-25 23:43:19 +04:00
Evil Eye
6a10311ae5 Use more appropriate types in terrain storage 2024-05-23 18:48:54 +02:00
Andrei Kortunov
52de6177d1 Avoid MSVC crash in Visual Studio 17.10.0 2024-05-22 18:17:22 +04:00
Andrei Kortunov
6c83451b15 Improve operations widget formatting 2024-05-22 14:37:58 +04:00
Alexei Kotov
67c47b8603 Merge branch 'operation_fixes' into 'master'
Improve operation widget appearance

See merge request OpenMW/openmw!4110
2024-05-21 19:31:39 +00:00
Dave Corley
c87eaefd17 Merge branch 'theeditorisjustanotherengine' into 'master'
Use ESM::ReadersCache in the editor

Closes #7896

See merge request OpenMW/openmw!4111
2024-05-21 06:35:47 +00:00
Andrei Kortunov
bf682d51a6 Support dark mode on Windows (feature 7985) 2024-05-20 16:50:24 +04:00
Evil Eye
77d554594f Add ReadersCache::clear 2024-05-19 20:39:23 +02:00
Evil Eye
5f0fe8097c Use ESM::ReadersCache in the editor 2024-05-19 18:55:37 +02:00
Andrei Kortunov
3d699bd533 Improve operation widget appearance 2024-05-19 15:56:44 +04:00
Andrei Kortunov
dca452aaca Change default colors in script editor to support dark themes 2024-05-14 13:59:19 +04:00
Andrei Kortunov
bf568da6de Remove redundant checks 2024-05-12 17:26:18 +04:00
Andrei Kortunov
d5bbd75828 Make sure that Open button becomes focused after enabling 2024-05-12 17:26:14 +04:00
Andrei Kortunov
e7d566eb2e Remove border from status bar 2024-05-12 17:26:10 +04:00
Andrei Kortunov
b56c255be2 Improve appearance of script editor in the OpenMW-CS 2024-05-06 12:22:30 +04:00
Andrei Kortunov
070327a259 Change SVG color in the editor 2024-04-27 09:57:47 +04:00
psi29a
02cdeb6252 Merge branch 'scalable_editor' into 'master'
Treat editor icons as scalable

See merge request OpenMW/openmw!4042
2024-04-23 07:04:59 +00:00
psi29a
9662586947 Merge branch 'editor-crash' into 'master'
Clamp widgets coordinates to avoid editor crashes

See merge request OpenMW/openmw!4043
2024-04-23 07:04:09 +00:00
psi29a
023c0f7a46 Merge branch 'vfs_normalized_path_6' into 'master'
Use normalized path for music related functions

See merge request OpenMW/openmw!4038
2024-04-22 07:02:14 +00:00
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