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 74
    • Merge Requests 74
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !1078

Merged
Opened Jul 19, 2020 by James Hale@SwitchKaze 
  • Report abuse
Report abuse

Allow modification of built-in skincolors

Modification of built-in skincolors was considered problematic by a former developer, so it was removed during development of !960 (merged). Given that this person is no longer a member of STJr, it was suggested that I reintroduce this feature.

Additionally, minor changes were made:

  • The wording of an error was changed to make it more consistent with other errors.
  • Previously, an error would be shown only if the length of a skincolor ramp was less than expected. This has been changed so that the error displays when the length is greater than or less than expected.
Edited Jul 19, 2020 by James Hale
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.do.srb2.org/SwitchKaze/SRB2.git next-lc-uint16
git checkout -b SwitchKaze/SRB2-next-lc-uint16 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout next
git merge --no-ff SwitchKaze/SRB2-next-lc-uint16

Step 4. Push the result of the merge to GitLab

git push origin next

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 3
  • Commits 2
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • James Hale @SwitchKaze

    changed title from Allow built-in color modification to Allow modification of built-in skincolors

    Jul 19, 2020

    changed title from Allow built-in color modification to Allow modification of built-in skincolors

    changed title from **Allow {-built-in color modification-}** to **Allow {+modification of built-in skincolors+}**
    Toggle commit list
  • James Hale @SwitchKaze

    changed the description

    Jul 19, 2020

    changed the description

    changed the description
    Toggle commit list
  • SteelT @SteelTitanium

    changed milestone to 2.2.7

    Jul 19, 2020

    changed milestone to 2.2.7

    changed milestone to %8
    Toggle commit list
  • SteelT @SteelTitanium

    added Enhancement label

    Jul 19, 2020

    added Enhancement label

    added ~8 label
    Toggle commit list
  • Kays Ishaq @kays commented Jul 20, 2020

    Are there any concerns re: making standard skincolors inaccessible? If someone was hosting a server where SKINCOLOR_BLUE was inaccessible and someone tried to join while they had that color, would they get booted for an illegal netcmd? What happens if there are no accessible colors in the game? (Genuinely asking - I'm not sure on either of these)

    I removed some code from from lib_setskincolor that specifically prevents accessibility changes in !1060 (merged), since at the time you weren't able to modify standard skincolors anyways. If that needs to be reinstated, a similar check should be added for skincolor_set.

    Are there any concerns re: making standard skincolors inaccessible? If someone was hosting a server where SKINCOLOR_BLUE was inaccessible and someone tried to join while they had that color, would they get booted for an illegal netcmd? What happens if there are no accessible colors in the game? (Genuinely asking - I'm not sure on either of these) I removed some code from from `lib_setskincolor` that specifically prevents accessibility changes in !1060, since at the time you weren't able to modify standard skincolors anyways. If that needs to be reinstated, a similar check should be added for `skincolor_set`.
  • James Hale @SwitchKaze commented Jul 20, 2020

    You are correct Kays, the player would be kicked. I completely overlooked that. I'll make a commit that disables accessibility changes for standard skincolors shortly.

    Edited Jul 20, 2020 by James Hale
    You are correct Kays, the player would be kicked. I completely overlooked that. I'll make a commit that disables accessibility changes for standard skincolors shortly.
  • James Hale @SwitchKaze commented Jul 20, 2020

    My earlier assessment was incorrect; if a standard color isn't accessible, then the game searches for one that is. If none are accessible, then the game freezes. In any case, the solution remains as disabling accessibility changes for standard colors.

    My earlier assessment was incorrect; if a standard color isn't accessible, then the game searches for one that is. If none are accessible, then the game freezes. In any case, the solution remains as disabling accessibility changes for standard colors.
  • James Hale @SwitchKaze

    added 1 commit

    • 5332fff5 - Deny standard color accessibility changes

    Compare with previous version

    Jul 20, 2020

    added 1 commit

    • 5332fff5 - Deny standard color accessibility changes

    Compare with previous version

    added 1 commit <ul><li>5332fff5 - Deny standard color accessibility changes</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1078/diffs?diff_id=5997&start_sha=ee9c146b5dd957b5a05196ee4e87cceaa6459a50)
    Toggle commit list
  • James R. @james

    merged

    Jul 21, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit 735942a4

    Jul 21, 2020

    mentioned in commit 735942a4

    mentioned in commit 735942a437ea2d1fe131cfe12c2ed914ac100073
    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
2.2.7
Milestone
2.2.7
Assign milestone
Time tracking
1
Labels
Enhancement
Assign labels
  • View project labels
Reference: STJr/SRB2!1078
×

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.