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
  • !1060

Merged
Opened Jul 12, 2020 by Kays Ishaq@kays 
  • Report abuse
Report abuse

Various color fixes

  • help color in the console now only shows accessible colors as possible values - previously, it showed inaccessible colors including super colors and about 1000 blank freeslots.
  • Bugged setting of skincolor.accessible in Lua is fixed.
  • Invalid invcolors are accounted for in SOC and Lua custom skincolor definitions. This fixes a sigsegv that can be caused by haphazard scripting.
    • SOC will fall back on SKINCOLOR_GREEN, while Lua returns an error.
  • Duplicate names bring up a warning in SOC and Lua custom skincolor definitions.
    • SOC will attempt to rename the new skincolor, while Lua simply prints a warning in the console.
    • Empty string names aren't checked for duplicates, as they may be used for situations where the name doesn't matter (e.g., a skincolor not intended for player use)
  • R_GetColorByName and R_GetSuperColorByName both return SKINCOLOR_NONE rather than SKINCOLOR_GREEN/SKINCOLOR_SUPERGOLD1 if no color is found.
    • Usecase is for scripters to quickly check if a color name is already taken
    • The relevant S_SKIN parsing for PREFCOLOR, PREFOPPOSITECOLOR, and SUPERCOLOR account for this change and fall back on the defaults.
    • R_GetSuperColorByName is also exposed to Lua.
  • Other minor changes to Lua custom skincolor setting. The warning for a name with spaces exists for both setting by table and setting by field (previously only existed setting by field). In addition, it isn't checked until after the name's potential truncation, which may remove the offending spaces anyways. A redundant check to prevent standard skincolors from having accessible changed was removed (standard skincolors are already read-only to Lua).
Edited Jul 12, 2020 by Kays Ishaq
  • Discussion 2
  • Commits 6
  • Changes 6
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kays Ishaq @kays

    changed the description

    Jul 12, 2020

    changed the description

    changed the description
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • a734129e - lua_isboolean -> lua_toboolean

    Compare with previous version

    Jul 12, 2020

    added 1 commit

    • a734129e - lua_isboolean -> lua_toboolean

    Compare with previous version

    added 1 commit <ul><li>a734129e - lua_isboolean -&gt; lua_toboolean</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1060/diffs?diff_id=5936&start_sha=74cfeaff30a16b3ad44cbff2b13f3b4d3f293843)
    Toggle commit list
  • Kays Ishaq @kays

    changed the description

    Jul 12, 2020

    changed the description

    changed the description
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • 6e4b1458 - Update lua_infolib.c

    Compare with previous version

    Jul 12, 2020

    added 1 commit

    • 6e4b1458 - Update lua_infolib.c

    Compare with previous version

    added 1 commit <ul><li>6e4b1458 - Update lua_infolib.c</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1060/diffs?diff_id=5937&start_sha=a734129eaedb74d9dafdf018acb3a25541f800b0)
    Toggle commit list
  • Kays Ishaq @kays

    added 1 commit

    • a73f468e - Don't check empty string for duplicate name

    Compare with previous version

    Jul 12, 2020

    added 1 commit

    • a73f468e - Don't check empty string for duplicate name

    Compare with previous version

    added 1 commit <ul><li>a73f468e - Don&#39;t check empty string for duplicate name</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1060/diffs?diff_id=5938&start_sha=6e4b14588c5ccc6e98cdd9e179b369a5a546fed8)
    Toggle commit list
  • Kays Ishaq @kays

    changed the description

    Jul 12, 2020

    changed the description

    changed the description
    Toggle commit list
  • katsy @katsy commented Jul 12, 2020

    As someone who just made a color-related script, I am very grateful for these changes. I ran into at least half of the issues you fixed here, including having to make a rather silly check for a SKINCOLOR_GREEN result without an input of 41 or green.

    As someone who just made a color-related script, I am very grateful for these changes. I ran into at least half of the issues you fixed here, including having to make a rather silly check for a SKINCOLOR_GREEN result without an input of 41 or green.
  • James R.
    @james started a discussion on an old version of the diff Jul 12, 2020
    Resolved by Kays Ishaq Jul 12, 2020
    src/dehacked.c
    Unable to load the diff.
    • James R. @james commented Jul 12, 2020
      Owner

      This will generate a compiler warning. Declarations should follow { and other declarations.

      Edited Jul 12, 2020
      This will generate a compiler warning. Declarations should follow `{` and other declarations.
    • Kays Ishaq @kays

      changed this line in version 5 of the diff

      Jul 12, 2020

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1060/diffs?diff_id=5950&start_sha=a73f468ea4856358380da253c16d9791291a8a13#ab99c878dc5c86c717ad906544d9e19a3b61ec43_828_829)
      Toggle commit list
    Please register or sign in to reply
  • Kays Ishaq @kays

    added 1 commit

    • e849c989 - move dupenum declaration to beginning of block

    Compare with previous version

    Jul 12, 2020

    added 1 commit

    • e849c989 - move dupenum declaration to beginning of block

    Compare with previous version

    added 1 commit <ul><li>e849c989 - move dupenum declaration to beginning of block</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1060/diffs?diff_id=5950&start_sha=a73f468ea4856358380da253c16d9791291a8a13)
    Toggle commit list
  • Kays Ishaq @kays

    resolved all discussions

    Jul 12, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • SteelT @SteelTitanium

    changed milestone to 2.2.7

    Jul 13, 2020

    changed milestone to 2.2.7

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

    added Bugs label

    Jul 13, 2020

    added Bugs label

    added ~1 label
    Toggle commit list
  • SteelT @SteelTitanium

    added Enhancement label

    Jul 13, 2020

    added Enhancement label

    added ~8 label
    Toggle commit list
  • James R. @james

    merged

    Jul 13, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit 34bd0d9f

    Jul 13, 2020

    mentioned in commit 34bd0d9f

    mentioned in commit 34bd0d9fe78492e0634133fe080ac5a331359532
    Toggle commit list
  • Kays Ishaq @kays

    mentioned in merge request !1078 (merged)

    Jul 20, 2020

    mentioned in merge request !1078 (merged)

    mentioned in merge request !1078
    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
2
Labels
Bug Enhancement
Assign labels
  • View project labels
Reference: STJr/SRB2!1060
×

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.