Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
VuhDo
VuhDo
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 129
    • Issues 129
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 3
    • Merge Requests 3
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • VuhDo
  • VuhDoVuhDo
  • Merge Requests
  • !17

Open
Opened Oct 22, 2020 by Croc@Croc
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.vuhdo.io/Croc/vuhdo.git" "feat-apply-masque-skin-to-debuffs"
git checkout -b "Croc/vuhdo-feat-apply-masque-skin-to-debuffs" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "Croc/vuhdo-feat-apply-masque-skin-to-debuffs"

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.

WIP: Added Masque skin on debuff icons

  • Overview 0
  • Commits 1
  • Pipelines 3
  • Changes 6

Fixes #176

  • Added a new VUHDO_LibButtonFacade group for Debuff icons
  • Updated the VUHDO_initButtonButtonFacade(aButton) method, adding debuffs
  • Minor translations on related comments
    • Regarding unrelated comments, I had some UTF-8 encoding troubles, I just replaced the falty character without translating, I don't know if the goal is to have all comments in english ?

ToDO :

  • Animation doesnt work, I don't know why :(
Edited Oct 23, 2020 by Croc
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
Labels
Feature Request Retail Waiting
Assign labels
  • View project labels
Reference: vuhdo/vuhdo!17