• 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 !801 opened
2021-08-31 06:40:46 UTC by Ryan Yappert @RootOfAllThings

Fixes Moon & Star set bonus.

Fixes the set bonus from Moon and Star. The special_on_hit.fct bit of its damage had a misinterpreted argument: the first argument is not self but the weapon's combat table. Luckily the combat table now has a reference to the source as of MR !693.

This MR is save safe, but old copies of the items will still have the broken behavior.

Edited 2021-10-01 13:36:17 UTC
Request to merge RootOfAllThings:moon_star_fix 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/RootOfAllThings/t-engine4.git moon_star_fix
git checkout -b RootOfAllThings/t-engine4-moon_star_fix 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 RootOfAllThings/t-engine4-moon_star_fix

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

Merged by DarkGod 2021-10-01 13:36:17 UTC

The changes were merged into master. The source branch has been removed.

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 1
  • DarkGod
    @darkgod commented 2021-10-01 13:36:17 UTC

    mentioned in commit 10cfd29b

  • DarkGod
    @darkgod commented 2021-10-01 13:36:17 UTC

    Status changed to merged

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

Revert this merge request

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