• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 24
  • Labels
  • Forks
  • Snippets
  • Network
Open
MR Merge Request !695 opened
2020-12-16 14:21:26 UTC by yutio888 @yutio888

Fix spatial tether stack infinitely

Fix the issue that spatial tether can stack a lot and seems to last forever: only the latest tether can be prolonged, the duration of old tether are fixed by the time you apply a new tether.

This commit only provides a possible solution for this issue, and its potential impact should be evaluated.

Edited 2021-01-06 09:53:40 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge otowakotori:tether-fix into master (97 commits behind)
×

Check out, review, and merge locally

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

git fetch https://git.net-core.org/otowakotori/t-engine4.git tether-fix
git checkout -b otowakotori/t-engine4-tether-fix 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 otowakotori/t-engine4-tether-fix

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

CI build passed for 6fe7cf25. View details
CI build skipped for 6fe7cf25. View details
CI build canceled for 6fe7cf25. View details
CI build failed for 6fe7cf25. View details
CI build running for 6fe7cf25. View details
CI build pending for 6fe7cf25. View details

Ready to be merged automatically

Ask someone with write access to this repository to merge this request.

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 1
  • Please register or login to post a comment
695 of 695
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: tome/t-engine4!695