• 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
Merged
MR Merge Request !689 opened
2020-12-04 23:54:07 UTC by Mr Frog @MrFrog

Doomed stuff

  • Adds SFX to Willful Strike and Unseen Force (uses the punch sfx which might be a bit goofy?)
  • Fixes Maligned's icon not displaying properly
  • Clarifies the descriptions of the Darkness and Punishments talents a bit
Edited 2021-02-15 14:36:20 UTC
Request to merge MrFrog:doomed-stuff 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/MrFrog/t-engine4.git doomed-stuff
git checkout -b MrFrog/t-engine4-doomed-stuff 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 MrFrog/t-engine4-doomed-stuff

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

Merged by DarkGod 2021-02-15 14:36:20 UTC

  • Discussion 1
  • Commits 6
  • Builds 0
  • Changes 4
    Avatar
    Mr Frog
    @MrFrog started a discussion on commit e0a7cae1
    Show/hide discussion
    last updated by Mr Frog 2020-12-04 22:52:09 UTC
  • Mr Frog
    @MrFrog commented 2020-12-04 22:52:09 UTC

    whoops! I'm bad at this lol

  • DarkGod
    @darkgod commented 2021-02-15 14:36:20 UTC

    mentioned in commit 105124d8

  • DarkGod
    @darkgod commented 2021-02-15 14:36:20 UTC

    Status changed to merged

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

Revert this merge request

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