Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
SRB2
SRB2
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 265
    • Issues 265
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 73
    • Merge Requests 73
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !1331

Merged
Opened Dec 14, 2020 by katsy@katsy 
  • Report abuse
Report abuse

Add new skin flag SF_NOSHIELDABILITY

This adds the skin flag SF_NOSHIELDABILITY, an easy way of disabling shield abilities for custom characters. The main difference between this flag and just returning true in ShieldSpecial is that this prevents target arrows from appearing with the attraction shield.

Also allows ShieldSpecial to access the whirlwind emergency jump so it's less of a pain to override that by itself.

attract

  • Discussion 9
  • Commits 7
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lachlan Wright @Lach commented Dec 14, 2020
    Master

    Based idea. You have merge conflicts though! D:

    Based idea. You have merge conflicts though! D:
  • katsy @katsy

    added 133 commits

    • 4521827e...760e083c - 132 commits from branch STJr:next
    • 721170f5 - lol

    Compare with previous version

    Dec 14, 2020

    added 133 commits

    • 4521827e...760e083c - 132 commits from branch STJr:next
    • 721170f5 - lol

    Compare with previous version

    added 133 commits <ul><li>4521827e...760e083c - 132 commits from branch <code>STJr:next</code></li><li>721170f5 - lol</li></ul> [Compare with previous version](https://git.do.srb2.org/STJr/SRB2/merge_requests/1331/diffs?diff_id=6954&start_sha=4521827e2c2b101db0ba3c8ddd114fd8a1b18bc7)
    Toggle commit list
  • katsy @katsy commented Dec 14, 2020

    love when a blank line causes a merge conflict

    fixed now

    love when a blank line causes a merge conflict fixed now
  • James R. @james

    added Feature label

    Dec 14, 2020

    added Feature label

    added ~104 label
    Toggle commit list
  • SteelT @SteelTitanium commented Dec 14, 2020
    Owner

    A GETFLAG macro for the new skin flag needs to be added, at around https://git.do.srb2.org/STJr/SRB2/blob/next/src/r_skins.c#L496

    Otherwise it would be impossible to set it using noshieldability = 1 for example

    A GETFLAG macro for the new skin flag needs to be added, at around https://git.do.srb2.org/STJr/SRB2/blob/next/src/r_skins.c#L496 Otherwise it would be impossible to set it using noshieldability = 1 for example
  • Zolton Auburn @Zippy_Zolton commented Dec 14, 2020

    What's the limit on the amount of character flags we could have, if there's one?

    What's the limit on the amount of character flags we could have, if there's one?
  • James R. @james commented Dec 14, 2020
    Owner

    Since it is a 32-bit number, 12 left after this merged.

    Since it is a 32-bit number, 12 left after this merged.
  • Zolton Auburn @Zippy_Zolton commented Dec 14, 2020

    could we eventually make it 64-bit if we bloat it enough?? 🍭

    could we eventually make it 64-bit if we bloat it enough?? :lollipop:
  • James R. @james commented Dec 14, 2020
    Owner

    :VVv

    :VVv
  • katsy @katsy

    added 1 commit

    • d999e436 - GETFLAG

    Compare with previous version

    Dec 15, 2020

    added 1 commit

    • d999e436 - GETFLAG

    Compare with previous version

    added 1 commit <ul><li>d999e436 - GETFLAG</li></ul> [Compare with previous version](https://git.do.srb2.org/STJr/SRB2/merge_requests/1331/diffs?diff_id=6966&start_sha=721170f5a039abd2c787f10bbc99e588adb349da)
    Toggle commit list
  • katsy @katsy commented Dec 15, 2020

    added the getflag macro @SteelTitanium mentioned

    added the getflag macro @SteelTitanium mentioned
  • Zolton Auburn @Zippy_Zolton commented Dec 15, 2020

    oh yeah, I had an idea for a character flag yesterday.. gotta wait for this to get merged then i guess :)

    oh yeah, I had an idea for a character flag yesterday.. gotta wait for this to get merged then i guess :)
  • James R. @james

    merged

    Dec 16, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit 84e9020e

    Dec 16, 2020

    mentioned in commit 84e9020e

    mentioned in commit 84e9020eedfbefffd991d3bd6ff7adcce8a6d88f
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
Feature
Assign labels
  • View project labels
Reference: STJr/SRB2!1331
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.