• 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 54
  • Labels
  • Forks
  • Snippets
  • Network
Open
MR Merge Request !840 opened
2021-12-31 09:16:09 UTC by yutio888 @yutio888

reduce the defense ratio of Dex back to 0.35

The related commit doesn't tell anything about this change (0.35 -> 0.7), and it's wierd that the descriptions in LevelUpDialog still says one dex provides 0.35 defense. Maybe this is a mistake?

Edited 2021-12-31 09:34:51 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge yutio888:reduce_dex_defense into master (125 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 reduce_dex_defense
git checkout -b yutio888/t-engine4-reduce_dex_defense 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-reduce_dex_defense

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 1759f811. View details
CI build skipped for 1759f811. View details
CI build canceled for 1759f811. View details
CI build failed for 1759f811. View details
CI build running for 1759f811. View details
CI build pending for 1759f811. 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
840 of 870
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!840