Skip to content
Snippets Groups Projects

Falling rocks fix

Merged Monster Iestyn requested to merge falling-rocks-fix into next

This fixes the rock spawners' rocks not being removed if they rolled down to the ground from a slope rather than bouncing (see https://mb.srb2.org/showthread.php?t=41963)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Monster Iestyn Added 1 new commit:

    Added 1 new commit:

    • 9a2b7b20 - Better plan, use ?: for deciding between floorz/ceiling checks based on gravity
  • Contributor

    :thumbsup: always love me a good ternary

  • Alam Ed Arias Added 36 new commits:

    Added 36 new commits:

    • f9b41898 - Don't allow skipping stats in record attack/nights attack
    • 9b737d11 - Merge branch 'record-attack-custom-exit-fix' into 'next'
    • 0f014fe2 - Merge branch 'master' into next
    • cb98c2d9 - Merge branch 'master' into next
    • 8f4f8c6e - Merge branch 'master' into next
    • 3212ee0b - Fix endless loop of R_DrawRepeatMaskedColumn if both sprtopscreen and sprbotscre…
    • 66a45c65 - Merge branch 'td-render-fix' into 'master'
    • 72bd3e28 - Fix sprtopscreen from getting integer overflows once and for all in R_DrawRepeatMaskedColumn
    • 823aa7d2 - Merge branch 'td-render-fix2' into 'master'
    • dc249c6c - D_ModifierKeyResponder now checks for ev_console as a "key down" event
    • 591fe13c - Merge branch 'dedicated-console-fix' into 'master'
    • b0f4bbb4 - Played TD's Stormy Streets enough to know precipitation sprites didn't get an ov…
    • 5019077f - Merge branch 'precip-overflow-fix' into 'master'
    • 2823c7bf - build: fixup warnings from GCC 6.2.1
    • b22417bc - appveyor: buildbot now using GCC 6.3, not 5.3
    • e0b2a4a7 - build: add suport for GCC 6.3
    • b01d5da6 - build: fixup GCC54 endif
    • 42ecca81 - build: disable tautological-compare and logical-op
    • 81fe4621 - build: do not overwrite the -Wno-error switchs
    • 6bb7a636 - appveyor: output commands passed to GCCwq
    • 9cac1e9e - build: fixup WFALGS/WFLAGS mistake
    • 4e8972cd - build: no warning or error about logical-ip or tautological-compare
    • 538eac7a - appveyor: disable command output
    • b29193aa - CircleCI: first try
    • 59d91e07 - build: r_bsp.c:213:23: warning: inlining failed in call to 'R_DoorClosed': call …
    • c5d15ad5 - CircleCI: force -Wno-unsuffixed-float-constants
    • ade354c2 - CircleCI: error on warnings
    • aaaab40f - CircleCI: cache APT and ccache
    • c85c277a - CircleCI: move GCC49 check to debian's env
    • 99b2c888 - README: add CircleCI's Status badge
    • ac75267e - CircleCI: build on Ubuntu as well
    • 29c19b62 - CircleCi: Ubuntu docker image is broken
    • 03ecb0d1 - CircleCI: add upx
    • 52a79754 - CircleCI: keep build cache with checksum of depend.dep
    • 2d68cb77 - Merge branch 'master' into next
    • 0ffc0f19 - Merge branch 'next' into falling-rocks-fix
  • Contributor

    +1

  • Monster Iestyn Status changed to merged

    Status changed to merged

  • Monster Iestyn mentioned in commit e03577d9

    mentioned in commit e03577d9

  • Please register or sign in to reply
    Loading