• 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 !690 opened
2020-12-04 23:56:28 UTC by Mr Frog @MrFrog

Thorn grab vfx

Adds a brief particle effect when Thorn Grab is used. This makes it easier for the player to notice when it's used on them and adds a bit of visual feedback when the player uses the talent.

This is what it looks like: https://cdn.discordapp.com/attachments/434394801916477450/784281570126463016/2yWtsAh1zj.gif

Edited 2021-02-15 14:37:22 UTC
Request to merge MrFrog:thorn-grab-vfx 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 thorn-grab-vfx
git checkout -b MrFrog/t-engine4-thorn-grab-vfx 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-thorn-grab-vfx

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

Merged by DarkGod 2021-02-15 14:37:22 UTC

  • Discussion 0
  • Commits 2
  • Builds 0
  • Changes 2
    Avatar
    Mr Frog
    @MrFrog started a discussion on commit 85dee054
    Show/hide discussion
    last updated by Mr Frog 2020-12-04 06:24:55 UTC
  • Mr Frog
    @MrFrog commented 2020-12-04 06:24:55 UTC

    mentioned in commit ae6b41e3

  • Avatar
    Mr Frog
    @MrFrog started a discussion on commit b19f6e98
    Show/hide discussion
    last updated by Mr Frog 2020-12-04 22:18:03 UTC
  • Mr Frog
    @MrFrog commented 2020-12-04 22:18:03 UTC

    mentioned in commit f3d773e145c0d34bc1b9d7e272b8e338783e0bd7

  • DarkGod
    @darkgod commented 2021-02-15 14:37:19 UTC

    mentioned in commit 40567936

  • DarkGod
    @darkgod commented 2021-02-15 14:37:22 UTC

    Status changed to merged

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

Revert this merge request

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