Commit Graph

347 Commits

Author SHA1 Message Date
David Malchin
9c1c784e5d fix(version): match major versions with multiple digits (#259) 2023-03-02 04:30:26 +11:00
Linden
ad2c50cd1d feat(client/radial): add lib.disableRadial to prevent radial access 2023-03-01 07:32:40 +11:00
Linden
3dd996c38b refactor(client/interface): nui focus tweaks
Add helper functions to set nui focus and restore previous input state.
Ensure focus is reset before triggering responses (promises/callbacks).
2023-03-01 07:25:28 +11:00
Linden
284b563483 fix(client/radial): reset NuiFocusKeepInput 2023-03-01 07:04:51 +11:00
Linden
8848f6d6bc fix(client/radial): onSelect export handler
currentRadial is cleared before triggering the export.
2023-03-01 06:48:13 +11:00
Diogo Manuel Coelho Morais dos Santos
053d5d45ec fix(radial): replace global item with same id instead of duplicating (#255) 2023-03-01 06:48:08 +11:00
Diogo Manuel Coelho Morais dos Santos
d72b7eb00a fix(radial): go back to correct more page when going back from sub (#247) 2023-03-01 06:47:14 +11:00
Linden
79e91ee452 refactor(client/radial): allow onSelect as string to call an export
e.g. onSelect = 'menuHandler'
exports('menuHandler', function(menu, item) end)
2023-02-26 03:58:05 +11:00
Linden
29022e1a48 feat(client/radial): return currentMenu and itemIndex onSelect 2023-02-26 01:59:01 +11:00
Luke
60e3a12033 Revert "fix(web/radial): go back to correct more page when going back from sub"
This reverts commit 709d512422.
2023-02-25 15:37:13 +01:00
Luke
6e1a978038 fix(web/radial): check whether radial menu was closed during transition
Closing the radial menu during the transition from the more pages would cause the menu to be stuck open
2023-02-25 14:30:54 +01:00
Luke
709d512422 fix(web/radial): go back to correct more page when going back from sub 2023-02-25 14:15:27 +01:00
Linden
b3b49b1cbd fix: missing and invalid types and parameters 2023-02-25 18:20:14 +11:00
Linden
b779ea7c3b refactor(client/radial): don't refresh submenu if parent updated
Possibly works as intended, even.
2023-02-24 14:39:17 +11:00
Linden
f130a27680 fix(client/radial): don't refresh submenu if unrelated option updates 2023-02-24 14:31:42 +11:00
Linden
386fc60afd fix(client/radial): refresh current submenu if path is still valid
Resolves #424, hopefully without weird side effects.
2023-02-24 04:24:51 +11:00
Linden
7f538f6a5b fix(client/radial): refresh when current submenu updates
Resolves #241.
2023-02-24 04:04:25 +11:00
Linden
21739ac6cf refactor(client/radial): refresh to last available menu
When re-registering or removing an option linking to the current
submenu, restore the last available sub menu.
2023-02-24 03:55:19 +11:00
Linden
e2650b7e05 feat(client/radial): refresh menu when parent is re-registered 2023-02-24 02:50:54 +11:00
Linden
5f1678131c feat(client/radial): support refreshing menus 2023-02-24 00:26:17 +11:00
Linden
5428d1c768 feat(client/radial): refresh menu when current menu is removed
Possibly weird.
2023-02-23 23:35:20 +11:00
Luke
e9c2e244c7 fix(web/radial): fix transition not showing for global radial menu 2023-02-23 12:57:17 +01:00
Linden
bce10d0980 feat(client/radial): radial menu history and radial id getter
Store an array containing the history of opened menus, and restore
the previous menu when closing out of nested menus.
Added lib.getCurrentRadialId and improved types.
2023-02-23 22:46:22 +11:00
Luke
b22840f102 fix(client/radial): don't refresh radial menu when in sub menu
resolves #233
2023-02-22 21:45:11 +01:00
Linden
3801faf976 fix(client/radial): don't hide radial when opening submenu
fix(fix): fix
2023-02-19 05:48:28 +11:00
Luke
4c8a670b85 fix(client/radial): hide radial before running onSelect
potentially fixes focus issues when opening another UI element in onSelect
2023-02-18 19:36:03 +01:00
Linden
b79273c0d7 refactor(client/radial): change keybind to toggle 2023-02-18 21:56:39 +11:00
Linden
9df936ab16 fix(client/radial): handle submenu transition
Resolve #225.
2023-02-18 21:26:58 +11:00
Luke
b56e6826a8 Merge branch 'v3' 2023-02-17 15:54:20 +01:00
Luke
e57460c611 refactor(client): add missing lua typings 2023-02-17 11:28:55 +01:00
Linden
43197b492b chore(client/radial): typings 2023-02-17 01:50:26 +11:00
Luke
006873007f fix(client/radial): don't display radial menu when nui is focused 2023-02-16 14:19:59 +01:00
Luke
b072d0da59 refactor(client/radial): add isOpen check when adding global items 2023-02-15 17:42:37 +01:00
Luke
f166c1675e feat(web/skillcheck): random skill check key from inputs table 2023-02-12 19:26:15 +01:00
Luke
c9ac415f12 feat(web): primary colour and shade convars 2023-02-11 14:40:58 +01:00
Luke
71885f5831 refactor(web/radial): disable nui focus when closing with x button 2023-02-10 18:17:30 +01:00
masonschafercodes
7acad823b8 Revert "feat(web/context): mouse enter and mouse leave events (#218)"
This reverts commit 7a22da68e6.
2023-02-10 18:11:18 +01:00
Luke
c9c90efaf8 Revert "refactor(client/context): rename lastHoveredContextItem variable"
This reverts commit 61db40c07d.
2023-02-10 18:11:06 +01:00
Luke
ec62398e55 Revert "refactor(web/menu): radial menu onHover"
This reverts commit f20e3a288f.
2023-02-10 18:09:26 +01:00
Luke
f20e3a288f refactor(web/menu): radial menu onHover 2023-02-08 10:17:44 +01:00
Luke
61db40c07d refactor(client/context): rename lastHoveredContextItem variable 2023-02-08 10:06:02 +01:00
masonschafercodes
7a22da68e6 feat(web/context): mouse enter and mouse leave events (#218)
* feat(web/context): mouse enter and mouse leave events

* chore(web/context): condense into one function for onHover

* feat(resource/context): cache last hovered option
2023-02-08 10:05:30 +01:00
Linden
6fe8f5257f refactor(client/radial): use lib.addKeybind and tweak exports
Merge lib.hideRadial with closeRadial, trigger onReleased.
Trigger radial submenu after onSelect.
Keep showRadial as a local method.
2023-02-08 00:50:05 +11:00
Linden
560b19c34a refactor(client/radial): clear items on resource stop 2023-02-08 00:26:08 +11:00
Linden
a30c8c1384 refactor(client/radial): minor tweaks and formatting
Increment menuSize during lib.addRadialItem (micro-optimisation).
Don't open radial menu if no items are registered.
2023-02-08 00:19:51 +11:00
Luke
2e74c2d8c9 refactor(web/menu): rename radial menu item key to id 2023-02-07 13:51:58 +01:00
Luke
de7cf1ccef refactor(web/menu): improve radial menu transitions 2023-02-07 13:51:42 +01:00
Luke
be99e16e34 refactor(web/menu): radial sub menu chaining
still some quirks to figure out but it's working well
2023-02-04 22:13:22 +01:00
Luke
86318d5fe4 refactor(client/radial): ditch canInteract 2023-02-03 13:24:55 +01:00
Linden
97d5bd6ac0 fix(client/progress): anim task/scenario check
Correct behaviour from pull request #208.
Include some refactoring to reduce repetitive  table indexing.
2023-02-03 13:25:30 +11:00