Commit Graph

29761 Commits (874ff8828821c9227f6a715d1e9fc259200be1ae)
 

Author SHA1 Message Date
psi29a 7496217986 Merge branch 'block' into 'master'
Blocking animation and sound fixes (bug #6645)

Closes #6645

See merge request OpenMW/openmw!2500
2 years ago
Andrei Kortunov 13c304a995 Update used static Recast library to avoid warnings with GCC 2 years ago
Alexei Kotov 1db9247c45 Restart player block animation during blocking if necessary 2 years ago
Alexei Kotov 180963488f Play shield hit sound when the hit is blocked (bug #6645) 2 years ago
Alexei Kotov 9b8399c353 Handle landing in the frame the jump is over (bug #5849) 2 years ago
psi29a a2053a625e Merge branch 'esm_four_cc' into 'master'
Move fourCC to a separate file

See merge request OpenMW/openmw!2491
2 years ago
psi29a 523fabe1e8 Merge branch 'fix_settings_reloadlua' into 'master'
Clear storage of setting groups on reloadlua

See merge request OpenMW/openmw!2497
2 years ago
psi29a c2b495a187 Merge branch 'fix_7056' into 'master'
Add missing content=builtin.omwscripts if openmw is started via openmw-cs

Closes #7056

See merge request OpenMW/openmw!2496
2 years ago
uramer 1789160057 Clear storage of setting groups on reloadlua 2 years ago
elsid baa39c06bb
Move fourCC to a separate file 2 years ago
Petr Mikheev 6025943fed Add missing content=builtin.omwscripts if openmw is started via openmw-cs (fixes #7056) 2 years ago
Max Henzerling 897cdc62d8 Add snap to reference 2 years ago
Evil Eye f61083d02c Replace switch statements 2 years ago
psi29a 084396f29e Merge branch 'fix_7005' into 'master'
Fix Lua settings UI not working after a save (#7005)

See merge request OpenMW/openmw!2495
2 years ago
Petr Mikheev 589d7e821d Fix Lua settings UI not working after a save (#7005) 2 years ago
Evil Eye 29a46b0fc0 Reimplement --script-all-dialogue to be more useful to modders 2 years ago
psi29a 6960fc9304 Merge branch 'opencs_iwyu' into 'master'
Run IWYU on the opencs

See merge request OpenMW/openmw!2481
2 years ago
psi29a fd176d6faf Merge branch 'shutup_no_one_cares' into 'master'
Ignore 0 attributes on dead NPCs

See merge request OpenMW/openmw!2490
2 years ago
psi29a 824f3b8c19 Merge branch 'time_stamp' into 'master'
Support negative days in TimeStamp (#6981)

Closes #6981

See merge request OpenMW/openmw!2492
2 years ago
elsid 013f56088b
Support negative days in TimeStamp
As vanilla engine does.
2 years ago
Evil Eye 45cd5bdbd7 Ignore 0 attributes on dead NPCs 2 years ago
psi29a 45e673564f Merge branch 'flying_position' into 'master'
Only force adjust the player and NPCs teleported out of the active grid

See merge request OpenMW/openmw!2488
2 years ago
jvoisin 1a326294c0 Run IWYU on the opencs 2 years ago
Evil Eye 4a48156378 Only force adjust the player and NPCs teleported out of the active grid 2 years ago
psi29a fe67deda9b Merge branch 'less_annoying_bound' into 'master'
Allow bound effects to be recast if they're attached to a recastable effect

See merge request OpenMW/openmw!2486
2 years ago
Evil Eye 5448338b21 Allow bound effects to be recast if they're attached to a recastable effect 2 years ago
psi29a 2091a81e1b Merge branch 'off_by_one' into 'master'
Fix error reporting line numbers

See merge request OpenMW/openmw!2483
2 years ago
glassmancody.info 87c0a6e6dc fix line numbers being off by one for each jump block 2 years ago
Petr Mikheev 4f5443118e Merge branch 'fix_coroutine_crash' into 'master'
Fix coroutine-related crashes

Closes #6996

See merge request OpenMW/openmw!2447
2 years ago
uramer a2fa1fe0a5 Execute async callbacks on the main Lua stack 2 years ago
uramer 8108fa0724 Merge branch 'fix_7039' into 'master'
Fix #7039: freeze after throwing an error in a queued Lua callback

Closes #7039

See merge request OpenMW/openmw!2469
2 years ago
uramer b13a4f6b01 Lua coroutine crash tests 2 years ago
Evil Eye 48726eedaa Mark constant methods const 2 years ago
Evil Eye a207b5e419 Prevent potentially returning garbage flags 2 years ago
Evil Eye c8a594d9d2 Don't use potentially invalid cache entry 2 years ago
psi29a bc1e0d3522 Merge branch 'grayscale_dialogue' into 'master'
Fix dialogue issues

Closes #6419 and #7047

See merge request OpenMW/openmw!2478
2 years ago
psi29a d2077b5624 Merge branch 'Who-needs-PR-anyway' into 'master'
Finally get rid of the dreaded PR changelog.

See merge request OpenMW/openmw!2472
2 years ago
psi29a 48232bfece Merge branch 'consecutiveseriouspunches' into 'master'
Don't process unexpected hit text keys (bug #7042)

Closes #7042

See merge request OpenMW/openmw!2473
2 years ago
psi29a fdf1577918 Merge branch 'lua_records' into 'master'
Lua Armor, Static and Light record bindings

See merge request OpenMW/openmw!2341
2 years ago
psi29a e7e371eb14 Merge branch 'unbreak_focal' into 'master'
add some memory

See merge request OpenMW/openmw!2479
2 years ago
psi29a da9cbbce8f add some memory 2 years ago
Evil Eye a24e9e4c0a Mark constant methods const 2 years ago
Evil Eye 81f138cea0 Prevent potentially returning garbage flags 2 years ago
Evil Eye 1c17260d87 Don't use potentially invalid cache entry 2 years ago
psi29a 1924a3a694 Merge branch 'floatingpointtypefish' into 'master'
Only prevent initially dead actors from floating up (bug #4204)

Closes #4204

See merge request OpenMW/openmw!2476
2 years ago
Alexei Kotov ece7a98e03 Only prevent initially dead actors from floating up (bug #4204) 2 years ago
psi29a a227bab1ae Merge branch 'fix-macos-build-without-refactoring-a-bunch-of-unrelated-files' into 'master'
Fix MacOS build better

See merge request OpenMW/openmw!2474
2 years ago
AnyOldName3 15c51dcbbc Restore false-positive unused includes
They're needed on MacOS as SDL_opengl_gletx.h doesn't define them there.

They don't actually work on MacOS, so long-term, the code that uses
these defines should be changed to use #ifdef to check they're available
before using them.
2 years ago
Alexei Kotov eadade9dfc Don't process unexpected hit text keys (bug #7042) 2 years ago
AnyOldName3 77de37b1ed Revert "Merge branch 'fix_macos_build' into 'master'"
As well as fixing the MacOS build, it meddled with a bunch of files that
already did the right thing.

This reverts commit 8162541a14, reversing
changes made to e16c451d08.
2 years ago