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 246
    • Issues 246
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 71
    • Merge Requests 71
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !905

Merged
Opened Apr 30, 2020 by sphere@spherallic 
  • Report abuse
Report abuse

Act number tweaks

This merge request allows act numbers up to 99, instead of just up to 19, and removes the need for the outdated TTL10 to TTL19 graphics.

  • Discussion 1
  • Commits 3
  • Changes 10
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Monster Iestyn
    @MonsterIestyn started a discussion on an old version of the diff Apr 30, 2020
    Resolved by sphere Apr 30, 2020
    src/v_video.c
    Unable to load the diff.
    • Monster Iestyn @MonsterIestyn commented Apr 30, 2020
      Master

      SHORT() needs to be around ttlnum[num]->width here and a few lines below for big-endian compatibility (for those versions of SRB2 that are compiled for big-endian systems)

      Edited Apr 30, 2020
      `SHORT()` needs to be around `ttlnum[num]->width` here and a few lines below for big-endian compatibility (for those versions of SRB2 that are compiled for big-endian systems)
    • sphere @spherallic

      changed this line in version 2 of the diff

      Apr 30, 2020

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/905/diffs?diff_id=5218&start_sha=55ce2b4e4722962cee30ae5d5178ee15833d38a6#a0f9eee86c250965d74c16cfbcc66d703e28190f_3353_3353)
      Toggle commit list
    Please register or sign in to reply
  • sphere @spherallic

    added 1 commit

    • f364b85e - Restore SHORT().

    Compare with previous version

    Apr 30, 2020

    added 1 commit

    • f364b85e - Restore SHORT().

    Compare with previous version

    added 1 commit <ul><li>f364b85e - Restore SHORT().</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/905/diffs?diff_id=5218&start_sha=55ce2b4e4722962cee30ae5d5178ee15833d38a6)
    Toggle commit list
  • sphere @spherallic

    resolved all discussions

    Apr 30, 2020

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • sphere @spherallic

    added 120 commits

    • f364b85e...feced5ec - 117 commits from branch next
    • 69c11a82 - Support act numbers up to 99 and draw both digits individually.
    • 0287c695 - Fix some errors and add some comments. Also, actnum is not an INT32.
    • 4eb5f09c - Restore SHORT().

    Compare with previous version

    May 12, 2020

    added 120 commits

    • f364b85e...feced5ec - 117 commits from branch next
    • 69c11a82 - Support act numbers up to 99 and draw both digits individually.
    • 0287c695 - Fix some errors and add some comments. Also, actnum is not an INT32.
    • 4eb5f09c - Restore SHORT().

    Compare with previous version

    added 120 commits <ul><li>f364b85e...feced5ec - 117 commits from branch <code>next</code></li><li>69c11a82 - Support act numbers up to 99 and draw both digits individually.</li><li>0287c695 - Fix some errors and add some comments. Also, actnum is not an INT32.</li><li>4eb5f09c - Restore SHORT().</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/905/diffs?diff_id=5354&start_sha=f364b85e9234132c8dd76961d4e5ddf22b00c475)
    Toggle commit list
  • MascaraSnake @MascaraSnake

    merged

    May 13, 2020

    merged

    merged
    Toggle commit list
  • MascaraSnake @MascaraSnake

    mentioned in commit acdb4b42

    May 13, 2020

    mentioned in commit acdb4b42

    mentioned in commit acdb4b42eacd1ea4be87141063d6f544312b2382
    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
Enhancement
Assign labels
  • View project labels
Reference: STJr/SRB2!905
×

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.