• 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 !331 opened
2016-02-24 10:53:17 UTC by Alex Ksandra @0player

Estimated damage

Weapon combat tooltip work

  • range is now correctly treated as modifying scaled power, rather than unscaled
  • additional damage mods treated equally across the table for consistency
  • new "estimated damage" tooltip that shows the estimated damage per attack or per turn (doesn't take wielder bonuses into account for simplicity)
Edited 2016-04-01 10:00:07 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge 0player:estimated_damage into master (4541 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/0player/t-engine4.git estimated_damage
git checkout -b 0player/t-engine4-estimated_damage 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 0player/t-engine4-estimated_damage

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

This merge request contains merge conflicts

Please resolve these conflicts or ask someone with write access to this repository to merge this request manually.

  • Discussion 0
  • Commits 5
  • Changes 4
  • Please register or login to post a comment
331 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!331