1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:53:52 +00:00
Commit graph

3894 commits

Author SHA1 Message Date
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