• 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 43
  • Labels
  • Forks
  • Snippets
  • Network
Open
MR Merge Request !823 opened
2021-11-06 14:20:02 UTC by yutio888 @yutio888

minor debuff

Introduce the concept of minor debuffs:

  1. buffs, major debuffs and minor debuffs are displayed seperately in 3 lines
  2. cleanse talents that remove cross-tier effects instead remove several minor debuffs
  3. many unspecified cleanse talents will try remove major debuffs first
  4. some 'other' debuffs are classified as physical, magical or mental minor debuff
  5. add some pre-defined effect filters
Edited 2021-11-06 14:20:51 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge yutio888:minor_debuff into master (58 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/yutio888/t-engine4.git minor_debuff
git checkout -b yutio888/t-engine4-minor_debuff 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-minor_debuff

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 0e2b4a26. View details
CI build skipped for 0e2b4a26. View details
CI build canceled for 0e2b4a26. View details
CI build failed for 0e2b4a26. View details
CI build running for 0e2b4a26. View details
CI build pending for 0e2b4a26. 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 22
  • Please register or login to post a comment
823 of 846
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!823