Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rl upstream #444

Merged
merged 11 commits into from
Jul 10, 2024
Merged

rl upstream #444

merged 11 commits into from
Jul 10, 2024

Conversation

melxin
Copy link
Contributor

@melxin melxin commented Jul 10, 2024

No description provided.

old-kyle-escabar and others added 11 commits July 10, 2024 14:23
(cherry picked from commit 61661668fe658aebf57a6dd4823fc4a3456ddc48)
Dizana's quiver adds a new ammo slot to the equipment tab, but:
* this slot is not actually part of the equipment inventory container, and
* probably because of that, the widgets are implemented differently as a couple nested static widgets

As a result, the existing equipment tab custom tab functionality does not recognize it as a valid swap target. However, it can be handled as a normal ui swap by just excluding it from the inventory interface id preconditions.

(cherry picked from commit 8fc859df97b76c125a2bb73fecf5ba0e94cd1a69)
this was added in rev 221

(cherry picked from commit 2d0a5628dfde6b84dff971876ccd51321a8c3ac7)
(cherry picked from commit a2ff02b4db575ce827d3811706fb9935ec6958ce)
(cherry picked from commit 5f3c181ad29b9ca339deb43abefd6eea08d215f6)
(cherry picked from commit 3c75d61cc5620650edd0be41747dd4fcc1041959)
(cherry picked from commit 8d3916305a99571fc4d8bd652f0d42ccd12eda64)
(cherry picked from commit 94164c7a9dc52909148e3ef77d1b001d5bac9b75)
@jbx5 jbx5 merged commit 6b7c988 into jbx5:experimental Jul 10, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants