• 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 !747 opened
2021-06-16 10:26:30 UTC by yutio888 @yutio888

Miscs for next version

  1. fix wintry ego on shield not crit (it does mindcrit, but then use the base damage instead)
  2. fix Shattering Charge double crits (luckily only spire dragon knows this obslete talent, which is extremely rare except Gorbat Pride).
Edited 2021-06-16 10:41:51 UTC
Request to merge yutio888:misc_idk 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 misc_idk
git checkout -b yutio888/t-engine4-misc_idk 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-misc_idk

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

Merged by DarkGod 2021-06-16 10:41:51 UTC

  • Discussion 0
  • Commits 2
  • Builds 0
  • Changes 2
  • DarkGod
    @darkgod commented 2021-06-16 10:41:49 UTC

    mentioned in commit a5d61664

  • DarkGod
    @darkgod commented 2021-06-16 10:41:51 UTC

    Status changed to merged

  • Please register or login to post a comment
747 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!747
×

Revert this merge request

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