Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0009522: reset jetpack and choking states upon animation - and the other way around #229

Merged
merged 2 commits into from Jul 20, 2018

Conversation

Projects
4 participants
@patrikjuvonen
Copy link
Member

patrikjuvonen commented Jul 8, 2018

Mantis Bug Tracker issue

9522

Summary

  • Fixes many bugs related to animations, jetpack and choking;
  • Pretty small and simple fix, easy to test.

Tests

Note, that tests 1 and 2 on either category will not function as expected for Ped elements (in either case, choking/jetpack will stay on). You should use yourself or another Player element for testing. Cause for this behavior is this if statement. Changing it now would make it backwards incompatible. In my opinion this should have been unified for both elements in the first place.

Jetpack


Test 1

  1. Give ped a jetpack.
  2. Set their position to something with warp enabled.
  3. Expectation: jetpack should be removed.

Test 2

  1. Give ped a jetpack.
  2. Set their position to something with warp disabled.
  3. Expectation: jetpack should not be removed.

Test 3

  1. Give ped a jetpack.
  2. Freeze them.
  3. Expectation: jetpack should not be removed.

Test 4

  1. Give ped a jetpack.
  2. Set their animation.
  3. Expectation: jetpack should be removed.

Test 5

  1. Give ped a jetpack.
  2. Set their animation.
  3. Give them a jetpack.
  4. Expectation: they should now be on a jetpack.

Test 6

  1. Give ped a jetpack.
  2. Set their animation.
  3. Give them a jetpack.
  4. Remove their jetpack.
  5. Set their model to something else.
  6. Expectation: they should not be doing the animation you set them in step 2.

Test 7

  1. Give ped a jetpack.
  2. Set them choking.
  3. Expectation: jetpack should be removed.

Test 8

  1. Give ped a jetpack.
  2. Set them choking.
  3. Give them a jetpack.
  4. Expectation: they should now be on a jetpack.

Choking


Test 1

  1. Choke a ped.
  2. Set their position to something with warp enabled.
  3. Expectation: they should no longer be choking.

Test 2

  1. Choke a ped.
  2. Set their position to something with warp disabled.
  3. Expectation: they should be choking.

Test 3

  1. Choke a ped.
  2. Freeze them.
  3. Expectation: they should be choking.

Test 4

  1. Choke a ped.
  2. Set their animation.
  3. Expectation: they should no longer be choking.

Test 5

  1. Choke a ped.
  2. Set their animation.
  3. Set them choking.
  4. Expectation: they should be choking.

Test 6

  1. Choke a ped.
  2. Set their animation.
  3. Set them choking.
  4. Remove their jetpack.
  5. Set their model to something else.
  6. Expectation: they should not be doing the animation you set them in step 2.

patrikjuvonen added some commits Jul 8, 2018

@saml1er

This comment has been minimized.

Copy link
Member

saml1er commented Jul 13, 2018

We need to observe the latest fix for animations, if there are no more crashes, this PR can be merged. For now it's better to wait for a couple of days.

@qaisjp qaisjp removed the review required label Jul 14, 2018

@qaisjp

This comment has been minimized.

Copy link
Member

qaisjp commented Jul 16, 2018

@saml1er is this safe to merge now? how are animation crashes?

@saml1er saml1er merged commit 0425ad2 into multitheftauto:master Jul 20, 2018

3 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@patrikjuvonen patrikjuvonen deleted the patrikjuvonen:issue-9522 branch Jul 22, 2018

@patrikjuvonen patrikjuvonen added this to In progress in release/v1.5.6 via automation Aug 7, 2018

@patrikjuvonen patrikjuvonen added this to the 1.5.6 milestone Aug 7, 2018

@patrikjuvonen patrikjuvonen moved this from In progress to Done in release/v1.5.6 Aug 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.