• 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 !691 opened
2020-12-07 17:13:39 UTC by Ryan Yappert @RootOfAllThings

Pulls the actual parsing of a hotkey into an icon out into its own function

Modifies engines\default\engine\HotkeysIconDisplay.lua to better support addons. The current call to display() draws every hotkey over the course of a nested iteration, which means that if someone wishes to modify this behavior (e.g. have flagged talents use a different border color, or support multiple talent icons to denote different states of a talent), the entire display() function must be entirely replaced. This isn't ideal as these modifications are mutually exclusive.

This MR splits the actual parsing of a hotkey into a displayHotkey() function (with appropriate arguments) so that addon developers can safely superload the hotkey drawing behavior.

This MR is save-safe.

Edited 2021-01-01 21:31:34 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge RootOfAllThings:hotkey_extract 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 hotkey_extract
git checkout -b RootOfAllThings/t-engine4-hotkey_extract 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-hotkey_extract

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

Ready to be merged automatically

Ask someone with write access to this repository to merge this request.

  • Discussion 2
  • Commits 2
  • Builds 0
  • Changes 1
  • Ryan Yappert
    @RootOfAllThings commented 2020-12-07 17:28:27 UTC

    Added 1 commit:

    • 3d86911b - Now returns properly so a single hotkey can be modified multiple times.
  • Please register or login to post a comment
691 of 695
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: tome/t-engine4!691