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

Open
Opened Mar 23, 2018 by James R.@james 
  • Report abuse
Report abuse

Tidying up the console a bit

×

Check out, review, and merge locally

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

git fetch https://git.magicalgirl.moe/james/SRB2.git console-fixes
git checkout -b james/SRB2-console-fixes FETCH_HEAD

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff james/SRB2-console-fixes

Step 4. Push the result of the merge to GitLab

git push origin master

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

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

  • Discussion 5
  • Commits 7
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • James R. @james

    added 1 commit

    • b7097223 - Consoles are not meant to be seen nor heard

    Compare with previous version

    Mar 23, 2018

    added 1 commit

    • b7097223 - Consoles are not meant to be seen nor heard

    Compare with previous version

    added 1 commit * b7097223 - Consoles are not meant to be seen nor heard [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/235/diffs?diff_id=559&start_sha=15a08e7819c8428d372c6395eb9944fe3075e404)
    Toggle commit list
  • James R. @james

    added 1 commit

    • e330833d - Don't interrupt the player's console

    Compare with previous version

    Mar 24, 2018

    added 1 commit

    • e330833d - Don't interrupt the player's console

    Compare with previous version

    added 1 commit * e330833d - Don't interrupt the player's console [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/235/diffs?diff_id=562&start_sha=b709722325a916fd149ee35bb3cdf7d1efd63565)
    Toggle commit list
  • James R. @james

    added 46 commits

    • e330833d...8e5ac64d - 45 commits from branch STJr:master
    • 3de4dbeb - Merge remote-tracking branch 'origin/master' into console-fixes

    Compare with previous version

    Apr 21, 2018

    added 46 commits

    • e330833d...8e5ac64d - 45 commits from branch STJr:master
    • 3de4dbeb - Merge remote-tracking branch 'origin/master' into console-fixes

    Compare with previous version

    added 46 commits * e330833d...8e5ac64d - 45 commits from branch `STJr:master` * 3de4dbeb - Merge remote-tracking branch 'origin/master' into console-fixes [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/235/diffs?diff_id=613&start_sha=e330833d18a32d43d3bd43e78484f94a32428c6c)
    Toggle commit list
  • Monster Iestyn @MonsterIestyn commented Jul 27, 2018
    Master

    Oh, right, should have said ages ago; I had a look at this branch, and noticed that among it's changes, it took out both CON_ToggleOff and CON_ClearHUD from F_StartIntro, assuming the lattermost function was called only by D_SRB2Main in d_main.c, moving the two removed functions to there to optimise the code.

    Turns out F_StartIntro is actually called by a few other places in fact.

    Edited Jul 27, 2018 by Monster Iestyn
    Oh, right, should have said ages ago; I had a look at this branch, and noticed that among it's changes, it took out both `CON_ToggleOff` and `CON_ClearHUD` from `F_StartIntro`, assuming the lattermost function was called only by D_SRB2Main in d_main.c, moving the two removed functions to there to optimise the code. Turns out `F_StartIntro` is actually called by a few other places in fact.
  • James R. @james

    added 137 commits

    • 3de4dbeb...423403ea - 136 commits from branch STJr:master
    • e71472ed - Merge remote-tracking branch 'origin/master' into console-fixes

    Compare with previous version

    Oct 18, 2018

    added 137 commits

    • 3de4dbeb...423403ea - 136 commits from branch STJr:master
    • e71472ed - Merge remote-tracking branch 'origin/master' into console-fixes

    Compare with previous version

    added 137 commits * 3de4dbeb...423403ea - 136 commits from branch `STJr:master` * e71472ed - Merge remote-tracking branch 'origin/master' into console-fixes [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/235/diffs?diff_id=1454&start_sha=3de4dbeb4f020e41283be87117048819d4be55ab)
    Toggle commit list
  • Steel Titanium @SteelTitanium commented Nov 25, 2018

    Is this safe to go in, is what MI said 3 months ago blocking?

    Is this safe to go in, is what MI said 3 months ago blocking?
  • Monster Iestyn @MonsterIestyn commented Nov 25, 2018
    Master

    Yeah somewhat, I don't know the side effects of him removing those things from the functions indirectly.

    Yeah somewhat, I don't know the side effects of him removing those things from the functions indirectly.
  • Monster Iestyn @MonsterIestyn commented Nov 25, 2018
    Master

    (as in yeah it is blocking)

    (as in yeah it is blocking)
  • James R. @james commented Dec 15, 2018

    If I remember correctly, F_StartIntro is only called at game start or with the playintro command. In the latter case, not closing console would be part of nonobtrusiveness. I'm fine with that being changed. Perhaps one would want to play the intro uninterrupted for, say, a recording.

    If I remember correctly, F_StartIntro is only called at game start or with the playintro command. In the latter case, not closing console would be part of nonobtrusiveness. I'm fine with that being changed. Perhaps one would want to play the intro uninterrupted for, say, a recording.
  • 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: STJr/SRB2!235