• 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 48
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !731 opened
2021-05-31 11:41:53 UTC by Otowa Kotori @otowakotori

Split the effect of Brutalized and Stunned

Allows Brutalize reduce enemies' cut_immune without checking stun immune Bleed synergy is the core design of Fallen, and immune reduction should pass enemy immunity to ensure it can be used on any enemy, like Reaver's Epidemic or Archmage's Wet.

Edited 2021-06-02 13:58:09 UTC
Request to merge otowakotori:split_brutalize_effects 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/otowakotori/t-engine4.git split_brutalize_effects
git checkout -b otowakotori/t-engine4-split_brutalize_effects 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-split_brutalize_effects

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

Merged by DarkGod 2021-06-02 13:58:09 UTC

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 2
  • DarkGod
    @darkgod commented 2021-06-02 13:58:07 UTC

    mentioned in commit a887cce0

  • DarkGod
    @darkgod commented 2021-06-02 13:58:09 UTC

    Status changed to merged

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

Revert this merge request

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