• 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 57
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !743 opened
2021-06-12 05:28:28 UTC by yutio888 @yutio888

fix talent level of chants & hymns boosted by difficulty twice.

In high difficulties, Chant of XXX or Hymn of XXX has higher level than Chant Acolyte or Hymn Acolyte accordingly, because they get double boost from difficulty. This merge request add "no_difficulty_boost" tag to Chant Acolyte and Hymn Acolyte to avoid double boost.

Edited 2021-06-15 14:23:39 UTC
Request to merge yutio888:fix_double_boost_chant_hymn into master
×

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/yutio888/t-engine4.git fix_double_boost_chant_hymn
git checkout -b yutio888/t-engine4-fix_double_boost_chant_hymn 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 yutio888/t-engine4-fix_double_boost_chant_hymn

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 600b9fdd. View details
CI build skipped for 600b9fdd. View details
CI build canceled for 600b9fdd. View details
CI build failed for 600b9fdd. View details
CI build running for 600b9fdd. View details
CI build pending for 600b9fdd. View details

Merged by DarkGod 2021-06-15 14:23:39 UTC

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 2
  • DarkGod
    @darkgod commented 2021-06-15 14:23:37 UTC

    mentioned in commit 09e0f806

  • DarkGod
    @darkgod commented 2021-06-15 14:23:39 UTC

    Status changed to merged

  • Please register or login to post a comment
743 of 849
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: tome/t-engine4!743
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.