Skip to content

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

Merged
Opened Dec 23, 2018 by Digiku@digiku 
  • Report abuse
Report abuse

Final code fixes and minor cleanup

  • Fixed a couple crashes on insert-typing a char at index 0, and pasting at index 0. The former was my fault when switching INT32 to unsigned.
  • Activate Kart splitscreen chat code behind #define NETSPLITSCREEN
  • Disable chat by adding splitscreen check to OLDCHAT
  • Draw up and down scroll arrows the 2.2 way, by string
  • Cleanup commit to adjust comment whitespace and rename stop_spamming_you_cunt (yeah fuckaj can stay but I draw the line at cunt, sorry :X )

Pending whether I can actually draw the arrows correctly; hold tight while I figure out why SLADE's not firing up... works fine, fire away

Edited Dec 23, 2018 by Digiku
  • Discussion 3
  • Commits 11
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Digiku @digiku

    added 1 commit

    • e0176670 - Correct splitscreen check in OLDCHAT

    Compare with previous version

    Dec 23, 2018

    added 1 commit

    • e0176670 - Correct splitscreen check in OLDCHAT

    Compare with previous version

    added 1 commit <ul><li>e0176670 - Correct splitscreen check in OLDCHAT</li></ul> [Compare with previous version](https://git.magicalgirl.moe/SinnamonLat/SRB2/merge_requests/5/diffs?diff_id=2009&start_sha=7e9411f320b75f7f90cc9f16a501d7aed7e88ae4)
    Toggle commit list
  • Digiku @digiku

    changed the description

    Dec 23, 2018

    changed the description

    changed the description
    Toggle commit list
  • Digiku @digiku

    added 2 commits

    • 64007290 - Extend HU_FONTSTART to STCFN022 (from 2.2)
    • b6db8206 - Use TinyFont for chat arrows

    Compare with previous version

    Dec 23, 2018

    added 2 commits

    • 64007290 - Extend HU_FONTSTART to STCFN022 (from 2.2)
    • b6db8206 - Use TinyFont for chat arrows

    Compare with previous version

    added 2 commits <ul><li>64007290 - Extend HU_FONTSTART to STCFN022 (from 2.2)</li><li>b6db8206 - Use TinyFont for chat arrows</li></ul> [Compare with previous version](https://git.magicalgirl.moe/SinnamonLat/SRB2/merge_requests/5/diffs?diff_id=2010&start_sha=e0176670f4b9d2676e7b9ef7936158a5282d35eb)
    Toggle commit list
  • Digiku @digiku commented Dec 23, 2018

    The new arrow drawing code runs fine. You'll have to tell me if this looks misaligned

    image

    (edit: in fact yeah it is... gotta move down arrow up a few pixels)

    Edited Dec 23, 2018 by Digiku
    The new arrow drawing code runs fine. You'll have to tell me if this looks misaligned ![image](/uploads/e3e63537c522e3046e34d819ea998294/image.png) (edit: in fact yeah it is... gotta move down arrow up a few pixels)
  • Digiku @digiku commented Dec 23, 2018

    I think this is better. Pulled the coordinates from Kart

    image

    I think this is better. Pulled the coordinates from Kart ![image](/uploads/4b3708cb418801da0b6d5fa4e2ad03a5/image.png)
  • Digiku @digiku

    unmarked as a Work In Progress

    Dec 23, 2018

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Digiku @digiku

    changed the description

    Dec 23, 2018

    changed the description

    changed the description
    Toggle commit list
  • Digiku @digiku

    added 1 commit

    • 56320a35 - Use TinyFont for chat arrows

    Compare with previous version

    Dec 23, 2018

    added 1 commit

    • 56320a35 - Use TinyFont for chat arrows

    Compare with previous version

    added 1 commit <ul><li>56320a35 - Use TinyFont for chat arrows</li></ul> [Compare with previous version](https://git.magicalgirl.moe/SinnamonLat/SRB2/merge_requests/5/diffs?diff_id=2011&start_sha=b6db8206c41a5c1021852fb8a2ee82da530f2c1a)
    Toggle commit list
  • Marco Z
    @mazmazz started a discussion on commit 64007290 Dec 23, 2018
    • Marco Z @mazmazz

      mentioned in commit a9fb17da

      Dec 23, 2018

      mentioned in commit a9fb17da

      mentioned in commit a9fb17dab1d4ade74d776faec3f4cf0ecb348bfe
      Toggle commit list
    Please register or sign in to reply
  • Digiku @digiku

    added 1 commit

    • a9fb17da - Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"

    Compare with previous version

    Dec 23, 2018

    added 1 commit

    • a9fb17da - Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"

    Compare with previous version

    added 1 commit <ul><li>a9fb17da - Revert &quot;Extend HU_FONTSTART to STCFN022 (from 2.2)&quot;</li></ul> [Compare with previous version](https://git.magicalgirl.moe/SinnamonLat/SRB2/merge_requests/5/diffs?diff_id=2012&start_sha=56320a35ce0e3f92611016b606361fdbb73736cb)
    Toggle commit list
  • Digiku @digiku commented Dec 23, 2018

    The arrow chars are part of the font now, so I'll put that in a separate merge request on public in case I rollback patch.dta last minute. If I do roll it back, I'll re-insert the arrow drawing code after CHAT is merged.

    This merge is good to go.

    Edited Dec 23, 2018 by Digiku
    The arrow chars are part of the font now, so I'll put that in a separate merge request on public in case I rollback patch.dta last minute. If I do roll it back, I'll re-insert the arrow drawing code after CHAT is merged. This merge is good to go.
  • Digiku @digiku

    mentioned in merge request STJr/SRB2!398 (merged)

    Dec 23, 2018

    mentioned in merge request STJr/SRB2!398 (merged)

    mentioned in merge request STJr/SRB2!398
    Toggle commit list
  • Digiku @digiku

    added 1 commit

    • 6ebc41a5 - Check target < MAXPLAYERS before PM

    Compare with previous version

    Dec 23, 2018

    added 1 commit

    • 6ebc41a5 - Check target < MAXPLAYERS before PM

    Compare with previous version

    added 1 commit <ul><li>6ebc41a5 - Check target &lt; MAXPLAYERS before PM</li></ul> [Compare with previous version](https://git.magicalgirl.moe/SinnamonLat/SRB2/merge_requests/5/diffs?diff_id=2017&start_sha=a9fb17dab1d4ade74d776faec3f4cf0ecb348bfe)
    Toggle commit list
  • Digiku @digiku

    added 1 commit

    • 3703a032 - Buildbot fixes

    Compare with previous version

    Dec 23, 2018

    added 1 commit

    • 3703a032 - Buildbot fixes

    Compare with previous version

    added 1 commit <ul><li>3703a032 - Buildbot fixes</li></ul> [Compare with previous version](https://git.magicalgirl.moe/SinnamonLat/SRB2/merge_requests/5/diffs?diff_id=2019&start_sha=6ebc41a5543a2ea794a8256670e571c3ffb022bb)
    Toggle commit list
  • Latapostrophe @SinnamonLat

    merged

    Dec 23, 2018

    merged

    merged
    Toggle commit list
  • Latapostrophe @SinnamonLat

    mentioned in commit 809bb8a9

    Dec 23, 2018

    mentioned in commit 809bb8a9

    mentioned in commit 809bb8a9d587fb0f5adddebc0933a8f38a91c66e
    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
0
Labels
None
Assign labels
  • View project labels
Reference: SinnamonLat/SRB2!5
×

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.