elsid
d1ccb4b804
Use normalized path for groundcover
2024-10-13 13:27:23 +02:00
psi29a
974c0ce158
Merge branch 'vfs_normalized_path_16' into 'master'
...
Use normalized path in multiple places and fix additional animation sources loading (#8138 )
See merge request OpenMW/openmw!4398
2024-10-07 20:02:54 +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
AnyOldName3
6c8055134d
Merge branch 'seaofnodesmorelike' into 'master'
...
Use more sensible types in pathgridutil
Closes #8172
See merge request OpenMW/openmw!4395
2024-10-07 12:23:27 +00:00
elsid
5532bc61c1
Support additional animation sources not only for 2 letter extensions
...
If extension is not 2 letters length (e.g. not .kf), replacing last 3 last
charaters leads to weird results like:
"meshes/basicplayer.dae" -> "animations/basicplayer./"
According to the doc this should be "animations/basicplayer/".
2024-10-06 16:33:59 +02:00
elsid
a6e075499b
Use normalize path in Animation::addAnimSource to change extension
2024-10-06 16:33:39 +02:00
elsid
7e7cf51ade
Use normalized path in NpcAnimation
2024-10-06 11:32:53 +02:00
elsid
52ab136dd6
Remove redundant reference for ESM::RefId variables
2024-10-06 11:32:53 +02:00
Evil Eye
ffe164b28d
Add a test and address feedback
2024-10-06 11:32:24 +02:00
elsid
0665de4c09
Use normalized path for model in ProjectileManager
2024-10-06 11:26:06 +02:00
trav
3d2dd9201d
Merge branch openmw:master into handtohand-tooltip
2024-10-05 17:24:17 +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
psi29a
f27030a87c
Merge branch 'uipointers' into 'master'
...
Prevent stale pointers in UI widgets
See merge request OpenMW/openmw!4393
2024-10-02 10:31:19 +00:00
Alexei Kotov
56e200f8ac
Merge branch 'ripply-doll' into 'master'
...
Fix inventory doll when non-compute-shader ripples are used with FFP
See merge request OpenMW/openmw!4390
2024-10-02 08:43:41 +00:00
jvoisin
1bc130332e
Merge branch 'catfight' into 'master'
...
Restore female/beast-specific first person animations (#8179 )
Closes #8179
See merge request OpenMW/openmw!4392
2024-09-30 11:21:51 +00:00
Evil Eye
481e63ffa7
Prevent stale pointers in UI widgets
2024-09-29 22:36:31 +02:00
Alexei Kotov
963b7ec742
Unify first/third-person animation choice logic ( #8179 )
...
Re-enable first-person female/beast-specific animations
Use dehardcoded argonian swim animation path
2024-09-28 13:30:04 +03:00
Andrei Kortunov
8dc16f0a17
Improve screen detection for editor's widgets
2024-09-28 10:19:30 +04:00
elsid
63e984ba24
Use normalized path in BulletShapeManager
2024-09-27 23:33:58 +02:00
elsid
7a5c478e34
Use normalized path in PreloadItem
2024-09-27 23:33:57 +02:00
elsid
1d98b5c66b
Remove redundant toNormalized
2024-09-27 23:33:57 +02:00
psi29a
cb009db4bb
Merge branch 'topicHighlighting' into 'master'
...
Topic Highlighting Mouse Over Fix
See merge request OpenMW/openmw!4113
2024-09-27 06:36:17 +00:00
psi29a
d1059aee8c
Merge branch 'test_ptr' into 'master'
...
Add tests for MWWorld::Ptr
See merge request OpenMW/openmw!4344
2024-09-26 07:36:23 +00:00
AnyOldName3
bd8386459a
Fix inventory doll when ripple fragment shader path is used
...
Basically don't abuse OSG as badly. We need to let it know we've bound a shader program so it doesn't assume the FFP is still used, but it doesn't have a built-in way to apply the uniforms when doing so, so we need to do it manually.
2024-09-25 16:14:19 +01:00
AnyOldName3
e7a31373c9
Partially fix inventory doll when non-compute-shader ripples are used with FFP
2024-09-25 01:50:31 +01:00
elsid
b6c1e33da6
Merge branch 'hammerthingstilltheybreak' into 'master'
...
Don't let the player repair items that are better than new
Closes #8171
See merge request OpenMW/openmw!4381
2024-09-22 18:23:12 +00:00
Evil Eye
772a0b3711
Merge branch 'vfs_normalized_path_14' into 'master'
...
Use normalized path in multiple places (#8138 )
See merge request OpenMW/openmw!4383
2024-09-22 16:38:55 +00:00
Evil Eye
9de501a62c
Merge branch 'local_static_init' into 'master'
...
Properly initialize local static pointers and collections
See merge request OpenMW/openmw!4386
2024-09-22 16:38:49 +00:00
Evil Eye
2546ce2b16
Don't allow items that are better than new to be repaired
2024-09-22 18:24:21 +02:00
AnyOldName3
f817ff01b4
Merge branch 'labelsforeveryone' into 'master'
...
Editor: Improve Models settings category layout
See merge request OpenMW/openmw!4384
2024-09-21 14:04:36 +00:00
elsid
cd6e49796e
Properly initialize local static pointers and collections
...
Static variables should be initalized once instead of initializing them with
nullptr and then doing actual initialization behind if condition. Otherwise a
race condition may happen leading to undefined behaviour.
2024-09-21 13:52:43 +02:00
trav5
16a691187c
Tooltip for 'Factor Strength into Hand-to-Hand Combat'
...
Added the game launcher tooltip message for the setting
enabling the factoring of player strength into hand to
hand combat damage
2024-09-21 00:08:59 +02:00
jvoisin
e05b1fabd8
Merge branch 'compile-time' into 'master'
...
Remove duplicate compile items
See merge request OpenMW/openmw!4380
2024-09-20 13:30:45 +00:00
Jared Davenport
30a37b3fda
Remove duplicate compile items
2024-09-20 13:30:44 +00: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
Alexei Kotov
e369ab941e
Fix word-wrapping for dialogue topics with changed skin
2024-09-19 04:54:12 +03:00
jvoisin
879c23b4cb
Merge branch 'enchantedimsure' into 'master'
...
Deselect magic item before selecting a spell
Closes #8162
See merge request OpenMW/openmw!4379
2024-09-19 01:50:36 +00:00
elsid
2ef5a8486d
Use normalized path in ObjectPaging::createChunk
2024-09-19 01:05:10 +02:00
elsid
7e453d491a
Remove redundant toNormalized
2024-09-19 00:53:27 +02:00
elsid
5f2582fe68
Use normalized path in SceneManager::checkLoaded
2024-09-19 00:51:17 +02:00
elsid
3475a166e5
Use normalized path for World::spawnEffect
2024-09-19 00:31:16 +02:00
elsid
320d376b95
Remove unused virtual specifier
2024-09-19 00:17:44 +02:00
elsid
8ba4ff9946
Remove redundant bool argument from ActorAnimation::attachMesh
2024-09-19 00:13:41 +02:00
elsid
d7e99f988b
Use normalized path in ActorAnimation::attachMesh
2024-09-19 00:07:36 +02:00
elsid
f1533c215d
Use normalized path in ActorAnimation::attach
2024-09-19 00:03:18 +02:00
Evil Eye
74d699c502
Merge branch 'vfs_normalized_path_13' into 'master'
...
Use normalized path in ImageManager (#8138 )
See merge request OpenMW/openmw!4377
2024-09-18 18:47:27 +00:00
Evil Eye
d9c16328dd
Deselect magic item before selecting a spell
2024-09-17 21:16:41 +02:00
elsid
1fd6ac6438
Use normalized path in ImageManager
2024-09-17 00:49:57 +02:00
Alexei Kotov
70187bb5ac
niftest: parse BTO, BTR, RDT and PSA files
2024-09-16 23:50:36 +03:00
elsid
b4f77e8bd7
Store Lua script path as VFS normalized
2024-09-15 13:53:20 +02:00
psi29a
96ec3a8125
Merge branch 'testthevfs' into 'master'
...
Fix vfs bindings and add tests
Closes #8157
See merge request OpenMW/openmw!4371
2024-09-15 08:44:44 +00:00
Evil Eye
2978b32f51
Fix vfs bindings
2024-09-14 10:10:26 +02:00
elsid
d8189a5aa1
Use normalized path in SceneManager
2024-09-13 14:21:49 +02:00
psi29a
b32f68fcd2
Merge branch 'vfs_normalized_path_10' into 'master'
...
Use normalized path in LuaState (#8138 )
See merge request OpenMW/openmw!4365
2024-09-13 08:17:46 +00:00
Dave Corley
2ea9d6ba20
FIX(windowmanagerimp): Don't remove a ui mode twice
2024-09-11 13:37:00 -07:00
AnyOldName3
0f74e0cca8
Merge branch 'add_frame_number' into 'master'
...
Add frame number to available postprocess uniforms
See merge request OpenMW/openmw!4355
2024-09-10 16:58:27 +00:00
Cody Glassman
b346a4a858
Add frame number to available postprocess uniforms
2024-09-10 16:58:27 +00:00
psi29a
f3dd6d0a42
Merge branch 'whatstatethisstate' into 'master'
...
Remove references to temporaries and this_state in properties
Closes #8152
See merge request OpenMW/openmw!4360
2024-09-10 06:58:16 +00:00
elsid
32ec92e71c
Use normalized path in LuaState
2024-09-08 11:53:57 +02:00
Cody Glassman
f849b0c90f
update render targets during update instead of draw thread -- fixes a bug with <1 size ratios
2024-09-06 09:52:56 -07:00
Evil Eye
a32e006e1c
Remove references to temporaries and this_state in properties
2024-09-06 16:57:36 +02:00
psi29a
1e94f53146
Merge branch 'is_starter_spell' into 'master'
...
Expose starter spells
See merge request OpenMW/openmw!4352
2024-09-06 07:25:09 +00:00
psi29a
8992a9fb8c
Merge branch 'master' into 'master'
...
Navmeshtool as a Library
See merge request OpenMW/openmw!4354
2024-09-06 07:23:22 +00:00
psi29a
46cbee2f21
Merge branch 'input_bindings' into 'master'
...
Fix input bindings handling (#8115 )
Closes #8115
See merge request OpenMW/openmw!4332
2024-09-05 14:52:54 +00:00
Ole Volbracht
e920325073
Build navmeshtool as a library
2024-09-05 16:30:11 +02:00
psi29a
4c28731f6a
Merge branch 'optionallightfadeout' into 'master'
...
Make light attenuation fade optional
See merge request OpenMW/openmw!4267
2024-09-05 07:29:48 +00: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
psi29a
b3677d07fd
Merge branch 'pcallallthethings' into 'master'
...
Wrap all memory allocating Lua functions in protected calls
Closes #8099
See merge request OpenMW/openmw!4336
2024-09-04 07:22:26 +00:00
psi29a
da0e2e7f57
Merge branch 'fix_warning' into 'master'
...
Fix clang warning: -Wunused-but-set-variable
See merge request OpenMW/openmw!4353
2024-09-03 16:13:12 +00:00
psi29a
89976a9424
Merge branch 'vfs_normalized_path_9' into 'master'
...
Use normalized path for models settings (#8138 )
See merge request OpenMW/openmw!4348
2024-09-02 07:26:53 +00:00
Mehdi Yousfi-Monod
767d7bfecd
fixed indent
2024-09-01 15:36:53 +02:00
Mehdi Yousfi-Monod
cb2a8c74dd
FEAT: Expose starter spells
2024-09-01 15:26:58 +02:00
elsid
262b31cf08
Fix clang warning: -Wunused-but-set-variable
...
apps/openmw/mwmechanics/spellcasting.cpp:45:13: warning: variable 'index' set but not used [-Wunused-but-set-variable]
45 | int index = -1;
| ^
2024-09-01 15:04:18 +02:00
elsid
9e36b3fc0b
Use normalized path for models settings
2024-08-30 20:50:59 +02:00
elsid
e01861140e
Add tests for MWWorld::Ptr
2024-08-30 20:46:56 +02:00
elsid
1cdbbef7ee
Use blank CellRef as default
...
Default constructed CellRef has some fields uninitialized.
2024-08-30 20:46:56 +02:00
elsid
d998faec1b
Deregister only registered LiveCellRefBase
2024-08-30 20:46:56 +02:00
elsid
4565152b3d
Define LiveCellRefBase functions inside MWWorld namespace block
2024-08-30 20:46:56 +02:00
elsid
ca8869042b
Move LiveCellRef where possible
2024-08-30 20:46:55 +02:00
Andrei Kortunov
b620b9b239
Do not make redundant copies
2024-08-30 17:27:40 +04:00
psi29a
f456978cc3
Merge branch 'blueshift' into 'master'
...
Launcher: Support extended selection for directories
See merge request OpenMW/openmw!4346
2024-08-30 10:23:08 +00:00
Alexei Kotov
176dec45a7
Make light attenuation fade optional
...
This also makes Force Per Pixel Lighting caption shorter to provide more space for the new button
2024-08-30 10:03:37 +03:00
Alexei Kotov
073e4639bf
Launcher: Support extended selection for directories
2024-08-29 04:18:07 +03:00
Alexei Kotov
f393c40cbd
Launcher: Fix Insert Above behavior when the directory is added automatically
2024-08-29 03:54:26 +03:00
Evil Eye
5711a395af
Merge branch 'bolt-is-not-a-static' into 'master'
...
[Lua] rename boltStatic to bolt in magic effect record bindings.
See merge request OpenMW/openmw!4342
2024-08-27 15:57:32 +00:00
psi29a
24a0e42594
Merge branch 'fargothsayshello' into 'master'
...
Don't turn to face the player to say hello if there is no hello response
Closes #8132
See merge request OpenMW/openmw!4339
2024-08-27 15:38:25 +00:00
Mads Buvik Sandvei
f7f282fc48
bolt is not a static
2024-08-26 13:28:29 +02:00
Dave Corley
daf82d40b9
FIX(CSVRender::Object): Clamp scale edits in render window too
2024-08-25 10:23:04 -07:00
Evil Eye
1f5c314022
Don't turn to face the player to say hello if there is no hello response
2024-08-25 11:48:14 +02:00
psi29a
50465a3cf2
Merge branch 'alternatingrowcolors' into 'master'
...
Launcher: Alternate row colors in directory and archive list
See merge request OpenMW/openmw!4338
2024-08-25 07:42:43 +00:00
Evil Eye
032d506aa7
Fix components_tests
2024-08-24 09:10:23 +02:00
Evil Eye
4529af9b7f
Fix the tests
2024-08-23 22:40:39 +02: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
Alexei Kotov
3a9e6de6fd
Alternate row colors in directory and archive list
2024-08-23 14:28:26 +03:00
Alexei Kotov
951c440c8b
Don't apply normal weapon resistance twice for NPCs ( #8124 )
2024-08-23 13:41:14 +03:00
Evil Eye
c9783344a0
Wrap all memory allocating Lua functions in protected calls
2024-08-22 22:22:28 +02:00