Commit Graph

1169 Commits

Author SHA1 Message Date
Mitchell McCaffrey
aad173830c Added check for name in unhandled error 2021-02-09 08:07:40 +11:00
Mitchell McCaffrey
bbcc123e4e Updated drawing to console.log errors instead of Sentry log 2021-02-09 08:03:30 +11:00
Mitchell McCaffrey
cdb91eed60 Change editable fog outline to light grey 2021-02-09 08:00:24 +11:00
Mitchell McCaffrey
f1dce05830 Fix grid not showing in editor, and width resize 2021-02-08 18:51:44 +11:00
Mitchell McCaffrey
d0377596d2 Added grid render caching 2021-02-08 18:25:25 +11:00
Mitchell McCaffrey
75a7fb401b Remove unused import 2021-02-08 17:26:56 +11:00
Mitchell McCaffrey
a188736dd8 Added version comments to db 2021-02-08 17:08:29 +11:00
Mitchell McCaffrey
e36058263c Added more loading spinners to map and token operations 2021-02-08 17:06:54 +11:00
Mitchell McCaffrey
24e64f9d32 Update maps and tokens to have thumbnails and removed loading of all files on load 2021-02-08 16:53:56 +11:00
Mitchell McCaffrey
b9993e1a0b Moved from stream-saver to file-saver 2021-02-07 22:53:47 +11:00
Mitchell McCaffrey
93a8563210 Update ImportExportModal.js 2021-02-07 22:20:27 +11:00
Mitchell McCaffrey
23b0432bb2 Fix unused vars 2021-02-07 21:53:29 +11:00
Mitchell McCaffrey
31f502e6ba Add poly/ponyfills for WritableStream and Blob 2021-02-07 21:53:17 +11:00
Mitchell McCaffrey
291fd1512c Moved to domTarget for useGesture to fix pinch zoom error on Mac 2021-02-07 20:44:30 +11:00
Mitchell McCaffrey
9892227caf Added fix for grid nudge causing scroll 2021-02-07 17:40:22 +11:00
Mitchell McCaffrey
9f96145410 Updated rotation to have 15 degree increments 2021-02-07 17:25:29 +11:00
Mitchell McCaffrey
76533852cd Added a grid snapping sensitivity accessibility option 2021-02-07 16:42:29 +11:00
Mitchell McCaffrey
905b43a64b Merge branch 'master' into release/v1.7.1 2021-02-07 16:04:00 +11:00
Mitchell McCaffrey
09471bdf2b Added requesting asset tracking to prevent assets loading multiple times 2021-02-07 14:47:34 +11:00
Mitchell McCaffrey
502f872fbf Add hex support to useGridSnapping 2021-02-07 11:16:36 +11:00
Mitchell McCaffrey
fbea8bd7a7 Move grid snapping to hook and added math for hex snapping 2021-02-06 19:29:24 +11:00
Mitchell McCaffrey
f20173de35 Added shared grid context and moved away from calling useContext directly 2021-02-06 13:32:38 +11:00
Mitchell McCaffrey
8991be923e Added undershoot grid cells to hex grid 2021-02-05 17:42:14 +11:00
Mitchell McCaffrey
9ddb9a6bac Add hex support for map size changes 2021-02-05 16:57:10 +11:00
Mitchell McCaffrey
5dfddd6af9 Add hex support for default inset function 2021-02-05 11:00:31 +11:00
Mitchell McCaffrey
e90b6dea49 Add back vector to for capitilization change 2021-02-04 15:15:27 +11:00
Mitchell McCaffrey
835dbbbc0f Delete vector2.js 2021-02-04 15:14:57 +11:00
Mitchell McCaffrey
de84e77e58 Add basic hex functionality and clean up hooks and Vector2 class 2021-02-04 15:06:34 +11:00
Mitchell McCaffrey
924b3e2481 Moved draw action helpers into new file to fix import errors with workers 2021-02-04 09:59:03 +11:00
Mitchell McCaffrey
fa1f6fe18f Converted draw actions storage to collapsed representation
Moved to command pattern for action application
2021-02-04 09:11:27 +11:00
Mitchell McCaffrey
39352866cb Updated webrtc error ignore 2021-02-01 10:00:42 +11:00
Mitchell McCaffrey
d8f5ccb6a8 Fix token label not resizing on players screens 2021-01-28 17:10:26 +11:00
Mitchell McCaffrey
ff8d7c1547 Moved notes to be above drawings 2021-01-28 16:26:28 +11:00
Mitchell McCaffrey
2108d32501 Added colours and gradients to pointers 2021-01-28 15:12:30 +11:00
Mitchell McCaffrey
72ecd002dd Added automatic token label fitting 2021-01-27 17:00:03 +11:00
Mitchell McCaffrey
39f3034f91 Moved to Comlink.transfer for worker data loading to prevent memory issues 2021-01-27 16:24:13 +11:00
Mitchell McCaffrey
5d1fdaedd8 Disabled export button when database is unavailable 2021-01-27 12:06:37 +11:00
Mitchell McCaffrey
78b8653986 Change export extension 2021-01-27 12:03:10 +11:00
Mitchell McCaffrey
02fa9725cb Moved import/export to worker 2021-01-27 11:57:23 +11:00
Mitchell McCaffrey
3127da0b67 Merge branch 'master' into release/v1.7.1 2021-01-27 11:05:39 +11:00
Mitchell McCaffrey
613beff72e Fix networked state update overriding current changes 2021-01-27 07:58:35 +11:00
Mitchell McCaffrey
b803f7b4d8 Fix crash with non synced fog edit 2021-01-27 07:57:59 +11:00
Mitchell McCaffrey
83a987d9df Add initial import export functionality 2021-01-26 21:49:44 +11:00
Mitchell McCaffrey
cbe1149178 Added extra logging for shape merge 2021-01-26 08:26:51 +11:00
Mitchell McCaffrey
00422a8113 Added extra logging to fog cut 2021-01-25 13:38:37 +11:00
Mitchell McCaffrey
feb803ebef Added note text only mode 2021-01-25 10:03:20 +11:00
Mitchell McCaffrey
55b9be4e2d Added center grid snapping for tokens 2021-01-25 09:15:32 +11:00
Mitchell McCaffrey
fcb87104cd Ensure other modals are closed when deleting maps or tokens 2021-01-25 09:00:19 +11:00
Mitchell McCaffrey
99502bc878 Added tracking of requesting assets to prevent multiple requests 2021-01-25 08:38:50 +11:00
Mitchell McCaffrey
edffbd8971 Removed duplicate getToken function 2021-01-25 08:19:48 +11:00
Mitchell McCaffrey
bda0aa9ebe Merge branch 'master' into release/v1.7.1 2021-01-25 08:19:25 +11:00
Mitchell McCaffrey
1c143f5464 Moved token request to DB and added sanity check to putToken 2021-01-24 17:50:52 +11:00
Mitchell McCaffrey
ae32068ccb Update TokenDataContext.js 2021-01-24 09:21:22 +11:00
Mitchell McCaffrey
6d548e6fff Update TokenDataContext.js 2021-01-24 09:20:32 +11:00
Mitchell McCaffrey
31f9af583a Added more logging to token put error 2021-01-24 09:18:25 +11:00
Mitchell McCaffrey
f05fe32e13 Merge branch 'master' into release/v1.7.0 2021-01-23 15:50:05 +11:00
Mitchell McCaffrey
b9d8a007e5 Optimized fog shapes to only include needed data 2021-01-23 15:44:25 +11:00
Mitchell McCaffrey
493377233c Removed strict null check from map and mapState 2021-01-23 00:01:15 +11:00
Mitchell McCaffrey
5219815a1f Separated fog snapping and drawing snapping, added square edge snapping 2021-01-22 15:00:31 +11:00
Mitchell McCaffrey
3abf9c62fa Changed data contexts to use useCallback and fixed performance issues when changing party state 2021-01-22 14:59:05 +11:00
Mitchell McCaffrey
b9e681f7a1 Updated network state debounce to 500ms 2021-01-22 06:59:49 +11:00
Mitchell McCaffrey
6c8ac51f29 Update useNetworkedState.js 2021-01-22 06:01:43 +11:00
Mitchell McCaffrey
34fcff9052 Added fallback for token statuses empty values and duplicates 2021-01-21 15:55:47 +11:00
Mitchell McCaffrey
2f9a55f176 Removed overflow from token and note menu 2021-01-21 14:47:49 +11:00
Mitchell McCaffrey
f9e6d9d807 Fixed spelling in maps FAQ 2021-01-21 14:18:45 +11:00
Mitchell McCaffrey
fcb10662c6 Added connection faq docs and ignore for WebRTC support error 2021-01-21 14:18:33 +11:00
Mitchell McCaffrey
82e8eb014e Update TokenStatus.js 2021-01-21 13:58:37 +11:00
Mitchell McCaffrey
4f76652eff Added null checks to asset manifest 2021-01-21 13:51:23 +11:00
Mitchell McCaffrey
ddf3a6daed Fix bug with adding tokens when no map is selected 2021-01-21 11:29:39 +11:00
Mitchell McCaffrey
e892661016 Added checks for peer availability and fixed peer error handling 2021-01-21 08:44:46 +11:00
Mitchell McCaffrey
de3c601bb3 Added null check to useNetworkState update 2021-01-21 07:23:07 +11:00
Mitchell McCaffrey
af3839c9ff Added null check to token status 2021-01-21 07:14:32 +11:00
Mitchell McCaffrey
cf63034c0e Fix drawing null action 2021-01-21 07:12:44 +11:00
Mitchell McCaffrey
4c927c7877 Added 1.7.0 social links 2021-01-20 20:21:19 +11:00
Mitchell McCaffrey
7a13cf46bf Updated 1.7.0 release notes to prod 2021-01-20 19:51:30 +11:00
Mitchell McCaffrey
1e545b3220 Added comment to peer data progress 2021-01-20 19:20:38 +11:00
Mitchell McCaffrey
272793b1ee Fix token add to manifest 2021-01-20 19:20:21 +11:00
Mitchell McCaffrey
b2b6f281a9 Fix map grid detection 2021-01-20 18:55:42 +11:00
Nicola Thouliss
7583817f6a Added FAQ update to release notes
co-authored-by: mitchemmc <mitchemmc@gmail.com>
2021-01-20 18:44:04 +11:00
Nicola Thouliss
151e541313 Updated docs
co-authored-by: mitchemmc <mitchemmc@gmail.com>
2021-01-20 18:43:56 +11:00
Nicola Thouliss
71cce03d58 Adding question to FAQs 2021-01-20 18:10:44 +11:00
Nicola Thouliss
a0e5d320fb Removing saving.md and connection.md file 2021-01-20 18:10:44 +11:00
Nicola Thouliss
2d680dacbd Adding additional faqs 2021-01-20 18:10:44 +11:00
Mitchell McCaffrey
28b9886b06 Moved asset load callbacks to take into account database insertion time 2021-01-20 18:08:03 +11:00
Mitchell McCaffrey
435752e7a9 Moved peer connection to fully use write for backpressure 2021-01-20 18:07:23 +11:00
Mitchell McCaffrey
5a0567019a Fix map upload crash for file with no name 2021-01-19 18:40:43 +11:00
Mitchell McCaffrey
c61ff28942 Fix image drop url parameters 2021-01-19 18:40:22 +11:00
Mitchell McCaffrey
a892c09fd1 Reduced note menu back to 1 row 2021-01-14 15:40:29 +11:00
Mitchell McCaffrey
f43904d7fb Updated how to for 1.7.0 2021-01-14 15:27:52 +11:00
Mitchell McCaffrey
e91cdfcac2 Fix note text fitting for multiline support 2021-01-14 15:14:07 +11:00
Mitchell McCaffrey
d0654df19d Added ignore to LastPass error 2021-01-14 12:37:46 +11:00
Mitchell McCaffrey
7281e9b9ba Change note text input to allow for multiline editing 2021-01-14 12:36:48 +11:00
Mitchell McCaffrey
61b4c8abc3 Fix error with hidding all fog shapes, and visiual bug with hiding first fog shape 2021-01-14 11:38:52 +11:00
Mitchell McCaffrey
2311bf2b5b Update MapToken.js 2021-01-10 12:42:05 +11:00
Mitchell McCaffrey
aedc9548dd Update SocialPatreonIcon.js 2021-01-08 12:56:46 +11:00
Mitchell McCaffrey
69431c17e9 Update grid ml to use MobileNet V2 2021-01-07 11:25:25 +11:00
Mitchell McCaffrey
165c8098fb Update gettingStarted.md 2021-01-06 16:34:04 +11:00
Mitchell McCaffrey
351647dd23 Added patreon button to home page 2021-01-06 16:32:27 +11:00
Mitchell McCaffrey
a337927088 Merged master 2021-01-06 15:04:23 +11:00
Mitchell McCaffrey
2eef6ca7c4 Fixed gemstone dice colour 2021-01-05 15:33:50 +11:00
Mitchell McCaffrey
3e407f6c71 Fixed glass dice colour 2021-01-04 17:14:21 +11:00
Mitchell McCaffrey
26b474452c Removed connection logs 2021-01-04 13:44:20 +11:00
Mitchell McCaffrey
c89a75a23e Disabled multiplexing 2021-01-04 13:34:09 +11:00
Mitchell McCaffrey
bce5fb6154 Added logging to connection 2021-01-04 13:05:31 +11:00
Mitchell McCaffrey
a6f67320c5 Added v1.7.0 preview release notes 2021-01-04 12:28:42 +11:00
Mitchell McCaffrey
fd9f47e41e Added check for stage in drag overlay 2021-01-04 12:22:09 +11:00
Mitchell McCaffrey
eb0826d48c Moved to pixel per grid sizes for map resolutions 2021-01-04 10:16:25 +11:00
Mitchell McCaffrey
abd5f12269 Added a clear map call to map changes 2021-01-04 09:48:08 +11:00
Mitchell McCaffrey
30a1319298 Updated notes to always be square 2021-01-04 09:39:58 +11:00
Mitchell McCaffrey
524a6d9aea Update network partial updates to have id to prevent invalid changes 2021-01-04 09:34:25 +11:00
Mitchell McCaffrey
e3fe043a7b Clean up session logging and close 2021-01-03 17:52:14 +11:00
Mitchell McCaffrey
7693db325a Removed unused imports 2021-01-03 16:46:51 +11:00
Mitchell McCaffrey
037e4a4ab4 Added fallback for token without size 2021-01-03 16:46:22 +11:00
Mitchell McCaffrey
852d5bce81 Added force update option to useNetworkedState 2021-01-03 16:45:55 +11:00
Mitchell McCaffrey
d1315b3425 Added a larger layout for map and token select and edit 2021-01-03 14:53:06 +11:00
Mitchell McCaffrey
cf12629f82 Increased map loading overlay height 2021-01-03 12:34:37 +11:00
Mitchell McCaffrey
f8a2a1ece5 Added more checks to stage interaction 2021-01-03 12:34:01 +11:00
Mitchell McCaffrey
a4c67ce81f Removed partial updates from manifest 2021-01-03 12:12:13 +11:00
Mitchell McCaffrey
a3622979b8 Added more cases to note text update 2021-01-03 10:45:43 +11:00
Mitchell McCaffrey
02ecf9bffc Changed useNetworkState to implement a partial update mechanism 2021-01-03 10:45:24 +11:00
Mitchell McCaffrey
858c489980 Update useNetworkedState.js 2021-01-03 09:18:42 +11:00
Mitchell McCaffrey
815ca6bbe1 Added handling of uncommitted changes to networked state 2021-01-02 23:59:21 +11:00
Mitchell McCaffrey
651b0d7c6c Added konva array convert helper 2021-01-02 18:01:16 +11:00
Mitchell McCaffrey
2482196876 Fix errors with fog disappearing on zoom and crashing on zooming out 2021-01-02 18:01:04 +11:00
Mitchell McCaffrey
c90434b626 Added drop shadow to fog, and optimized it with caching 2021-01-02 12:17:27 +11:00
Mitchell McCaffrey
4adc6015f1 Changed token cache pixel ratio to use canvas ratio 2021-01-02 09:49:52 +11:00
Mitchell McCaffrey
cc7db42894 Changed hit detection for tokens to only enable when dragging a vehicle 2021-01-02 09:41:18 +11:00
Mitchell McCaffrey
dfe8f0f53b Updated black color 2021-01-02 09:31:06 +11:00
Mitchell McCaffrey
485b893fc6 Added use password option to saved settings 2021-01-02 09:28:26 +11:00
Mitchell McCaffrey
ae98b54c7b Fix drawings being erased when drawing tool not selected 2021-01-02 09:17:56 +11:00
Mitchell McCaffrey
f24156c44c Clean up imports 2021-01-02 09:13:26 +11:00
Mitchell McCaffrey
a146495326 Fix timer shifting when player state is updated 2021-01-01 14:57:56 +11:00
Mitchell McCaffrey
63129dfa14 Moved joined and left notifications to new networking 2021-01-01 14:50:11 +11:00
Mitchell McCaffrey
cbcc9ada72 Fix file maps not appearing on refresh for map owner 2021-01-01 13:56:12 +11:00
Mitchell McCaffrey
0fee1a910f Changed loading bar to be purple 2021-01-01 13:25:46 +11:00
Mitchell McCaffrey
ced66257b0 Fix progress bar not showing 2021-01-01 13:25:35 +11:00
Mitchell McCaffrey
ec3aa6ea11 Fix network state order bug 2021-01-01 13:25:19 +11:00
Mitchell McCaffrey
dd308ecab0 Added debounce to useNetworkedState 2021-01-01 13:06:56 +11:00
Mitchell McCaffrey
b9876c6a38 Fix offline mode and move to optional chaining for session socket 2021-01-01 12:44:56 +11:00
Mitchell McCaffrey
b13b46b17d Moved pointer out of player state and into separate socket event 2021-01-01 12:37:54 +11:00
Mitchell McCaffrey
501fc4377c Optimised pointer 2020-12-31 17:56:51 +11:00
Mitchell McCaffrey
12d9e64461 Fix bug with loading multiple assets at once 2020-12-12 17:36:56 +11:00
Mitchell McCaffrey
bdba2ecc13 Moved audio sharing to new network model 2020-12-12 16:30:55 +11:00
Mitchell McCaffrey
5e244617ae Changed Session event names to better match new model 2020-12-12 16:08:10 +11:00
Mitchell McCaffrey
089fd27ccf Converted custom token support to new network model 2020-12-12 15:03:24 +11:00
Mitchell McCaffrey
9265b99788 Added url support to image dropping 2020-12-11 16:36:27 +11:00
Mitchell McCaffrey
6a4c6b30ec Moved peer connections to an optional pull model 2020-12-11 13:24:39 +11:00
Mitchell McCaffrey
b40f78042f Moved party to use socket networking 2020-12-08 15:58:01 +11:00
Mitchell McCaffrey
b7da0cffa7 Added height and width check to resize handle 2020-12-05 17:16:31 +11:00
Mitchell McCaffrey
f2cb8b69db Moved to socket for game state networking 2020-12-05 17:16:06 +11:00
Mitchell McCaffrey
2847118ac1 Unified fog tool disabled icon diagonal lines 2020-12-03 17:33:16 +11:00
Mitchell McCaffrey
f1ae78612c Added fog rectangle tool 2020-12-03 17:32:41 +11:00
Mitchell McCaffrey
f5b875e101 Renamed remove fog to erase fog and changed shortcut 2020-12-03 16:53:44 +11:00
Mitchell McCaffrey
c24133813f Replaced fog subtraction with fog cutting 2020-12-03 16:52:24 +11:00
Mitchell McCaffrey
5ae6f0bc1b Added logging and preview options to .env 2020-12-03 12:29:33 +11:00
Mitchell McCaffrey
0a1c22b06f Testing preview node env 2020-12-03 11:57:30 +11:00
Mitchell McCaffrey
b65b2d4b3a Added ignore to xdr encoding failure 2020-11-28 08:55:25 +11:00
Mitchell McCaffrey
15750c2143 Added ignore to quota error 2020-11-28 08:51:56 +11:00
Mitchell McCaffrey
926f05f301 Added persistent storage permissions when uploading maps or tokens 2020-11-27 21:00:08 +11:00
Mitchell McCaffrey
951c515334 Added check for storage estimate available 2020-11-27 19:36:44 +11:00
Mitchell McCaffrey
5f572ff10d Update Session.js 2020-11-27 19:28:42 +11:00
Mitchell McCaffrey
dc46fceb4c Update Session.js 2020-11-27 19:20:57 +11:00
Mitchell McCaffrey
208911cde2 Update Session.js 2020-11-27 19:11:38 +11:00
Mitchell McCaffrey
ceb987d4fc Update Session.js 2020-11-27 18:31:21 +11:00
Mitchell McCaffrey
1b7b7179ee Update Session.js 2020-11-27 17:42:53 +11:00
Mitchell McCaffrey
19d44f3f79 Fix note crash when selecting pan tool 2020-11-27 12:23:57 +11:00
Mitchell McCaffrey
9fa8667081 Fix crash with interacting with page while loading 2020-11-27 12:02:00 +11:00
Mitchell McCaffrey
ddda241c56 Limit note and label text to 144 characters 2020-11-27 11:53:25 +11:00
Mitchell McCaffrey
309870247b Moved map loading overlay to be full screen width 2020-11-27 11:37:15 +11:00
Mitchell McCaffrey
56efa39c41 Removed unused token label image 2020-11-27 11:28:00 +11:00
Mitchell McCaffrey
5a4d879ac3 Changed start modal label to clarify password is for game 2020-11-27 11:26:56 +11:00
Mitchell McCaffrey
3cb1014ed2 Added getting started modal to home screen 2020-11-27 11:23:20 +11:00
Mitchell McCaffrey
ad9428c703 Increased line height for body 2 font 2020-11-27 11:22:58 +11:00
Mitchell McCaffrey
fca1c9fd1f Added margin to markdown list and added default props 2020-11-27 11:19:52 +11:00
Mitchell McCaffrey
700434a50c Added error message to ice servers fetch fail 2020-11-26 18:55:27 +11:00
Mitchell McCaffrey
11116e8686 Throw error when ice servers responds not ok 2020-11-26 18:54:32 +11:00
Mitchell McCaffrey
3fc8c98862 Fixed party joining 2020-11-26 18:54:11 +11:00
Mitchell McCaffrey
d231d9340e Fix styling of indexeddb disabled warning 2020-11-26 17:08:25 +11:00
Mitchell McCaffrey
025304ee44 Fix database worker for when indexeddb is disabled 2020-11-26 17:08:09 +11:00
Mitchell McCaffrey
7ac555baa0 Fix null reference error when image upload dialog is closed when image upload finishes 2020-11-26 16:32:48 +11:00
Mitchell McCaffrey
aaa793ad71 Added multi-threaded initial map and token loading 2020-11-26 16:29:10 +11:00
Mitchell McCaffrey
8160a98c49 Add quota error to sentry ignore 2020-11-26 16:27:41 +11:00
Mitchell McCaffrey
95d0509693 Added banner for quota exceeded error 2020-11-26 15:24:33 +11:00
Mitchell McCaffrey
9ee3efbadb Added storage usage summary to settings modal 2020-11-26 13:17:53 +11:00
Mitchell McCaffrey
794ba22689 Reworded offline message 2020-11-26 13:17:32 +11:00
Mitchell McCaffrey
5209317d1e Added offline mode 2020-11-26 11:09:48 +11:00
Mitchell McCaffrey
9131557b71 Merge branch 'master' into release/v1.7.0 2020-11-26 10:23:08 +11:00
Nicola Thouliss
8f3ebb8316 Revert "Add extra header options to socket io request"
This reverts commit fdb5d8c458.
2020-11-22 20:38:11 +11:00
Nicola Thouliss
fdb5d8c458 Add extra header options to socket io request 2020-11-22 20:19:32 +11:00
Nicola Thouliss
e98116c290 Revert "Added polling transport to socket io"
This reverts commit 9c91507eb3.
2020-11-22 10:47:28 +11:00
Nicola Thouliss
9c91507eb3 Added polling transport to socket io 2020-11-22 10:42:46 +11:00
Mitchell McCaffrey
575b566b53 Removed JSON parse from websocket messages 2020-11-21 16:15:04 +11:00
Mitchell McCaffrey
61d6a7bb85 Disabled sentry 2020-11-21 16:08:26 +11:00
Mitchell McCaffrey
4fee6d278a Moved handle party joined to array 2020-11-21 16:01:37 +11:00
Nicola
f028a011ca Changed transports to be websocket only 2020-11-21 15:46:36 +11:00
Mitchell McCaffrey
7346eced44 Fix vehicle tokens in Konva 7 2020-11-21 11:12:05 +11:00
Mitchell McCaffrey
b362d03bc6 Updated socket.io 2020-11-20 16:34:08 +11:00
Mitchell McCaffrey
4c301604fc Added alternating diagonals map measurement 2020-11-20 12:00:59 +11:00
Mitchell McCaffrey
c338af5557 Merge branch 'master' into release/v1.7.0 2020-11-20 09:40:43 +11:00
Mitchell McCaffrey
c54b863330 Fixed unused import warning 2020-11-20 09:24:58 +11:00