florent.teppe
|
decfbc5387
|
Fix threading issues
|
2022-08-12 18:37:19 +02: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 |
|
psi29a
|
0a16d54865
|
Merge branch 'lockandload' into 'master'
Make the character controller less miserable, round 6: attack animations, round 1
See merge request OpenMW/openmw!2252
|
2022-08-08 21:16:53 +00:00 |
|
psi29a
|
611180a5d8
|
Merge branch 'ubb_fix' into 'master'
Remove excessive allocations in lightmanager
See merge request OpenMW/openmw!2251
|
2022-08-08 21:10:40 +00:00 |
|
glassmancody.info
|
c513ec7824
|
null check
|
2022-08-08 12:53:20 -07: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 |
|
glassmancody.info
|
2cea4f3172
|
stop excessive allocations with lightmanager callback
|
2022-08-07 17:04:03 -07:00 |
|
florent.teppe
|
603b30e117
|
Added some variable names to make it clearer what their function was
avoid having lost of ->first and ->second that aren't meaningfull
|
2022-08-07 22:56:32 +02: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 |
|
psi29a
|
6d7216adba
|
Merge branch 'coverity' into 'master'
Use ubuntu:20.04 docker image for Coverity
See merge request OpenMW/openmw!2244
|
2022-08-07 09:47:20 +00:00 |
|
florent.teppe
|
c71f3508df
|
changed overview.rst of post processing
|
2022-08-07 00:26:29 +02: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
|
bc1a6bfd72
|
Merge branch 'changelog' into 'master'
Cleanup 0.48 changelog
See merge request OpenMW/openmw!2247
|
2022-08-06 15:43:12 +00:00 |
|
Andrei Kortunov
|
af542a873f
|
Cleanup 0.48 changelog
|
2022-08-06 15:05:51 +04: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 |
|
Alexei Kotov
|
43db803938
|
Merge branch 'race_scroll' into 'master'
Allow mouse scrolling in the race preview widget
See merge request OpenMW/openmw!2246
|
2022-08-06 10:49:02 +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 |
|
elsid
|
a5a3ccd0d2
|
Use ubuntu:20.04 docker image for Coverity
|
2022-08-05 11:46:05 +02:00 |
|
florent.teppe
|
3ab0a99154
|
Hot reload done only once every 200 ms, no point in beeing faster
it may also help with bugs where the file is still locked and can't be opened
|
2022-08-04 13:37:12 +02:00 |
|
florent.teppe
|
15751c57a0
|
Lua debug api doc
|
2022-08-04 13:36:24 +02:00 |
|
florent.teppe
|
cc9d436413
|
includes now work when the same shader has different defines
|
2022-08-04 13:00:32 +02:00 |
|
florent.teppe
|
7b78bf4b66
|
Fix files with different defines weren't added to the hot reload manager
|
2022-08-04 12:46:39 +02: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 |
|
psi29a
|
77b82add49
|
Merge branch 'google_test_fetch_content' into 'master'
Use FetchContent to get googletest
See merge request OpenMW/openmw!2240
|
2022-08-04 09:53:52 +00:00 |
|
florent.teppe
|
a1c8dc9d45
|
C++17 compat ?
|
2022-08-04 09:50:02 +02:00 |
|
florent.teppe
|
cdd95f7889
|
replaced empty function body by default
|
2022-08-04 09:25:25 +02:00 |
|
florent.teppe
|
9a475b0c97
|
fixed blank lines and missing breaks
|
2022-08-04 09:19:41 +02:00 |
|
florent.teppe
|
b6d7293a12
|
Removed weird lines that I thought were necessary to please the compiler
|
2022-08-04 09:13:25 +02:00 |
|
florent.teppe
|
68d0698924
|
Fixed cyclical included check
|
2022-08-04 09:09:26 +02:00 |
|
Alexei Kotov
|
19dc4cda9b
|
Avoid cosmetic view-mode dependent issues in shield sheathing
|
2022-08-04 05:33:54 +03:00 |
|
elsid
|
8e4f6fc4e4
|
Use FetchContent to get googletest
|
2022-08-04 01:12:11 +02:00 |
|
florent.teppe
|
aa51d6de2a
|
Missing chrono include ?
|
2022-08-04 00:14:53 +02:00 |
|
florent.teppe
|
fc8838c7dd
|
Renamed lua binding, and use action to avoid concurrency issue
|
2022-08-03 23:05:35 +02:00 |
|