elsid
8b8e4f78b6
Support cylinder and rotating box collision shape types for actors
...
Cylinder collision shape should give the best consistency between physics
simulation and pathfinding. Rotating box is already used by some actors, so
add it to have the same collision shape type for all actors.
2022-07-30 14:28:21 +02:00
psi29a
a62b16df5d
Merge branch 'delevelled' into 'master'
...
Editor: Decouple levelled list table columns (bug #6705 )
Closes #6705
See merge request OpenMW/openmw!2209
2022-07-30 12:17:07 +00:00
psi29a
79cdc08253
Merge branch 'clean_despawn' into 'master'
...
Remove effects added by unloading cells
Closes #6914
See merge request OpenMW/openmw!2208
2022-07-30 10:09:36 +00:00
Alexei Kotov
0d18f76271
Editor: Decouple levelled list columns (bug #6705 )
2022-07-30 12:48:29 +03:00
Evil Eye
9fc5ced9c9
Remove effects added by unloading cells
2022-07-30 10:59:27 +02:00
psi29a
f2a2880998
Merge branch 'empty_scripts_revival' into 'master'
...
Bring back empty script message
See merge request OpenMW/openmw!2207
2022-07-30 08:07:24 +00:00
Cody Glassman
89e0de2314
Bring back empty script message
2022-07-30 08:07:24 +00:00
psi29a
5cd4dbd9a9
Merge branch 'unrestrictedfailure' into 'master'
...
Spellcasting timing fixes (bug #4227 )
Closes #4227
See merge request OpenMW/openmw!2201
2022-07-30 07:35:46 +00:00
psi29a
7361a1c6fd
Merge branch 'awareness' into 'master'
...
Fix invisibility handling in awareness checks
See merge request OpenMW/openmw!2203
2022-07-30 06:41:07 +00:00
psi29a
7abcb9b0a7
Merge branch 'positioncell' into 'master'
...
Snap down any actor teleported with Position/PositionCell (bug #6154 )
Closes #6154
See merge request OpenMW/openmw!2204
2022-07-30 06:40:38 +00:00
Alexei Kotov
1e7cbb88d2
Merge branch 'fix_initial_player_landing' into 'master'
...
Trace down player on initial cell loading after all cells are loaded (#6907 )
Closes #6907
See merge request OpenMW/openmw!2206
2022-07-29 23:45:10 +00:00
elsid
37b0ff596c
Trace down player on initial cell loading after all cells are loaded
2022-07-29 23:16:25 +02:00
Alexei Kotov
fede5c7c02
Fix invisibility handling in awareness checks
2022-07-29 18:54:14 +03:00
Alexei Kotov
435ddcfb6b
Snap down any actor teleported with Position/PositionCell (bug #6154 )
2022-07-29 18:51:49 +03:00
Alexei Kotov
8005d3ca25
Rename updateState back into updateWeaponState
2022-07-29 17:22:51 +03:00
Alexei Kotov
a914d7a9b0
Spellcasting timing fixes (bug #4227 )
...
Play spellcasting animation and VFX (but not hand VFX) if spellcasting failed due to insufficient magicka
Apply spellcasting fatigue loss when the spellcasting starts instead of when the spell is applied
2022-07-29 16:24:28 +03:00
psi29a
4f9bcfd3f5
Merge branch 'issue_6888' into 'master'
...
Implement Add switch for armor degradation fix. #6888
See merge request OpenMW/openmw!2184
2022-07-29 13:24:16 +00:00
Ivan Beloborodov
f960e30d01
Implement Add switch for armor degradation fix. #6888
2022-07-29 13:24:16 +00:00
Alexei Kotov
93eb470024
Break invisibility after stopping preparing the attack (bug #5976 )
2022-07-29 14:01:55 +03:00
psi29a
461fdcd11b
Merge branch 'mybodyisready' into 'master'
...
Delay any quick key use while the player isn't ready (bug #6054 )
Closes #6054
See merge request OpenMW/openmw!2198
2022-07-29 09:47:08 +00:00
psi29a
4ecfc0e9ac
Merge branch 'torchwood' into 'master'
...
Don't extinguish held light sources when they're hidden (bug #6910 )
Closes #6910
See merge request OpenMW/openmw!2194
2022-07-29 09:40:48 +00:00
psi29a
48c26117da
Merge branch 'stagger' into 'master'
...
Cancel stagger after weapon release animations (bug #6869 )
Closes #6869
See merge request OpenMW/openmw!2192
2022-07-29 09:40:22 +00:00
psi29a
3db753a30c
Merge branch 'invisibility' into 'master'
...
Don't headtrack or greet magically hidden actors (bug #5978 )
Closes #5978
See merge request OpenMW/openmw!2196
2022-07-29 09:38:54 +00:00
Alexei Kotov
55f34f4f0d
Delay any quick key use while the player isn't ready (bug #6054 )
2022-07-29 11:29:41 +03:00
Alexei Kotov
88bd3d559a
Don't headtrack or greet magically hidden actors (bug #5978 )
2022-07-29 10:47:50 +03:00
Alexei Kotov
94dfcdd062
Don't extinguish held light sources when they're hidden (bug #6910 )
2022-07-29 10:16:29 +03:00
Alexei Kotov
16e373f30e
Make enchanted item casting use accurate aiming for 1 frame (bug #6909 )
2022-07-28 19:10:53 +03:00
Alexei Kotov
a2c5161ac4
Cancel stagger animation when an attack ends (bug #6869 )
2022-07-28 18:42:38 +03:00
psi29a
c54822acf9
Merge branch 'locale_menu' into 'master'
...
Add a way to configure locale settings in-game
See merge request OpenMW/openmw!2179
2022-07-28 07:23:55 +00:00
Andrei Kortunov
351ce94f56
Make ComboBox usage consistent
2022-07-27 13:03:34 +04:00
Andrei Kortunov
4ac3c347ad
Add a None item for cases when there is no secondary localization
2022-07-27 13:03:34 +04:00
Andrei Kortunov
cf90581995
Set ComboBox value prior to interactive MessageBox
2022-07-27 13:03:34 +04:00
Andrei Kortunov
cb64f49ba1
Allow to configure locales via settings menu
2022-07-27 13:03:34 +04:00
Andrei Kortunov
8ff64ca176
Add a default way to store arrays in the settings.cfg
2022-07-27 13:03:34 +04:00
psi29a
f315afbcce
Merge branch 'character_string_view' into 'master'
...
Use string_view in the CharacterController
See merge request OpenMW/openmw!2189
2022-07-27 08:37:02 +00:00
psi29a
59f1bcc966
Merge branch 'quickerkeys' into 'master'
...
Allow activating quick keys menu in menus (bug #6898 )
Closes #6898
See merge request OpenMW/openmw!2178
2022-07-27 08:36:10 +00:00
Evil Eye
55134d1e31
Use string_view in the CharacterController
2022-07-26 17:23:00 +02:00
psi29a
26bd907b0b
Merge branch 'hdr_quick' into 'master'
...
Fix auto exposure
See merge request OpenMW/openmw!2174
2022-07-26 15:13:22 +00:00
Alexei Kotov
45a94bdf32
Merge branch 'no_hugs' into 'master'
...
Don't allow non-bipedal actors to use non-weapon animations while moving
Closes #6868
See merge request OpenMW/openmw!2153
2022-07-26 14:48:54 +00:00
psi29a
d43e85051f
Merge branch 'walkwhenyoucantride' into 'master'
...
Revert MR 2048
See merge request OpenMW/openmw!2175
2022-07-26 14:19:32 +00:00
psi29a
17a0063a7c
Merge branch 'async_delete_animation' into 'master'
...
Destruct animation asynchronously when unloading a cell
See merge request OpenMW/openmw!2177
2022-07-26 13:42:43 +00:00
psi29a
bbcf7809f0
Merge branch 'gui_cleanup' into 'master'
...
GUI cleanup
See merge request OpenMW/openmw!2169
2022-07-26 13:39:33 +00:00
psi29a
843728aadb
Merge branch 'breakingcharacter' into 'master'
...
Make the character controller less miserable, round 5: landing animation
See merge request OpenMW/openmw!2176
2022-07-26 07:44:42 +00:00
Alexei Kotov
f99bcd7ccf
Fix local map viewing distance lower bound
2022-07-26 00:00:42 +03:00
Alexei Kotov
ae4df2e038
Only close quick keys-related modals when the menu is closed
2022-07-25 18:55:23 +03:00
Alexei Kotov
80a2ef29ad
Allow activating quick keys menu in menus
2022-07-25 18:55:21 +03:00
psi29a
e2b245d3b7
Merge branch 'issue_6901' into 'master'
...
Fix Morrowind.exe soul gem usage discrepancy #6901
See merge request OpenMW/openmw!2181
2022-07-25 09:39:42 +00:00
psi29a
4e1b5f9761
Merge branch 'sky_fix' into 'master'
...
Fix sky blending when sky is toggled
See merge request OpenMW/openmw!2185
2022-07-25 08:52:30 +00:00
glassmancody.info
299735ba4d
fix sky rtt traversing sky when sky disabled
2022-07-24 19:35:37 -07:00
myrix
782cb7699d
use std::string, no unlocalized message, show soul gem id
2022-07-25 02:56:25 +03:00
myrix
3698d96b46
use ciCompareLen, move checks to Miscellaneous::use and ActionSoulgem
2022-07-25 01:47:10 +03:00
myrix
8817f802cb
message when using empty soul gems, using preferentially filled ones with equip command
2022-07-24 23:02:26 +03:00
elsid
0614b82452
Restore UnrefQueue to destruct animation asynchronously
2022-07-24 21:08:43 +02:00
elsid
1e7989c5e5
Remove animation objects from scene outside destructor
2022-07-24 21:08:27 +02:00
unknown
95a074b8aa
Shorten diff
2022-07-24 20:43:05 +02:00
Alexei Kotov
578b58ca14
Properly handle negative count RemoveItem (bug #6895 )
2022-07-24 20:15:44 +03:00
Alexei Kotov
510d1d76d7
Fix applying of falling damage
2022-07-24 19:08:54 +03:00
elsid
34fd8abf5f
Move Animation::getPtr definitions to header
2022-07-24 17:29:27 +02:00
elsid
1168895bf3
Remove redundant reset calls from destructor
2022-07-24 17:29:27 +02:00
Alexei Kotov
819101144d
Landing animation playback fixes
...
Cancel landing animation immediately after moving during the first frame of landing and due to turning animation
2022-07-24 17:24:17 +03:00
Alexei Kotov
bbb8a5e1cb
Revert MR 2048
2022-07-24 00:31:57 +03:00
glassmancody.info
fd4966f77a
temporary fix for auto exposure
2022-07-22 20:41:08 -07:00
psi29a
ad687c380a
Merge branch 'nif' into 'master'
...
Move NIF implementation to cpp files
Closes #6518
See merge request OpenMW/openmw!2170
2022-07-21 16:09:33 +00:00
Andrei Kortunov
c36c28e8f9
Move NIF implementation to cpp files
2022-07-21 15:54:52 +04:00
Petr Mikheev
643e33c11a
Merge branch 'lua_pathfinding_bindings' into 'master'
...
Add bindings for navigator utils functions (#6690 )
See merge request OpenMW/openmw!2128
2022-07-20 23:52:16 +00:00
elsid
27cc901e76
Add bindings for navigator utils functions
2022-07-21 00:04:26 +02:00
elsid
a281bcaf90
Remove redundant Platform::initialize function
2022-07-20 22:49:44 +02:00
Andrei Kortunov
de58c9dff3
Get rid of obsolete osg::Geode where it is possible
2022-07-20 15:28:56 +04:00
psi29a
3b75ae7ff1
Merge branch 'terrain-include-cleanup' into 'master'
...
Cleanup includes in Terrain component
See merge request OpenMW/openmw!2157
2022-07-19 14:42:43 +00:00
psi29a
8da463926e
Merge branch 'warnfix' into 'master'
...
Follow-up for MR 2112
See merge request OpenMW/openmw!2162
2022-07-18 20:57:56 +00:00
Andrei Kortunov
4e7fe5a8bd
Set VFS only once
2022-07-18 23:37:41 +04:00
elsid
c197896765
Use unique_ptr for Wizard::InstallationPage members
2022-07-18 20:29:37 +02:00
psi29a
40cab76de5
Merge branch 'fonts' into 'master'
...
Enhance a way to setup fonts and layout files
See merge request OpenMW/openmw!2112
2022-07-18 17:36:31 +00:00
ζeh Matt
ddf43ec42f
Move structs into separate headers, cleanup includes, cleanup forwarders
2022-07-18 19:15:03 +03:00
Andrei Kortunov
845a812ebf
Drop fonts export - users are supposed to use TrueType fonts or mods with legacy format
2022-07-18 10:40:03 +04:00
Andrei Kortunov
5bc5c1bb0c
Use our fonts as a fallback
2022-07-18 09:57:20 +04:00
psi29a
79cc55b2a3
Merge branch 'rename-drawstate' into 'master'
...
Rename DrawState_ to DrawState and use enum class
See merge request OpenMW/openmw!2151
2022-07-17 20:24:50 +00:00
Evil Eye
4e65829cec
Don't allow non-bipedal actors to use non-weapon animations while moving
2022-07-17 21:47:50 +02:00
Andrei Kortunov
c47a48e25d
Inject layout files to VFS
2022-07-17 22:01:48 +04:00
Andrei Kortunov
2630bc21dd
Allow to override MyGUI layout
2022-07-17 22:01:48 +04:00
Andrei Kortunov
4ddba5142e
Introduce font mappings
2022-07-17 22:01:48 +04:00
Andrei Kortunov
dd04bfccfb
Load fonts
2022-07-17 22:01:48 +04:00
Evil Eye
3967509cdd
Use meaningful names instead of pretending we don't know what snow is
2022-07-17 19:54:59 +02:00
ζeh Matt
841fd9618f
Rename DrawState_ to DrawState and use enum class
2022-07-17 20:50:26 +03:00
elsid
c040da36de
Use std::unique_ptr to manage lifetime for InputManager members
2022-07-17 14:13:21 +02:00
elsid
6c8ed4d19c
Move Files::IStreamPtr alias to a separate header
...
To avoid transitive include of Windows.h all over the engine.
2022-07-17 11:35:39 +02:00
psi29a
06db2446b1
Merge branch 'cleanup_aistate' into 'master'
...
Cleanup MWMechanics::AiState
See merge request OpenMW/openmw!2141
2022-07-17 09:13:04 +00:00
psi29a
2a967725d4
Merge branch 'aisetting' into 'master'
...
Move AiSetting out of MWMechanics::CreatureStats
See merge request OpenMW/openmw!2140
2022-07-17 09:11:03 +00:00
elsid
b8937a493a
Avoid manual memory management for MWMechanics::DerivedClassStorage
2022-07-16 17:13:16 +02:00
elsid
d2b7253c7f
Use forward declarations instead of including aistate.hpp
2022-07-16 17:13:16 +02:00
elsid
f5c2e09df9
Move AiTemporaryBase to a separate header
2022-07-16 17:13:16 +02:00
elsid
e11fbc10b1
Remove unused member functions from MWMechanics::DerivedClassStorage
2022-07-16 17:13:16 +02:00
elsid
49f8445f87
Move AiSetting out of MWMechanics::CreatureStats
...
To replace creaturestats.hpp include in mwworld/class.hpp with forward
declaration reducing total size of preprocessed code.
2022-07-16 16:43:33 +02:00
elsid
9398e97600
Avoid manual memory management for VFS archives
2022-07-16 15:30:14 +02:00
Evil Eye
1a5a526b15
Remove unecessary casts and prevent nullptr dereference in getWalkSpeed
2022-07-13 21:17:11 +02:00
Evil Eye
ed921ad377
Fix modstat for negative numbers
2022-07-12 19:59:18 +02:00
elsid
22ed6d5c1e
Use unsigned to define number of threads
2022-07-12 15:19:52 +02:00
elsid
8c3c65fe9f
Use variant and optional to implement Maybe*Locks
...
To avoid calling lock and unlock on the mutex. User-defined destructor is no
more needed.
2022-07-12 15:19:52 +02:00
psi29a
bcaeb579c3
Merge branch 'modified_stats' into 'master'
...
Calculate the modified property based on cached values
See merge request OpenMW/openmw!2121
2022-07-12 13:03:54 +00:00
psi29a
0eb674ec84
Merge branch 'settings_fix' into 'master'
...
Refactor usage of settings storage in the launcher and editor
See merge request OpenMW/openmw!2123
2022-07-12 13:00:52 +00:00
psi29a
a8ec69045c
Merge branch 'coverity' into 'master'
...
Coverity fixes
See merge request OpenMW/openmw!2125
2022-07-12 12:59:00 +00:00
Andrei Kortunov
4b257e496e
Use static settings map for launcher and editor - the Settings::Manager has a static data anyway
2022-07-12 14:56:20 +04:00
Andrei Kortunov
a5b0ef0912
Avoid possible null dereference
2022-07-12 13:43:47 +04:00
Andrei Kortunov
42b9a6daaf
Do not use an invalid iterator
2022-07-12 12:45:11 +04:00
psi29a
54db3a97bb
Merge branch 'multiview-refactor' into 'master'
...
[Multiview] refactoring
See merge request OpenMW/openmw!2122
2022-07-12 08:44:43 +00:00
Petr Mikheev
9fbcc5df5e
Merge branch 'localization' into 'master'
...
Use Lua's YAML-based localization for MyGUI
See merge request OpenMW/openmw!2099
2022-07-12 08:13:33 +00:00
Andrei Kortunov
ccbb5e03fb
Use YAML files to translate MyGUI's localization tags
2022-07-12 08:20:40 +04:00
Mads Buvik Sandvei
b277fa48c7
Refactor multiview to avoid littering OSG_HAS_MULTIVIEW and multiview-related uniforms around the code, keep them all in multiview.cpp.
2022-07-11 17:27:05 +02:00
Evil Eye
011a822408
Calculate the modified property based on cached values
2022-07-11 16:40:06 +02:00
psi29a
aaaeed572a
Merge branch 'fix_6841' into 'master'
...
Treat empty `RootCollisionNode` in NIF as NC flag and generate VisualOnly collision shape
Closes #6841
See merge request OpenMW/openmw!2084
2022-07-11 08:31:59 +00:00
Cody Glassman
24749b066c
Add sky blending to launcher
2022-07-11 00:26:22 +00:00
elsid
9cda505ef3
Add missing save for a setting in launcher
2022-07-10 22:48:25 +02:00
Petr Mikheev
8b8c304953
Treat empty RootCollisionNode in NIF as NCC flag and generate CameraOnly collision shape
2022-07-10 00:46:11 +02:00
psi29a
98f839982e
Merge branch 'refactor_actors' into 'master'
...
Refactor MWMechanics::Actors
See merge request OpenMW/openmw!2094
2022-07-07 17:56:09 +00:00
Evil Eye
e42d63f4a4
Don't try to start combat with oneself and don't tell the player what to do
2022-07-06 19:12:36 +02:00
psi29a
1ef8ca1f27
Merge branch 'fix_tidy_warnings' into 'master'
...
Fix several Clang-Tidy warnings
See merge request OpenMW/openmw!2107
2022-07-06 13:47:59 +00:00
elsid
520738277a
Support google benchmark v1.6.1
2022-07-06 15:06:59 +02:00
elsid
bd7f56ddb4
Don't rely on virtual dispatch in constructor
...
apps/openmw/mwrender/animation.cpp:1841:60: warning: Call to virtual method 'ObjectAnimation::canBeHarvested' during construction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
if (ptr.getRefData().getCustomData() != nullptr && canBeHarvested())
^~~~~~~~~~~~~~~~
apps/openmw/mwrender/bulletdebugdraw.cpp:33:5: warning: Call to virtual method 'DebugDrawer::setDebugMode' during construction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
setDebugMode(debugMode);
^~~~~~~~~~~~~~~~~~~~~~~
openmw/mwinput/controllermanager.cpp:63:17: warning: Call to virtual method 'ControllerManager::controllerAdded' during construction bypasses virtual dispatch [clang-analyzer-optin.cplusplus.VirtualCall]
controllerAdded(fakeDeviceID, evt);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2022-07-06 13:52:28 +02:00
elsid
4ecee2e167
Avoid using reserved identifier in the global namespace
...
apps/launcher/datafilespage.cpp:762:12: warning: declaration uses identifier '_reloadCellsMutex', which is reserved in the global namespace [bugprone-reserved-identifier]
std::mutex _reloadCellsMutex;
^~~~~~~~~~~~~~~~~
reloadCellsMutex
apps/openmw/mwgui/journalwindow.cpp:86:103: warning: declaration uses identifier '_sender', which is reserved in the global namespace [bugprone-reserved-identifier]
void adviseButtonClick (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender))
^~~~~~~
sender
apps/openmw/mwgui/journalwindow.cpp:92:100: warning: declaration uses identifier '_sender', which is reserved in the global namespace [bugprone-reserved-identifier]
void adviseKeyPress (char const * name, void (JournalWindowImpl::*Handler) (MyGUI::Widget* _sender, MyGUI::KeyCode key, MyGUI::Char character))
^~~~~~~
sender
2022-07-06 13:52:28 +02:00
elsid
7501597813
Do not use float as loop variable
...
apps/opencs/view/render/instanceselectionmode.cpp:294:9: warning: Variable 'i' with floating point type 'float' should not be used as a loop counter [clang-analyzer-security.FloatLoopCounter]
for (float i = 0.0; i <= resolution; i += 2)
^ ~ ~
2022-07-06 13:52:28 +02:00
elsid
f1ded70366
Remove redundant condition
...
apps/openmw/mwmechanics/character.cpp:500:14: warning: redundant condition 'isRealWeapon' [bugprone-redundant-branch-condition]
else if (isRealWeapon)
^~~~~~~~~~~~~~~~~
2022-07-06 13:52:25 +02:00
psi29a
95a6fa8d0c
DeathKnockOut when KnockOut...
2022-07-06 10:48:22 +00:00
psi29a
9ed4d17f8a
Merge branch 'hidden_marker' into 'master'
...
Use single implementation to check whether marker is hidden
See merge request OpenMW/openmw!2096
2022-07-06 07:30:56 +00:00
psi29a
cec707e994
No attack animation while blocking fix
2022-07-05 18:29:21 +00:00
psi29a
715b8497f9
Merge branch 'live_cell_ref' into 'master'
...
Use descriptive names for range elements
See merge request OpenMW/openmw!2092
2022-07-05 18:26:40 +00:00
psi29a
7470f6971d
Merge branch 'TisIPickles27-test' into 'master'
...
[WIP] Maybe force dedicated GPU on dual-AMD machines
See merge request OpenMW/openmw!1214
2022-07-05 15:56:02 +00:00
Andrei Kortunov
38042fd7a2
Init missing variables
2022-07-05 17:47:52 +04:00
Andrei Kortunov
aed0da46a9
Check a result of dynamic_cast
2022-07-05 17:47:49 +04:00
jvoisin
f451b09f10
Merge branch 'rm_stream_include' into 'master'
...
Remove redundant ostream, istream, iostream and sstream includes
See merge request OpenMW/openmw!2097
2022-07-05 11:00:50 +00:00
psi29a
85a8359b36
Merge branch 'only_when_necassary' into 'master'
...
Conditional soft particles
See merge request OpenMW/openmw!2078
2022-07-05 10:14:32 +00:00
elsid
bef15edf0b
Remove redundant ostream, istream, iostream and sstream includes
...
* Replace by std::to_string and operator+ where possible.
* Move the code requiring to include <sstream> from .hpp to .cpp files.
2022-07-05 01:41:28 +02:00
elsid
20c15b30de
Move getLuaType out of MWWorld::PtrBase
...
This function is used only for Lua related code and don't need to be present
everywhere ptr.hpp is included.
2022-07-05 00:53:19 +02:00
elsid
4613840914
Use single implementation to check whether marker is hidden
2022-07-05 00:36:37 +02:00
elsid
c476437b6e
Mark Actors member functions as const where possible
2022-07-04 22:37:27 +02:00
elsid
ae4ec0a1d0
Convert static const to constexpr where possible
2022-07-04 22:16:38 +02:00
elsid
2ec757ab0f
Remove unnecessary member functions from Actors
2022-07-04 22:16:38 +02:00
elsid
0132b6e19c
Use range-based for loop
2022-07-04 22:16:37 +02:00
elsid
5e8df40718
Mark not changing variables as const
2022-07-04 22:16:37 +02:00
elsid
f8b8569f3b
Initialize variables on declaration
2022-07-04 21:38:26 +02:00
elsid
a05ed48a57
Move lua controls update into a separate function
2022-07-04 21:31:55 +02:00
elsid
03792eebdb
Reuse isPlayer variable instead of using operator !=
2022-07-04 21:26:44 +02:00
elsid
77eaf2082f
Move head tracking update into a separate function
2022-07-04 21:26:42 +02:00
elsid
fe206c1526
Remove updateHeadTracking from member functions
2022-07-04 21:17:07 +02:00
elsid
1b117af5e1
Use descriptive names for range elements
...
iter does not describe the nature of the object. Range-based for loop provides
elements of the iterator range, not iterators.
2022-07-04 21:03:45 +02:00
psi29a
c9264de22a
Merge branch 'warnfix' into 'master'
...
Suppress a GCC 11's format-overflow warning
See merge request OpenMW/openmw!2080
2022-07-04 12:08:31 +00:00
psi29a
bc3421642d
Merge branch 'light' into 'master'
...
Fix emissive in character preview
See merge request OpenMW/openmw!2088
2022-07-04 06:56:23 +00:00
psi29a
9da84480f0
Merge branch 'misc_ui' into 'master'
...
Improved settings window
Closes #6780
See merge request OpenMW/openmw!2087
2022-07-04 06:55:42 +00:00
glassmancody.info
9a0e9ac4fe
fix emissives in character preview
2022-07-03 18:46:22 -07:00
glassmancody.info
63d9fa55c6
settings window cleanup
2022-07-03 12:49:37 -07:00
jvoisin
498a835b77
Merge branch 'coverity' into 'master'
...
Fix some Coverity issues
See merge request OpenMW/openmw!2082
2022-07-03 16:29:05 +00:00
Andrei Kortunov
41a976b5f0
Suppress a GCC 11's format-overflow warning
2022-07-03 18:21:55 +04:00
Cody Glassman
051832d7ae
[Lua] Set simulation time scale
2022-07-03 12:51:28 +00:00
Andrei Kortunov
14b5674d32
Init missing data members
2022-07-03 15:44:50 +04:00
Andrei Kortunov
03cdffb555
Init some missing variables
2022-07-03 15:44:50 +04:00
Andrei Kortunov
1274a229d1
Remove pointless null check
2022-07-03 15:44:50 +04:00
Andrei Kortunov
e97172bbb2
Add a check for null
2022-07-03 15:44:50 +04:00
Andrei Kortunov
aa349f2ed9
Initialize some missing variables
2022-07-03 15:44:50 +04:00
Andrei Kortunov
62f5bedef5
Remove pointless check
2022-07-03 15:44:31 +04:00
glassmancody.info
a0265ffb89
only enable soft particles when enabled in settings
2022-07-02 09:42:15 -07:00
AnyOldName3
6609243c87
Merge branch 'dont_notice_me_launcher_senpai' into 'master'
...
Don't load content entries from global and local configs
Closes #6441
See merge request OpenMW/openmw!2068
2022-07-02 16:02:10 +00:00
Mads Buvik Sandvei
6dc727cf8f
More stereo-postprocessing integration
2022-07-02 15:26:35 +00:00
Evil Eye
478ad07607
Only load global cfg if local wasn't found
2022-07-02 11:19:36 +02:00
elsid
e074ebde96
Fix C4389 msvc warning
...
'==': signed/unsigned mismatch
2022-07-01 18:47:47 +02:00
elsid
2eae3227ba
Fix C4305 msvc warning
...
'argument': truncation from 'double' to 'float'
2022-07-01 18:47:46 +02:00
elsid
8544aa481c
Fix C4459 msvc warning
...
declaration of 'navMeshVersion' hides global declaration
2022-07-01 18:47:40 +02:00
elsid
7e6c13630a
Use target_precompile_headers for the most expensive headers
2022-07-01 14:05:17 +00:00
Evil Eye
c081b8cfa9
Don't load content entries from global and local configs
2022-06-30 20:57:51 +02:00
psi29a
56187ad977
Merge branch 'soften_me_up_like_one_of_your_french_meshes' into 'master'
...
Allow soft particle effect on any NIF
See merge request OpenMW/openmw!2015
2022-06-30 13:46:22 +00:00
glassmancody.info
b09411d396
allow soft particles on meshes and add extra data extensions
2022-06-29 18:15:12 -07:00
psi29a
451cc6a07c
Merge branch 'correct_path' into 'master'
...
Use existing functions and objects to call correctMeshPath etc (#6837 )
Closes #6837
See merge request OpenMW/openmw!2063
2022-06-29 10:22:08 +00:00
psi29a
e861491127
Merge branch 'quickfix' into 'master'
...
Fix a couple typos
See merge request OpenMW/openmw!2052
2022-06-29 09:22:15 +00:00
elsid
ce263af393
Use existing functions and objects to call correctMeshPath etc
...
Remove WindowManager wrappers.
It's not safe to use WindowManager in all places and it's not required.
Environment stores resource system providing VFS required to call these
functions. In the case of ObjectPaging it's available from the member variable.
Also ObjectPaging::createChunk may access WindowManager when it's already
destructed when exiting the game because it's destructed before CellPreloader
finishes all background jobs. Engine::mResourceSystem is destructed after all
other systems so it's safe to use it.
2022-06-29 00:58:49 +02:00
AnyOldName3
066575821b
Merge branch 'fog_alpha' into 'master'
...
Several fixes related to sky blending
See merge request OpenMW/openmw!2046
2022-06-28 22:17:37 +00:00
psi29a
776cae4c95
Merge branch 'assert' into 'master'
...
Use string_view in Layout and remove dead code
See merge request OpenMW/openmw!2060
2022-06-27 20:02:20 +00:00
Petr Mikheev
d0deb37f5c
Fix several issues with sky blending
2022-06-27 21:51:41 +02:00
Evil Eye
81ec7e80bb
Use string_view in Layout and remove dead code
2022-06-27 19:13:17 +02:00
jvoisin
3403ea1d9e
Merge branch 'FixUBOnDoubleMove' into 'master'
...
Avoid double move when an area with same coordinates already exists
See merge request OpenMW/openmw!2059
2022-06-27 16:28:17 +00:00
psi29a
a814d11a39
Merge branch 'move_left_shift_to_cpp' into 'master'
...
Move std::ostream& operator<< to .cpp
See merge request OpenMW/openmw!2058
2022-06-27 09:24:01 +00:00
elsid
1a5932a669
Move std::ostream& operator<< to .cpp
2022-06-26 22:43:53 +02:00
elsid
ffd1bd30ef
Remove redundant includes from groundcoverstore.hpp
2022-06-26 22:28:10 +02:00
Cédric Mocquillon
cbf48b4382
Avoid double move when an area with same coordinates already exists
2022-06-26 21:45:42 +02:00
elsid
fdf6e58ea3
Split apps/openmw/mwmechanics/actorutil.hpp
2022-06-26 16:42:29 +02:00
glassmancody.info
54e2e74c2a
quickfix
2022-06-25 22:41:03 -07:00
elsid
10fbf170a2
Reduce number of includes for boost/program_options
2022-06-25 18:32:10 +02:00
Petr Mikheev
50b143b53f
Fast fix in cellbindings.cpp
2022-06-24 23:41:11 +00:00
Petr Mikheev
377c00261a
[Lua] Ability to distinguish normal interiors and quasi exteriors (like Mournhold).
2022-06-24 18:24:02 +02:00
psi29a
c3599ada2e
Merge branch 'imayhaverunoutofclevernifbranchnames' into 'master'
...
Clean up NIF record flags/modes
See merge request OpenMW/openmw!2047
2022-06-22 21:15:14 +00:00
Evil Eye
b79c42fa77
Exclude followers in combat with their leader
2022-06-22 16:37:03 +02:00
Evil Eye
cc081c3d2d
Don't add additional targets to allies that are already in combat
2022-06-22 16:36:58 +02:00
psi29a
ede09309a6
Merge branch 'groundcover_progress' into 'master'
...
Show groundcover loading progress
See merge request OpenMW/openmw!1978
2022-06-22 13:02:22 +00:00
psi29a
e50c1dbcb1
Merge branch 'slaughteredslaughterfish' into 'master'
...
Avoid assigning idle animations to non-actors (bug #5371 )
Closes #5371
See merge request OpenMW/openmw!2048
2022-06-22 12:38:15 +00:00
psi29a
e2ae381a6c
Merge branch 'lua_worker_join' into 'master'
...
Correctly terminate LuaWorker if the game is being terminated due to an unhanded exception.
See merge request OpenMW/openmw!2044
2022-06-22 12:35:21 +00:00
Alexei Kotov
fbb0004aae
Avoid assigning idle animations to non-actors (bug #5371 )
2022-06-22 03:53:39 +03:00
Alexei Kotov
e673f9fa76
Clean up NIF flags
2022-06-22 01:58:16 +03:00
Petr Mikheev
8123e41a75
Fix #6824
2022-06-21 21:11:15 +02:00
Petr Mikheev
241b414aa6
Correctly terminate LuaWorker if the game is being terminated due to an unhanded exception.
2022-06-21 20:56:19 +02:00
psi29a
1a478875f0
Merge branch 'navmesh_agent_bounds' into 'master'
...
Support different agent collision shape type for pathfinding
See merge request OpenMW/openmw!2030
2022-06-21 16:13:41 +00:00
psi29a
feef257584
Merge branch 'postprocessor-stereo' into 'master'
...
[Postprocessing] Stereo integration
See merge request OpenMW/openmw!1988
2022-06-21 15:55:06 +00:00
Mads Buvik Sandvei
b0e4c7e76a
[Postprocessing] Stereo integration
2022-06-21 15:55:06 +00:00
psi29a
a822044199
Merge branch 'riggeoosgaext' into 'master'
...
custom class for osgAnimation::RigGeometry, Collada animated deforming body parts
See merge request OpenMW/openmw!1682
2022-06-21 15:27:34 +00:00
Nelsson Huotari
334c6dde0b
custom class for osgAnimation::RigGeometry, Collada animated deforming body parts
2022-06-21 15:27:34 +00:00
elsid
1a12c453d6
Support different agent collision shape type for pathfinding
...
Actors may have different collision shapes. Currently there are axis-aligned
bounding boxes and rotating bounding boxes. With AABB it's required to use
bounding cylinder for navmesh agent to avoid providing paths where actor can't
pass. But for rotating bounding boxes cylinder with diameter equal to the front
face width should be used to not reduce of available paths. For example rats
have rotating bounding box as collision shape because of the difference between
front and side faces width.
* Add agent bounds to navmesh tile db cache key. This is required to distinguish
tiles for agents with different bounds.
* Increase navmesh version because navmesh tile db cache key and data has changed.
* Move navmesh version to the code to avoid misconfiguration by users.
* Fix all places where wrong half extents were used for pathfinding.
2022-06-21 12:57:32 +02:00
psi29a
15c7ed774c
Merge branch 'shaders_fog' into 'master'
...
Better fog
See merge request OpenMW/openmw!2006
2022-06-21 08:39:48 +00:00
psi29a
d2df89b013
Merge branch 'aitravelendtolerance' into 'master'
...
Give AITravel time to end if the actor is close to the destination (#6495 )
Closes #6495
See merge request OpenMW/openmw!2036
2022-06-21 07:31:37 +00:00
Petr Mikheev
3bf18c601c
Better fog
2022-06-21 02:21:20 +02:00
Bret Curtis
37a440a0ee
add one include back
2022-06-20 16:26:52 +02:00
psi29a
aeed99ca2c
Merge branch 'clean_qt_headers' into 'master'
...
Clean up Qt includes
See merge request OpenMW/openmw!2027
2022-06-20 14:05:33 +00:00
Petr Mikheev
e466a812d8
Merge branch 'lua_consume' into 'master'
...
Refactor consuming mechanics, improve Lua onConsume handler
See merge request OpenMW/openmw!1848
2022-06-20 12:12:50 +00:00
Alexei Kotov
bd6716d89d
Give AITravel time to end if the actor is close to the destination
2022-06-20 15:07:18 +03:00
Cody Glassman
66aa546e97
[Postprocessing] Small cleanup
2022-06-20 06:58:40 +00:00
Alexei Kotov
e5e6645575
Merge branch 'more_romantic_disable' into 'master'
...
Enable collision for postponed objects when any object is disabled
Closes #6648
See merge request OpenMW/openmw!2035
2022-06-19 21:42:30 +00:00
Evil Eye
aa2fab8db5
Enable collision for postponed objects when any object is disabled
2022-06-19 20:16:31 +02:00
Alexei Kotov
a8e409deef
Make launcher viewing distance setup more precise
2022-06-19 20:20:12 +03:00
uramer
36a1e18b6f
Increment Lua API revision
2022-06-19 17:31:53 +02:00
uramer
c1f8d7c20a
Make comment style consistently inconsistent
2022-06-19 17:31:18 +02:00
Alexei Kotov
3baf346200
Use numeric_limits for indefinite idle looping
2022-06-19 08:58:12 +03:00
uramer
3761e7b24e
Pass a 0-count object to onConsume instead of the record id
2022-06-18 11:13:54 +02:00
uramer
c3c48f21d7
Consolidate item consumption code
2022-06-18 11:13:54 +02:00
Alexei Kotov
183378e34a
Fix idle swim/sneak animation fallback again
2022-06-18 03:24:45 +03:00
jvoisin
8b9ed57348
Clean up Qt includes
2022-06-17 11:56:54 +02:00
jvoisin
5065e4e571
Merge branch '1234knockout' into 'master'
...
Avoid clearing the current weapon animation group if it's still going to be in use
See merge request OpenMW/openmw!2025
2022-06-17 09:53:13 +00:00
Alexei Kotov
0b38e165f7
Avoid clearing the current weapon animation group if it's still going to be in use
2022-06-17 09:53:13 +00:00
Alexei Kotov
a5d8286cf2
Reject models that don't have grass\ prefix from groundcover cache
2022-06-16 16:26:25 +03:00
psi29a
67e764a44a
Merge branch 'severecharacterdisorder' into 'master'
...
Make the character controller less miserable, round 4: juicy stuff (bug #5592 )
Closes #5592
See merge request OpenMW/openmw!2014
2022-06-15 11:42:17 +00:00
elsid
fdd84265b3
Use proper agent height and radius when render actor path
...
That are based on half extents used to find path over navmesh which is different
for interior and exterior cells.
Use common functions to get agent height and radius for actor path rendering and
navmesh generation.
2022-06-15 01:11:11 +02:00
Alexei Kotov
2b019864b7
Remove more legacy states
2022-06-14 13:47:16 +03:00
Alexei Kotov
30ef7ad81b
Properly cancel the landing animation during movement
2022-06-14 12:50:30 +03:00
Alexei Kotov
c2ac52c82a
Remove dead code
2022-06-14 12:50:30 +03:00
Alexei Kotov
61d382dc9f
Set the initial IdleState to CharState_None
2022-06-14 12:50:30 +03:00
Alexei Kotov
4ce08664e9
Fix swim spellcasting stance turning fallback
2022-06-14 12:50:30 +03:00
Alexei Kotov
5dfce6205a
Reset the idle animation after a movement animation ends
...
Fix non-biped actor idle reset
2022-06-14 12:50:30 +03:00
Alexei Kotov
1a646374b0
Always reset the idle animation after the landing animation ends
2022-06-14 12:50:30 +03:00
Alexei Kotov
69a1d8ac86
Restart idle instantly only after the hit state ends
2022-06-14 12:50:30 +03:00
Alexei Kotov
35db7b8319
Fix fallback for missing swim/sneak idle animations
2022-06-14 01:12:05 +03:00
Alexei Kotov
253de65d13
Fix knockout animation interruption/looping
2022-06-13 17:53:38 +03:00
Alexei Kotov
b8018024a6
Avoid passing weapon short group to refreshXAnims
2022-06-13 17:53:38 +03:00
Alexei Kotov
0a38c3ab78
Reset current animation states in a consistent way
2022-06-13 17:53:38 +03:00
Alexei Kotov
dd42a69ca5
Consolidate refreshIdleAnims
2022-06-13 17:53:38 +03:00
Alexei Kotov
2c3d385672
Consolidate refreshHitRecoilAnims
2022-06-13 17:53:38 +03:00
Alexei Kotov
a105ba14e4
Consolidate refreshJumpAnims
2022-06-13 12:59:18 +03:00
Alexei Kotov
ab46337c41
Rewrite handleTextKey using substring views
2022-06-13 12:28:12 +03:00
Alexei Kotov
9e6b7fed1a
Consolidate refreshMovementAnims()
2022-06-13 12:13:10 +03:00
psi29a
c8eb246198
Merge branch 'no_update_useless_ugly_nodes' into 'master'
...
Only update active children
See merge request OpenMW/openmw!2001
2022-06-12 18:47:56 +00:00
psi29a
eac1d8599a
Merge branch 'lua_record_paths' into 'master'
...
Correct VFS paths in Lua records
See merge request OpenMW/openmw!1853
2022-06-12 18:45:24 +00:00
psi29a
b7918282ad
Merge branch 'minor_simpl_sortfilteritemodel' into 'master'
...
Minor simplifications in sortfilteritemmodel.cpp
See merge request OpenMW/openmw!1975
2022-06-12 18:43:50 +00:00
psi29a
33c5b192c9
Merge branch 'crossovercharacter' into 'master'
...
Make the character controller less miserable, round 2: state mappings
See merge request OpenMW/openmw!2003
2022-06-12 18:37:13 +00:00
jvoisin
8d56e79877
Minor simplifications in sortfilteritemmodel.cpp
...
- Change an if-else-if-else… spaghetti into a switch-case
- Replace a linear search in a dynamically constructed
vector with a switch-case. Thanks elsid for the idea!
2022-06-12 18:00:43 +02:00
psi29a
bf8cc36645
Merge branch 'camera_settings' into 'master'
...
In-game camera settings
Closes #6715
See merge request OpenMW/openmw!1924
2022-06-12 12:47:11 +00:00
uramer
bf905fce4c
Don't use WindowManager outside of UI, correct paths for new record types
2022-06-12 13:07:50 +02:00
uramer
fd7965d77f
Use correctMeshPath instead of string constants
2022-06-12 11:30:29 +02:00
