12276 Commits

Author	SHA1	Message	Date
Dean Herbert	591be33fc2	Merge branch 'master' into async-results-pages	2019-06-11 18:45:06 +09:00
Dean Herbert	86b6070ae8	Tween track frequency on pause (#4973) ... Tween track frequency on pause	2019-06-11 18:44:56 +09:00
smoogipoo	a9758ba813	Merge remote-tracking branch 'origin/master' into fix-checkbox-overlap	2019-06-11 18:26:42 +09:00
smoogipoo	e5417416a2	Remove braces	2019-06-11 18:24:50 +09:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
Dean Herbert	8de62b608e	Allow FullscreenOverlay to surface to front on subsequent Show requests	2019-06-11 15:22:27 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Lucas A	141775d98c	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-10 21:41:00 +02:00
Lucas A	2e911d0e96	Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build	2019-06-10 19:13:54 +02:00
Dean Herbert	71e15fe0f1	Fix incorrect xmldoc in OsuAnimatedButton	2019-06-11 01:21:01 +09:00
Dean Herbert	e87123342c	Load results pages asynchronously ... Reduces performance burden when first displaying pages. Closes #4977.	2019-06-10 23:51:09 +09:00
Dean Herbert	fc0fc8f164	Merge branch 'master' into backgrounded-beatmap-status-lookups	2019-06-10 19:37:35 +09:00
Dean Herbert	6ca2fcebfc	Centalise and prefix all ArchiveModelManager database logging	2019-06-10 19:34:32 +09:00
Dean Herbert	29945f27c5	Fix imported count incrementing on failures	2019-06-10 19:33:55 +09:00
Dean Herbert	54497fb1e7	Fix prefixing spaces in BeatmapInfo's ToString when metadata is not populated yet	2019-06-10 19:33:23 +09:00
Dean Herbert	6cda2cdb82	Fix exception output to use humanised model name	2019-06-10 18:41:56 +09:00
Dean Herbert	f7a699e4a2	Better documentation for import scheduler singleton	2019-06-10 18:38:03 +09:00
Dean Herbert	d7cb932606	Merge branch 'master' into selection-update	2019-06-10 17:51:40 +09:00
Dean Herbert	c8bd92659b	Clean up exception and null handling in Import process	2019-06-10 17:12:37 +09:00
Dean Herbert	559413f766	Avoid using ContinueWith in already async context	2019-06-10 17:12:25 +09:00
Dean Herbert	5b75060b94	Add test for rollback logic correctly dereferencing files	2019-06-10 16:45:45 +09:00
Dean Herbert	02b376d962	Fix rollback logic not necessrily cleaning up file store	2019-06-10 16:14:42 +09:00
Dean Herbert	fae32b3901	Return shorter class name in error messages	2019-06-10 16:14:11 +09:00
Dean Herbert	9bdc8b47bb	Remove unnecessary async-await pair	2019-06-10 16:13:51 +09:00
Dean Herbert	f31b19e0d7	Don't unwrap exception manually	2019-06-10 16:02:49 +09:00
Dean Herbert	e19f4935c3	Fix incorrect undo logic on exception	2019-06-10 14:13:36 +09:00
Dean Herbert	e4bad93b66	Use variable for web request concurrency for clarity	2019-06-10 13:52:09 +09:00
Dean Herbert	b79fdfc12f	Fix one more instance of improperly handled cancellation	2019-06-10 13:50:22 +09:00
Dean Herbert	2d1a54e634	Properly implement cancellation	2019-06-10 13:42:38 +09:00
Dean Herbert	b4d2d0bd0b	Simplify and combine concurrency of ArchiveModelManager	2019-06-10 13:42:33 +09:00
Dean Herbert	600503ec8e	Use Task.Run/Wait to avoid warnings	2019-06-10 13:42:29 +09:00
smoogipoo	f090e292c9	Move ArchiveModelManager import process to async flow	2019-06-10 13:42:22 +09:00
Lucas A	4f6978f2aa	Apply review suggestions.	2019-06-09 20:01:19 +02:00
Dean Herbert	5c2ea0b1a7	Move dispose to end of file	2019-06-10 01:14:46 +09:00
Dean Herbert	d964f6ba9e	Tween track frequency on pause	2019-06-10 00:56:35 +09:00
Dean Herbert	a5007b94db	Update resources	2019-06-09 22:31:02 +09:00
iiSaLMaN	3979dab573	Merge branch 'master' into rename-f-to-d	2019-06-09 16:04:26 +03:00
Shane Woolcock	807d434be0	Access WindowModes via IBindableList	2019-06-09 17:52:02 +09:30
Dean Herbert	cd89633dee	Rename variable to match	2019-06-09 17:07:23 +09:00
Dean Herbert	d500f3605e	Fix checkboxes with long labels overlapping nub	2019-06-09 16:48:03 +09:00
Dean Herbert	126d168527	Merge remote-tracking branch 'upstream/master' into mod-grow-improvement	2019-06-09 16:29:01 +09:00
Ganendra Afrasya	49193a2703	Rename the setting label	2019-06-09 13:12:41 +07:00
Ganendra Afrasya	afc3a08953	Use existing setting instead ... Now it read IncreaseFirstObjectVisibility bindable instead	2019-06-09 13:11:40 +07:00
iiSaLMaN	a2b9dba92c	Remove ScoreRank.F	2019-06-08 19:35:29 +03:00
iiSaLMaN	dfbc652803	Use ScoreRank.D instead of F	2019-06-08 19:32:26 +03:00
iiSaLMaN	383b937a7e	Rename F grade to D	2019-06-08 19:10:00 +03:00
Lucas A	e8c73f3127	Make APIChangelogEntry.Major a non-nullable property	2019-06-08 09:45:34 +02:00
Lucas A	342e39776a	Move ChangelogEntries populating logic from constructor to BDL load() to use OsuColour palette +apply review suggestions.	2019-06-07 20:59:56 +02:00
Ganendra Afrasya	f326264a85	Adding increase first object grow mod visibility setting	2019-06-08 00:42:57 +07:00
Lucas A	e5b64bfa39	Highlight major changes in changelog overlay	2019-06-07 18:51:43 +02:00
Dean Herbert	cd4648a647	Update framework	2019-06-07 21:09:59 +09:00
Dan Balasescu	346c4310c3	Merge branch 'master' into fail-animation	2019-06-07 20:48:36 +09:00
Dan Balasescu	6a06ea2aee	Merge branch 'master' into ruleset_fix	2019-06-07 20:36:29 +09:00
Dean Herbert	b28b59a496	Fix paginated layouts only showing one column even if enough space is available for more (#4946) ... Fix paginated layouts only showing one column even if enough space is available for more Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-06-07 20:26:34 +09:00
Dean Herbert	011ccffde7	Add an input source toggle on manual input test scenes (#4945) ... Add an input source toggle on manual input test scenes	2019-06-07 20:26:26 +09:00
Dean Herbert	1f0a19deaa	Fix preview tracks muting themselves (#4944) ... Fix preview tracks muting themselves	2019-06-07 20:26:12 +09:00
Dan Balasescu	b6896b31c9	Merge branch 'master' into fix-paginated-layout	2019-06-07 20:19:14 +09:00
Dean Herbert	8f30c9b0a3	Fix file layout of ModSelectOverlay	2019-06-07 15:58:24 +09:00
Dean Herbert	7ffc08b187	Merge branch 'master' into master	2019-06-07 15:34:14 +09:00
Dean Herbert	b914bb1e2e	Remove key hints for now ... A proper design for this will come in the future.	2019-06-07 15:32:48 +09:00
Dean Herbert	0ce5c7468f	Use switch and consume/block input	2019-06-07 15:31:23 +09:00
Dean Herbert	2531250f89	Fix paginated layouts only showing one column even if enough space is available for more	2019-06-07 14:58:04 +09:00
Dean Herbert	60b70c0f45	Use lambda for simple functions	2019-06-07 14:11:21 +09:00
Dean Herbert	1374da7c41	Remove all calls to return user input	2019-06-07 12:54:57 +09:00
Dean Herbert	0fc2c596b6	Add toggle for input priority in manual input tests	2019-06-07 12:53:51 +09:00
Dean Herbert	64d5aa318f	Apply rebased changes	2019-06-07 11:45:58 +09:00
Dean Herbert	358a08cf9d	Merge branch 'master' into OsuHoverContainer	2019-06-07 11:40:33 +09:00
Dean Herbert	9f740f69bb	Fix preview tracks muting themselves ... Closes #4937	2019-06-07 11:21:10 +09:00
EVAST9919	210437042f	Remove useless update calls in ToolbarRulesetSelector	2019-06-07 02:39:36 +03:00
Dean Herbert	b93446688c	Fix sizing of OsuAnimatedButton and OsuClickableContainer (#4898) ... Fix sizing of OsuAnimatedButton and OsuClickableContainer	2019-06-07 00:17:39 +09:00
smoogipoo	6bf6e22149	Update framework	2019-06-06 20:33:03 +09:00
smoogipoo	90966b113b	Merge remote-tracking branch 'origin/master' into ftb-prepass	2019-06-06 20:32:38 +09:00
Dean Herbert	483049703e	Merge branch 'master' into beatmap-dateadded-sort	2019-06-06 18:26:55 +09:00
smoogipoo	4d035afcc6	Add setting to bypass front-to-back	2019-06-06 16:49:42 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
Dan Balasescu	032ed033d0	Merge branch 'master' into hold-to-confirm-dim-volume	2019-06-06 15:41:49 +09:00
Dean Herbert	02283380c4	Use manual migration	2019-06-06 13:33:30 +09:00
Welsar55	c04c6693c2	Change close action from PopOut to Hide and switched to TriangleButton.Click()	2019-06-05 13:01:21 -05:00
Lucas A	a2bc5b538e	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-05 16:59:38 +02:00
Lucas A	da20be9a4b	Fetch IAPIProvider via Resolved attribute	2019-06-05 16:59:08 +02:00
Dean Herbert	8607f3b765	Merge remote-tracking branch 'upstream/master' into databased-sin-setting	2019-06-05 19:03:57 +09:00
smoogipoo	a6dc5606bc	Allow beatmapsets to be sorted by date added	2019-06-05 18:17:43 +09:00
Dean Herbert	2538f32fae	Merge branch 'osu-clickable-container' into OsuHoverContainer	2019-06-05 10:34:20 +09:00
Arphox	900cd5c484	Restore original values in FadeColour method call	2019-06-04 21:37:10 +02:00
Arphox	5f4d7437bc	Fix the issue ... When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.	2019-06-04 21:30:49 +02:00
Dean Herbert	2e3d392a9f	Mark OsuButton as abstract ... Not being used directly, so we probably shouldn't support it for now.	2019-06-04 22:12:55 +09:00
Dean Herbert	7d2a75b350	Dim music volume when holding to confirm	2019-06-04 18:37:26 +09:00
Dean Herbert	4e7f2b8f47	Merge branch 'master' into osu-clickable-container	2019-06-04 17:42:17 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
Dean Herbert	b8fc535124	Fix blueprint tests crashing due to out-of-order operations	2019-06-04 12:08:23 +09:00
Dean Herbert	80a66b8b3a	Merge remote-tracking branch 'upstream/master' into audio-refactor-update	2019-06-04 12:08:21 +09:00
smoogipoo	4763a41c7e	Cleanups	2019-06-04 11:25:18 +09:00
smoogipoo	474191fcec	Update framework	2019-06-04 11:13:21 +09:00
Dan Balasescu	6e79e374e2	Merge branch 'master' into fix-endless-tests	2019-06-04 11:07:50 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
smoogipoo	53a39e9142	Merge remote-tracking branch 'origin/master' into audio-refactor-update	2019-06-04 10:50:33 +09:00
Dean Herbert	e8315085c0	Better handle OnClick	2019-06-04 10:26:21 +09:00
EVAST9919	d5a2ebf79f	Fix endless loading state part 2	2019-06-04 04:04:33 +03:00
EVAST9919	2c71371282	Fix endless loading state	2019-06-04 02:06:15 +03:00
EVAST9919	fe6b4112c6	Adjust colors to match web design	2019-06-04 01:47:45 +03:00
EVAST9919	7e96ff7f14	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-06-04 01:32:12 +03:00
Welsar55	194bb80354	Added close button and indictors of hotkeys to buttons	2019-06-03 11:09:21 -05:00
Dean Herbert	167213d3eb	Merge branch 'master' into fix-endless-tests	2019-06-04 00:50:18 +09:00
LeNitrous	516575a132	don't create "Start Chat" option when the sender is the local user	2019-06-03 18:54:29 +08:00
LeNitrous	4e6d7137aa	disallow current user from opening their own private channel	2019-06-03 17:25:19 +08:00
Dean Herbert	633c3b74ec	Don't handle clicks when in a loading state	2019-06-03 17:10:33 +09:00
Dean Herbert	c4f4f32db8	Shorten fade duration	2019-06-03 17:10:33 +09:00
Dean Herbert	491c9e96e0	Fix tests not ending execution after some exceptions	2019-06-03 16:42:27 +09:00
Dean Herbert	171fc14776	Fix editor regressions	2019-06-03 16:34:09 +09:00
Welsar55	fa331fbee1	Merge branch 'master' of https://github.com/ppy/osu	2019-06-03 01:23:25 -05:00
Dean Herbert	65e3b7c2ae	Remove unused DI	2019-06-03 13:58:55 +09:00
Dean Herbert	e55f5efa82	Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build	2019-06-03 13:55:23 +09:00
Dean Herbert	cf9bc831ab	Merge branch 'master' into osu-clickable-container	2019-06-03 13:55:08 +09:00
Dean Herbert	3ef17a54f6	Fix sizing of OsuAnimatedButton and OsuClickableContainer ... Was incorrect under some combinations of relative and autosize usage.	2019-06-03 13:53:24 +09:00
Dean Herbert	4e5788959e	Make clickable text actually a button	2019-06-03 13:38:06 +09:00
Dean Herbert	115a75e4c6	Use a constant for lazer variables	2019-06-03 13:16:05 +09:00
Dean Herbert	dff7053a07	Merge branch 'master' into more_button_update	2019-06-03 11:48:05 +09:00
Dean Herbert	2d15e02406	Merge branch 'master' into selection-update	2019-06-03 11:47:30 +09:00
Lucas A	d8f45f7299	Disallow null references for dependencies loaded via load()	2019-06-02 15:17:03 +02:00
Lucas A	0a867e37af	Resolve dependencies via Resolved Attribute	2019-06-02 12:40:18 +02:00
Lucas A	58564579e4	Invert if statement	2019-06-01 08:46:38 +02:00
Lucas A	0625f51e65	Allow dependencies to be null in certain cases (Unit tests)	2019-05-31 22:42:09 +02:00
Lucas A	55c0c6a1bb	Show changelog for current build by clicking on settings footer in settings overlay.	2019-05-31 17:43:58 +02:00
Lucas A	b3f6640d11	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-31 12:41:26 +02:00
Dean Herbert	32a2aba631	Merge branch 'master' into logo-idle	2019-05-31 18:50:28 +09:00
Dean Herbert	b20ea93906	Merge branch 'master' into audio-refactor-update	2019-05-31 14:58:53 +09:00
Dean Herbert	b52276c489	Pass individual components to DummyWorkingBeatmap, not game	2019-05-31 14:51:12 +09:00
Dean Herbert	f33a5bc54c	Centralise and update WorkingBeatmap creation in test cases	2019-05-31 14:40:53 +09:00
Dean Herbert	80d65f9a3b	Update resource stores with GetAvailableResources	2019-05-31 14:33:18 +09:00
Dean Herbert	1629534a0c	More disposal?	2019-05-31 14:28:53 +09:00
David Zhao	465aa4e0f6	Prevent idle state from being updated incorrectly	2019-05-31 14:06:18 +09:00
smoogipoo	d7ccf939d8	General refactoring	2019-05-31 13:54:40 +09:00
smoogipoo	e7ae9c249f	Fix size of release stream separator in listing	2019-05-31 13:53:55 +09:00
smoogipoo	57d648df6d	Add comment + fix spinlocking	2019-05-31 13:38:48 +09:00
smoogipoo	4dc77d64a3	Fix overlay group + depth	2019-05-31 13:23:50 +09:00
smoogipoo	f780c80c17	Fix bar not expanding/collapsing correctly	2019-05-31 13:08:35 +09:00
smoogipoo	c211f1d0fe	Merge remote-tracking branch 'Joehuu/master' into changelog-overlay	2019-05-31 12:28:28 +09:00
EVAST9919	fe9e53e383	Add a testcase	2019-05-30 23:07:04 +03:00
EVAST9919	2933169614	Move the button into a separate class	2019-05-30 22:55:59 +03:00
EVAST9919	73fb28f9f7	Make the button inherit from OsuHoverContainer	2019-05-30 22:48:27 +03:00
EVAST9919	877fe97107	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-05-30 22:17:22 +03:00
Dean Herbert	c950f37497	Ad missing link	2019-05-30 16:57:54 +09:00
Dean Herbert	e5999dd9b1	Update font sizes to match web	2019-05-30 16:49:18 +09:00
EVAST9919	9a13c52ffd	Add missing lines	2019-05-29 21:19:03 +03:00
EVAST9919	97dbc95bc6	Kudosu section update	2019-05-29 21:02:20 +03:00
HoLLy	2a295545a7	Don't mutate strainPeaks	2019-05-29 11:25:25 +02:00
HoLLy	7e9f5a0939	Add Skills to DifficultyAttributes	2019-05-29 11:22:51 +02:00
Dean Herbert	a1cc8c448f	Update TrackVirtual consumption	2019-05-29 16:43:27 +09:00
Dean Herbert	08ab1e5df7	Use new ITrackStore interface	2019-05-29 16:43:15 +09:00
David Zhao	4f09141718	remove extra bool	2019-05-29 12:22:34 +09:00
EVAST9919	5169e31d54	Fix CI issues	2019-05-28 19:53:00 +03:00
EVAST9919	19fbab6892	Applied suggested changes	2019-05-28 19:39:31 +03:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
EVAST9919	857eb9b83a	Fix CI stuff	2019-05-28 17:21:34 +03:00
EVAST9919	6ca3bd086f	ShowMore button update	2019-05-28 17:04:05 +03:00
David Zhao	1a871af552	Fix hide selection, add test	2019-05-28 19:15:29 +09:00
Dean Herbert	23b5d30360	Remove csproj changes	2019-05-28 17:10:46 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
David Zhao	e59a00ac6e	Remove excessive selection updating	2019-05-28 14:04:33 +09:00
Dan Balasescu	5742984c97	Merge branch 'master' into settings-flexibility	2019-05-28 13:35:06 +09:00
Dan Balasescu	0d2eef68b2	Merge branch 'master' into settings-flexibility	2019-05-28 13:21:33 +09:00
Dan Balasescu	4852519259	Merge branch 'master' into isolate-checkbox-alpha	2019-05-28 13:12:12 +09:00
Dean Herbert	31e6a4fa59	Add optional skin foreign key to databased settings	2019-05-27 01:56:19 +09:00
Dean Herbert	127858d398	Store databased settings based on string keys rather than ints ... Allows for rearranging/removal from enums without consequence.	2019-05-27 01:53:49 +09:00
Dean Herbert	e7b9d1efa3	Isolate alpha usage in OsuCheckbox	2019-05-27 01:49:24 +09:00
Dean Herbert	02e2fb963a	Tidy up how subpanels are handled in SettingsOverlay	2019-05-27 01:48:21 +09:00
Dean Herbert	53b2245330	Move common settings sub-panel logic to own class	2019-05-27 01:47:23 +09:00
Dean Herbert	b9f6372c3f	Fix Aquatico font lookups	2019-05-25 22:11:11 +09:00
Dean Herbert	601b25f05e	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-25 19:10:44 +09:00
Lucas A	a819dd764f	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-25 11:02:19 +02:00
EVAST9919	69ada11f41	use constant value	2019-05-24 20:01:47 +03:00
EVAST9919	cda97a61fa	Add a bit of smoothness to the rank graph	2019-05-24 19:43:53 +03:00
Dean Herbert	cc256614b9	Merge branch 'master' into changelog-overlay	2019-05-24 11:13:48 +09:00
Dean Herbert	a272004610	Use a more friendly set method for tab control	2019-05-24 11:04:36 +09:00
Dean Herbert	8f87e8ad7f	Merge branch 'master' into fix-beatmap-background-never-removed	2019-05-24 10:41:12 +09:00
Dean Herbert	e034b3d514	Use TaskCompletionSource in a better manner	2019-05-23 19:08:44 +09:00
Dean Herbert	acaf2f9fbb	Show changelog from new build notification	2019-05-23 18:54:42 +09:00
Dean Herbert	774ef87868	Merge branch 'update-framework' into HoutarouOreki-changelog-overlay	2019-05-23 17:58:56 +09:00
Dean Herbert	9c6fbebb67	Update framework	2019-05-23 17:55:18 +09:00
Dean Herbert	0bce7241d2	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-23 17:54:13 +09:00
smoogipoo	f0d7728e81	Fix failures with a null-model	2019-05-23 17:01:22 +09:00
smoogipoo	7971261fbc	Don't create a new drawable for the first background	2019-05-23 15:59:22 +09:00
Dan Balasescu	27504cf81b	Merge branch 'master' into fix-preview-state	2019-05-23 13:49:33 +09:00
Dean Herbert	7229975fef	Further minor refactoring	2019-05-23 12:41:45 +09:00
Dean Herbert	372c5b081c	Fix audio preview buttons not correctly handling load failure states ... Closes #4593.	2019-05-23 12:07:49 +09:00
Dean Herbert	5a887dabfe	Prepare changelog api requests to work when not logged in	2019-05-23 11:41:37 +09:00
Dean Herbert	cb62008280	Cleanup pass	2019-05-23 11:23:37 +09:00
Dean Herbert	a0ddc6d77a	Use linq instead of a temporary sorted list	2019-05-23 00:13:59 +09:00
Dean Herbert	c96d7bfb67	Centralise font specification	2019-05-23 00:13:47 +09:00
Dean Herbert	ba98c68cbd	Add support for osu! user links	2019-05-23 00:11:26 +09:00
Dean Herbert	81e42041e6	Move update streams inside header content	2019-05-22 23:56:50 +09:00
Dean Herbert	661fc01e7d	Fix date string	2019-05-22 23:49:54 +09:00
Dean Herbert	66f5dbaa9f	Fix badge state regressions from tab control usage	2019-05-22 23:44:37 +09:00
Dean Herbert	b588638740	Use TabControl instead of custom logic	2019-05-22 19:51:16 +09:00
Dean Herbert	9f9e86f18c	Rename classes and fix back-to-front state	2019-05-22 17:04:21 +09:00
Dean Herbert	1d5b7cdec0	Add ExpandingBar UI element	2019-05-22 16:44:47 +09:00
Dean Herbert	92c991494d	Fix (and rename) ExpandingBar	2019-05-22 16:38:15 +09:00
Welsar55	9e1f2d4fbc	Added ability to reset all mods by pressing 1 as present on stable.	2019-05-21 21:48:09 -05:00
Dean Herbert	8025a97b2b	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-21 17:18:23 +09:00
Dean Herbert	0e8517ebae	Update framework (#4837) ... Update framework	2019-05-21 17:16:49 +09:00