• 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 24
  • Labels
  • Forks
  • Snippets
  • Network
Open
MR Merge Request !693 opened
2020-12-13 22:02:08 UTC by Ryan Yappert @RootOfAllThings

Makes combat tables for items refer back to their source item.

Adds a self property to o.combat and o.special_combat that refers back to item's full table. Combat tables tend to get passed around through various functions and callbacks and it can be difficult to connect a combat table to a full object. This makes the link two-way (o.combat.self == o).

This doesn't break saves, but any functionality dependent on the link will require a new save, as it only applies to newly generated items.

Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge RootOfAllThings:combat_table_updates into master (97 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/RootOfAllThings/t-engine4.git combat_table_updates
git checkout -b RootOfAllThings/t-engine4-combat_table_updates 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-combat_table_updates

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 2b5a137b. View details
CI build skipped for 2b5a137b. View details
CI build canceled for 2b5a137b. View details
CI build failed for 2b5a137b. View details
CI build running for 2b5a137b. View details
CI build pending for 2b5a137b. 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
693 of 695
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!693