Andrei Kortunov
9e1ab590f1
Cleanup fonts loading
2022-08-21 13:19:04 +04:00
psi29a
4078f19c74
Merge branch 'SHADER_HOT_RELOAD' into 'master'
...
Shaders: Hot reload, togglable by lua debug command
See merge request OpenMW/openmw!2238
2022-08-21 09:08:27 +00:00
elsid
e1bed86d7e
Do single navigator update per frame
...
Primarily for crossing cell border case. Each Navigator::update call has a cost.
Doing it multiple times per frame increased frame duration on cell loading.
Call Navigator::wait only when cell has changed but do not use
Scene::hasCellChanged because it doesn't always indicates it.
2022-08-20 19:15:55 +02:00
AnyOldName3
17c1053777
Validate near and far clip distances
2022-08-20 16:14:22 +01:00
Mads Buvik Sandvei
5863790c74
Show a message if player attempts to access postprocessor hud when postprocessing is disabled
2022-08-20 16:33:33 +02:00
Mads Buvik Sandvei
642d0ad631
ActionManager::toggleMainMenu() should close PostProcessor HUD.
2022-08-20 16:32:48 +02:00
elsid
226f12528b
Remove redundant .cpp file
2022-08-19 22:06:59 +02:00
elsid
2a79a8074a
Use forward declarations
2022-08-19 22:05:15 +02:00
elsid
73f885db0e
Cleanup includes
2022-08-19 22:05:15 +02:00
elsid
b3882777ab
Cleanup opencs includes
2022-08-19 19:25:03 +02:00
elsid
bf1f4f2117
Mark private template functions defined in cpp as inline
2022-08-19 19:17:21 +02:00
psi29a
ab2931223e
Merge branch 'cleanup_openmw_includes_2' into 'master'
...
Cleanup openmw class and mechanics includes
See merge request OpenMW/openmw!2301
2022-08-19 14:53:00 +00:00
Kindi
da4a72ab19
Sun Damage for QuasiExt
2022-08-19 14:51:52 +00:00
elsid
a66c095ec3
Cleanup openmw class and mechanics includes
2022-08-19 15:46:39 +02:00
psi29a
9761ff14f9
Merge branch 'cleanup_openmw_lua_includes' into 'master'
...
Cleanup openmw lua includes
See merge request OpenMW/openmw!2293
2022-08-19 13:34:07 +00:00
psi29a
7bb1856b74
Merge branch 'font_fixes' into 'master'
...
Font fixes
See merge request OpenMW/openmw!2297
2022-08-18 12:53:37 +00:00
Andrei Kortunov
2cd2b42e33
Improve handling of larger font size
2022-08-18 13:29:12 +04:00
Andrei Kortunov
c3d3f3140b
Allow to change font settings in the launcher
2022-08-18 13:29:12 +04:00
Alexei Kotov
d458894868
Make getWeaponDrawn return 1 only when the weapon is attached (bug #4816 )
2022-08-18 05:04:51 +03:00
elsid
552301c8fb
Cleanup openmw lua includes
2022-08-17 23:47:30 +02:00
psi29a
92f3b4ba82
Merge branch 'windows_save' into 'master'
...
[Postprocessing] Mitigate clashes with live reload and external saves on windows
See merge request OpenMW/openmw!2237
2022-08-17 21:19:14 +00:00
psi29a
1e4dd46688
Merge branch 'fontconfig' into 'master'
...
Allow users to decide if they need to import bitmap fonts
See merge request OpenMW/openmw!2270
2022-08-17 21:16:31 +00:00
psi29a
bf40f9b287
Merge branch 'name_view' into 'master'
...
Make Class::getName return string_view
See merge request OpenMW/openmw!2289
2022-08-17 20:14:27 +00:00
psi29a
4f6c97fa10
Merge branch 'cleanup_openmw_includes' into 'master'
...
Cleanup openmw render, physics, world, dialogue, gui, input includes
See merge request OpenMW/openmw!2291
2022-08-17 20:08:43 +00:00
Andrei Kortunov
43f552f48f
Allow users to decide if they need to import bitmap fonts
2022-08-17 22:12:15 +04:00
Alexei Kotov
aee8150d65
Autoresize table subview columns (bug #6939 )
...
Use the contents of the first 500 records, clamp the width to [100, 300]
2022-08-17 19:58:39 +03:00
elsid
5498c169e3
Cleanup openmw render, physics, world, dialogue, gui, input includes
2022-08-17 18:45:52 +02:00
Andrew Dunn
a61237f265
Cleaned up macOS FFmpeg framework linking
...
I'm not sure why but CoreMedia, VideoToolbox, and AudioToolbox aren't
being found by find_library, so I've converted framework imports to a
standard link option. I really don't think this will be an issue given
that this change will only ever apply to Apple platforms.
2022-08-18 00:22:46 +10:00
psi29a
5b9acd0bb9
Merge branch 'esmstore-fixes' into 'master'
...
Some ESMStore fixes
See merge request OpenMW/openmw!2279
2022-08-17 14:10:54 +00:00
Andrew Dunn
808a2e587a
Merge commit '5ee4ce1232b0f334f29dd702f811c58dccf5c00d' into apple-silicon-arm-build
2022-08-17 23:45:51 +10:00
psi29a
6346ffca72
Merge branch 'cleanup_components_includes' into 'master'
...
Cleanup components includes
See merge request OpenMW/openmw!2287
2022-08-17 07:50:02 +00:00
Evil Eye
4ff12d8945
Make Class::getName return string_view
2022-08-16 21:15:03 +02:00
elsid
274afbc7a0
Add missing include
2022-08-16 20:06:25 +02:00
elsid
cc8c7002ea
Cleanup components includes
2022-08-16 19:14:04 +02:00
Andrew Dunn
1d7d3d5765
Get build working on Apple Silicon
...
Will validate issues with Intel OSX later
2022-08-17 02:18:48 +10:00
psi29a
b382e92953
Merge branch 'please_dont_copy_my_nfts' into 'master'
...
Prevent various values from being copied
See merge request OpenMW/openmw!2267
2022-08-16 08:36:34 +00:00
psi29a
1f25f430d6
Merge branch 'swimhack' into 'master'
...
Remove 0.43.0 death animation backward compatibility hack (#5977 )
Closes #5977
See merge request OpenMW/openmw!2274
2022-08-16 07:40:13 +00:00
psi29a
1d270e1683
Merge branch 'levelincrease' into 'master'
...
Update both instances of level detail text
See merge request OpenMW/openmw!2282
2022-08-16 07:17:04 +00:00
psi29a
823b8ebc22
Merge branch 'cleanup_detournavigator_includes' into 'master'
...
Cleanup detournavigator includes
See merge request OpenMW/openmw!2281
2022-08-16 07:16:01 +00:00
Alexei Kotov
a4427235df
Update both instances of level detail text
2022-08-16 01:43:28 +03:00
Alexei Kotov
1ce162a95c
Correct follow animation attack strength dependence
2022-08-15 22:08:59 +03:00
elsid
b1fb42a28c
Cleanup detournavigator includes
2022-08-15 19:46:10 +02:00
ζeh Matt
cdcf1393fc
Fix increment of dynamic id when player is inserted
2022-08-15 17:06:01 +03:00
ζeh Matt
6abb96250f
Fix using the wrong id for insertStatic
2022-08-15 17:04:37 +03:00
psi29a
6756f4397e
Merge branch 'aidisplay' into 'master'
...
Fix display for some package settings
See merge request OpenMW/openmw!2271
2022-08-15 12:32:30 +00:00
Alexei Kotov
c857346f7b
Remove 0.43.0 death animation backward compatibility hack ( #5977 )
2022-08-15 14:58:01 +03:00
psi29a
be947bfcf6
Merge branch 'hackercenturions' into 'master'
...
Override non-biped follow animation by movement
See merge request OpenMW/openmw!2276
2022-08-15 07:58:28 +00:00
Alexei Kotov
6b07acbbae
Override non-biped follow animation by movement
2022-08-15 04:14:57 +03:00
Alexei Kotov
ff5a042f5b
Remove cooldown for ranged back up (bug #5129 )
2022-08-15 03:51:16 +03:00
Alexei Kotov
e537f2b6f3
Fix display for some package settings
2022-08-14 19:51:43 +03:00
Evil Eye
eaa108d25d
Return string_view from SoundId methods
2022-08-14 14:39:58 +02:00
Evil Eye
4e9335f10a
Fix include
2022-08-13 11:15:12 +02:00
Alexei Kotov
7f3d2c18e1
Evaluate melee hits on weapon release (bug #5057 )
2022-08-13 01:15:42 +03:00
Alexei Kotov
6c05192afa
Fix swish sound volume and pitch (bug #5057 )
2022-08-13 01:15:41 +03:00
Evil Eye
2deec591cd
Use heterogenous maps for scripts
2022-08-12 20:56:50 +02:00
Evil Eye
51938f9ef7
Use string_view in Interpreter::Context
2022-08-12 19:42:35 +02:00
Evil Eye
4eb6c48285
Avoid copying in InputManager
2022-08-12 18:42:12 +02:00
florent.teppe
decfbc5387
Fix threading issues
2022-08-12 18:37:19 +02:00
psi29a
8e7ddc7c0d
Merge branch 'attackattackattack' into 'master'
...
Character controller, round 8: rewrite attack animation logic (bug #4127 )
Closes #4127
See merge request OpenMW/openmw!2263
2022-08-12 15:17:51 +00:00
Evil Eye
685906afdf
Make getScript return string_view
2022-08-11 22:51:55 +02:00
Alexei Kotov
3e34d5e9f2
Rewrite attack animation logic (bug #4127 )
2022-08-11 15:55:26 +03:00
psi29a
18dbf722eb
Merge branch 'store_view' into 'master'
...
Allow string_view lookups in MWWorld::Store
See merge request OpenMW/openmw!2010
2022-08-10 22:29:18 +00:00
elsid
bd91ced754
Move weapon types definition to .cpp file
...
Use template and switch instead of std::map to make sure all types are handled
and there is no lookup for a default value.
2022-08-10 20:41:04 +02:00
Alexei Kotov
bd7ddada7b
Cancel stagger when random attack animations end
2022-08-10 12:59:41 +03:00
Alexei Kotov
af12736baf
Cancel stagger and attack animations simultaneously
2022-08-10 12:53:32 +03:00
psi29a
10ee0e6e1b
Merge branch 'sheerheartattackhasnoweaknesses' into 'master'
...
Animation regression fixes
See merge request OpenMW/openmw!2255
2022-08-10 07:55:01 +00:00
psi29a
b551e69b6f
#5534 remove OSG 3.4 support and require at least 3.6.5 support
2022-08-09 21:07:28 +00:00
Alexei Kotov
083fda357b
Fix creature attack swish pitch and invisibility break
2022-08-09 23:03:53 +03:00
Evil Eye
de51525c76
Allow string_view lookups in MWWorld::Store and get some use out of that
2022-08-09 20:43:14 +02:00
psi29a
bb9884c024
Merge branch 'split_stringops' into 'master'
...
Split components/misc/stringops.hpp into multiple headers
See merge request OpenMW/openmw!2233
2022-08-09 18:06:40 +00:00
Alexei Kotov
c4881c8613
Move weapon equip sound logic to weapon equip animation logic
2022-08-09 15:46:24 +03:00
Alexei Kotov
9f39f6d48e
Streamline attack body pitching
2022-08-09 14:53:02 +03:00
Alexei Kotov
2b167317da
Clean up updateWeaponState inventory block
2022-08-09 14:34:49 +03:00
Alexei Kotov
1b3baa812a
Streamline hit/follow animation key construction
2022-08-09 14:34:49 +03:00
Alexei Kotov
2e112847be
Further updateWeaponState cleanup
2022-08-09 14:10:46 +03:00
Alexei Kotov
ea78e904a9
Merge inventory blocks in updateWeaponState
2022-08-09 14:00:16 +03:00
florent teppe
baadc06e98
Merge branch 'master' into 'SHADER_HOT_RELOAD'
...
# Conflicts:
# apps/openmw/mwrender/postprocessor.hpp
2022-08-09 09:26:55 +00:00
Alexei Kotov
ad62f5cda3
Move werewolf/ranged weapon swish logic to playSwishSound
2022-08-08 22:22:34 +03:00
Alexei Kotov
09141388ad
Detangle attack start, knockdown attack cancel and on-going wind-up logic
2022-08-08 22:22:34 +03:00
Alexei Kotov
8f280c521c
Play pick/probe animation in attack start animation logic
2022-08-08 22:22:32 +03:00
Alexei Kotov
a4b5bfc051
Don't cancel the attack prematurely after running out of ammo
2022-08-08 22:19:51 +03:00
Alexei Kotov
d280a29b18
Re-enable lower body crossbow animation playback
2022-08-08 20:45:29 +03:00
Alexei Kotov
ac892f2bfd
Clean up updateWeaponState()
2022-08-08 20:45:29 +03:00
Alexei Kotov
e5ef9f1464
Improve upper body character state naming
2022-08-08 19:46:46 +03:00
psi29a
69654b6697
Merge branch 'revert_active' into 'master'
...
Revert traversal mode to default
See merge request OpenMW/openmw!2249
2022-08-07 16:23:19 +00:00
psi29a
6ee20835fc
Merge branch 'main_pp' into 'master'
...
[Postprocessing] Remove default shader and simplify pipeline
Closes #6920
See merge request OpenMW/openmw!2248
2022-08-07 14:50:08 +00:00
cody glassman
ac4b29be08
cleanup default shaders and remove confusing main shader
2022-08-07 06:42:48 -07:00
psi29a
e75d3285cf
Merge branch 'paged_refs_vector' into 'master'
...
Use std::vector to store paged ref nums
See merge request OpenMW/openmw!2245
2022-08-07 13:35:54 +00:00
florent.teppe
df69fc7659
Post processing shaders now use the same lua commands, no more launcher option to enable live reload
2022-08-07 00:19:19 +02:00
cody glassman
c770c462e4
revert traversal nodes, discovered to break some NIFs with UV controllers
2022-08-06 11:39:23 -07:00
Alexei Kotov
0fd817150e
Merge branch 'ordinator_farming_restored' into 'master'
...
Save state for disposed actors if they can respawn
Closes #6923
See merge request OpenMW/openmw!2232
2022-08-06 11:03:06 +00:00
Alexei Kotov
263a955290
Merge branch 'coverity' into 'master'
...
Avoid possible null dereference
See merge request OpenMW/openmw!2243
2022-08-06 10:53:38 +00:00
Andrei Kortunov
7dd668bf12
Allow mouse scrolling in the race preview widget (feature 6925)
2022-08-06 11:25:27 +04:00
elsid
dffb12ac05
Use std::vector to store paged ref nums
2022-08-06 02:11:58 +02:00
Andrei Kortunov
8812705838
Avoid possible null dereference - throw an exception instead
2022-08-05 20:26:27 +04:00
Alexei Kotov
86a4d530c4
Merge branch 'luaprofiler' into 'master'
...
Implementing profiler stats for LuaManager::synchronizedUpdate
See merge request OpenMW/openmw!2215
2022-08-05 16:19:57 +00:00
Christian Haro
19a08d19d6
Implementing profiler stats for LuaManager::synchronizedUpdate
2022-08-05 16:19:57 +00:00
psi29a
00f8c9760a
Merge branch 'fixed_string_tests' into 'master'
...
Replace deprecated std::is_pod
See merge request OpenMW/openmw!2239
2022-08-04 09:55:51 +00:00
psi29a
b55a511ad8
Merge branch 'idlechance' into 'master'
...
Fix Wander random idle chance
See merge request OpenMW/openmw!2242
2022-08-04 09:55:05 +00:00
psi29a
9c4ca98421
Merge branch 'sheathing' into 'master'
...
Avoid cosmetic view-mode dependent issues in shield sheathing
Closes #6845
See merge request OpenMW/openmw!2241
2022-08-04 09:54:43 +00:00
