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

Merged
Opened Jul 26, 2020 by Hannu Hanhi@Hannu_Hanhi 
  • Report abuse
Report abuse

Fix sector flat alignment issues in OpenGL

Fixes this issue: https://mb.srb2.org/showthread.php?t=48330

×

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/Hannu_Hanhi/SRB2.git ogl-sector-alignment-fix
git checkout -b Hannu_Hanhi/SRB2-ogl-sector-alignment-fix 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 Hannu_Hanhi/SRB2-ogl-sector-alignment-fix

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 0
  • Commits 1
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • James R. @james

    merged

    Aug 03, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit d8834143

    Aug 03, 2020

    mentioned in commit d8834143

    mentioned in commit d8834143cb259e5bf3c49552ec22d37e20db3ac3
    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: STJr/SRB2!1094
×

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.