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 72
    • Merge Requests 72
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !1403

Merged
Opened Feb 15, 2021 by LJ Sonic@LJSonic 
  • Report abuse
Report abuse

A few minor tweaks before 2.2.9

Just a bunch of very basic tweaks:

  • The newly exposed polyobjects array follows the usual naming scheme for Lua.
  • KeepBody (rejointimeout) is now enabled by default, has a more visual indicator in the tab HUD, and can be edited from the server options.

image

Edited Feb 15, 2021 by LJ Sonic
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b final-tweaks origin/final-tweaks

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 final-tweaks

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 5
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • LJ Sonic @LJSonic

    added 1 commit

    • 7133c703 - Show an alternate ping icon when the player is disconnected

    Compare with previous version

    Feb 15, 2021

    added 1 commit

    • 7133c703 - Show an alternate ping icon when the player is disconnected

    Compare with previous version

    added 1 commit <ul><li>7133c703 - Show an alternate ping icon when the player is disconnected</li></ul> [Compare with previous version](https://git.do.srb2.org/STJr/SRB2/merge_requests/1403/diffs?diff_id=7291&start_sha=97daba68d0beb57622f996c6086d15355175ae22)
    Toggle commit list
  • LJ Sonic @LJSonic

    changed the description

    Feb 15, 2021

    changed the description

    changed the description
    Toggle commit list
  • LJ Sonic @LJSonic

    merged

    Feb 16, 2021

    merged

    merged
    Toggle commit list
  • LJ Sonic @LJSonic

    mentioned in commit d380405b

    Feb 16, 2021

    mentioned in commit d380405b

    mentioned in commit d380405b2f2315490840eb05535d462d53eb8726
    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.9
Milestone
2.2.9
Assign milestone
Time tracking
2
Labels
Enhancement Lua
Assign labels
  • View project labels
Reference: STJr/SRB2!1403
×

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.