1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 15:39:51 +00:00

837 Commits

Author SHA1 Message Date
Mads Buvik Sandvei
f4cc16e469 feedback 2023-11-30 21:46:00 +01:00
Mads Buvik Sandvei
b7a4cb0c83 The anim queue should still update when underwater. CharState_SpecialIdle should be retained until the animation queue is done. 2023-11-30 21:45:59 +01:00
Mads Buvik Sandvei
acf6178ea5 movement = movementFromAnimation; also when speed is 0. 2023-11-05 16:46:11 +01:00
Mads Buvik Sandvei
e86a4ebafe Fixes based on comments by capo 2023-11-04 21:01:06 +01:00
Mads Buvik Sandvei
9ebec27daf use const. 2023-11-04 16:18:36 +01:00
Mads Buvik Sandvei
c7c3a52e6a Clang 2023-11-04 14:41:08 +01:00
Mads Buvik Sandvei
475bb1af65 Move calculating the animation direction into its own function to help simplify update(). Eliminate a pointless epsilon. 2023-11-04 14:34:41 +01:00
Mads Buvik Sandvei
1edc82062d Account for strafing when draw state is not nothing, and "turn to movement direction" is true 2023-11-04 14:13:02 +01:00
Mads Buvik Sandvei
68fe1361f1 Attempt at clarifying the code 2023-11-04 14:00:13 +01:00
Mads Buvik Sandvei
452f7a470e fabsf -> abs 2023-11-01 23:19:13 +01:00
Mads Buvik Sandvei
a0f8bbc621 Bad merge 2023-11-01 20:34:39 +01:00
Mads Buvik Sandvei
f41de6b02d Use accumulated movement whenever possible. Apply diagonal movement by rotating accumulated movement and sliding based on that, rather than ignoring accumulated movement. 2023-11-01 20:31:57 +01:00
Mads Buvik Sandvei
58e3fdac36 Clang format 2023-10-29 16:32:35 +01:00
Mads Buvik Sandvei
85f104fefe Comments from Capo 2023-10-29 15:33:07 +01:00
Mads Buvik Sandvei
70f41b22b6 Based on the reason for closing !1845, we *should* let a scripted animation get stuck forever if the animation was already playing. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
cf5b782c76 More persist -> script language. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
426f5952a5 Prevent movement only when *scripted* animations are playing. Otherwise idle animations of wandering NPCs will slide. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
a9ade184d8 mLoopCount is the number of *remaining* loops. So we should be checking for >0, not >1. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
92a5e52407 rename "persisted" animations to "scripted", because that is what they actually are. And begin teaching the animation system to distinguish between a scripted and an unscripted animation. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
24890a729b clang'd 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
8792e76f5d explicitly prevent movement whenever playing scripted animations 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
cdb325f19a Rewrite CharacterController::updateAnimQueue() to properly maintain the animation queue and clean up finished animations. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
e893767ed0 Redundant line 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
45a2b8042d Derive the value of MovementAnimationControlled instead of storing it. 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
dcf6a1fc3c Refresh mMovementAnimationControlled when refreshing idle animations. 2023-10-22 17:22:50 +02:00
Alexei Kotov
79bda2e694 Avoid redundant animation resets in updateIdleStormState 2023-10-04 22:26:52 +03:00
Alexei Dobrohotov
9723912ee0 Evaluate the attack early for non-biped attacks with no hit key (#7524) 2023-08-11 01:27:55 +03:00
elsid
b4868c6094
Filter evade directions by supported animations
To avoid trying those which will not lead to any actor movement due to absent
animation.
2023-07-22 17:30:40 +02:00
elsid
6e8dcc16c6
Use settings values for Game settings 2023-07-01 00:59:35 +02:00
Mads Buvik Sandvei
410e8b100a Elsid comments 2023-05-23 19:30:29 +02:00
Evil Eye
9728024978 Replace compare with more idiomatic methods 2023-05-22 19:51:27 +02:00
Petr Mikheev
e53f907a53 Set CharacterController::mSmoothedSpeed to zero after teleporting. 2023-05-13 15:26:39 +02:00
Elias Howell
bf8fafa79a fixed some typos and spelling errors 2023-05-09 20:07:08 -04:00
elsid
0601d7213e
Remove ESM::RefId::sEmpty
This variable is only required to return empty RefId as const reference. There
is no point in doing so for a type cheap to copy.
2023-04-26 21:15:16 +02:00
Shi Han
a90e3b8c3b Move from std::atoi to std::from_char 2023-03-18 09:30:48 +00:00
Alexei Kotov
0f7822fff8 Unequip the weapon only after finishing the attack (bug #4610) 2023-02-11 09:00:20 +03:00
Alexei Kotov
fa7991fcb3 For hit state, cancel non-biped idle if there is an active animation 2023-01-07 22:35:29 +03:00
Alexei Kotov
152bdb2f65 Prevent missing KO animations from cancelling KO 2023-01-07 22:21:56 +03:00
Petr Mikheev
1869aeae5c Move some of player controls logic from C++ to Lua 2022-12-28 22:04:19 +01:00
florent.teppe
1ef1de974d script blacklist => RefId
Applies changes from review

Fixed clang format

Clang format + review.
2022-12-27 19:16:21 +01:00
florent.teppe
42e45723b7 Fixes issue in MW script compilation that would silently produce the wrong bytecode
Fixes issue when fetching MyGui values that were stored as RefId but fetched as String

Removed some uncessary copies, fixed issues with lowercase and uneeded changes
2022-12-27 19:15:57 +01:00
florent.teppe
65cdd489fb create a specific esm reader function for RefID to avoid allocation for string and then again for RefId
Fixed some types

removed useless header

applied clang format

fixed compile tests

fixed clang tidy, and closer to logic before this MR

Removed hardcoded refids

unless there is a returned value we don't use static RefIds
can use == between RefId and hardcoded string

Fix clang format

Fixed a few instances where std::string was used, when only const std::string& was needed

removed unused variable
2022-12-27 19:15:57 +01:00
fteppe
09d461a8cd fixed Topic selected event
Fix rebase
2022-12-27 19:15:56 +01:00
fteppe
7da38113be Changed more hardcoded RefId to be static to avoid multiple runtime creations
adresses multiple review comments
2022-12-27 19:15:56 +01:00
fteppe
b57dd6d083 Fixed search random, it is a prefix so not a refId
Fixed situation where we return a const reference to a static variable that may change if the same function is called multiple times
2022-12-27 19:15:55 +01:00
fteppe
125b21de20 Initial commit: In ESM structures, replace the string members that are RefIds to other records, to a new strong type
The strong type is actually just a string underneath, but this will help in the future to have a distinction so it's easier to search and replace when we use an integer ID

Slowly going through all the changes to make, still hundreds of errors

a lot of functions/structures use std::string or stringview to designate an ID. So it takes time

Continues slowly replacing ids. There are technically more and more compilation errors

I have good hope that there is a point where the amount of errors will dramatically go down as all the main functions use the ESM::RefId type

Continue moving forward, changes to the stores

slowly moving along

Starting to see the fruit of those changes.

still many many error, but more and more Irun into a situation where a function is sandwiched between two functions that use the RefId type.

More replacements. Things are starting to get easier

I can see more and more often the issue is that the function is awaiting a RefId, but is given a string
there is less need to go down functions and to fix a long list of them.

Still moving forward, and for the first time error count is going down!

Good pace, not sure about topics though, mId and mName are actually the same thing and are used interchangeably

Cells are back to using string for the name, haven't fixed everything yet. Many other changes

Under the bar of 400 compilation errors.

more good progress <100 compile errors!

More progress

Game settings store can use string for find, it was a bit absurd how every use of it required to create refId from string

some more progress on other fronts

Mostly game settings clean

one error opened a lot of other errors. Down to 18, but more will prbably appear

only link errors left??

Fixed link errors

OpenMW compiles, and launches, with some issues, but still!
2022-12-27 19:15:54 +01:00
psi29a
3ca17e5183 Merge branch 'landofwindandshade' into 'master'
Handle landing in the frame the jump is over (bug #5849)

Closes #5849

See merge request OpenMW/openmw!2499
2022-11-08 08:25:31 +00:00
Alexei Kotov
1db9247c45 Restart player block animation during blocking if necessary 2022-11-07 22:09:56 +03:00
Alexei Kotov
180963488f Play shield hit sound when the hit is blocked (bug #6645) 2022-11-07 22:02:30 +03:00
Alexei Kotov
9b8399c353 Handle landing in the frame the jump is over (bug #5849) 2022-11-07 19:06:01 +03:00