18549 Commits

Author	SHA1	Message	Date
smoogipoo	e1142b424d	Fix test failures	2020-04-22 18:14:21 +09:00
smoogipoo	8b0274fedd	Remove obsolete methods	2020-04-22 17:55:50 +09:00
smoogipoo	9c22d2f1dd	Use platform bindings for editor actions	2020-04-22 17:41:24 +09:00
smoogipoo	3b805daa0b	Fix hold note end time being written incorrectly	2020-04-22 16:40:07 +09:00
smoogipoo	7cdc9a599c	Fix mania holds written as spinners	2020-04-22 16:27:07 +09:00
Dean Herbert	223c822e57	Merge branch 'master' into all-ruleset-encoders	2020-04-22 13:04:16 +09:00
Dean Herbert	aaa0f908d5	Merge pull request #8818 from smoogipoo/fix-beatmap-encoder ... Fix beatmap encoder by enabling untested test cases	2020-04-22 13:03:56 +09:00
smoogipoo	07a73ba83c	Merge branch 'master' into rulesetstore-ruleset-dir	2020-04-22 10:23:04 +09:00
Dean Herbert	360c9f8e38	Add test coverage and handle null creator	2020-04-22 09:19:34 +09:00
Dean Herbert	0c74f1aaa9	Fix now playing output showing empty brackets when no difficulty specified	2020-04-22 09:08:33 +09:00
smoogipoo	d8fdd73e17	Implement IHasCurve on DrumRoll	2020-04-22 09:06:04 +09:00
smoogipoo	ea0ebc8527	Implement beatmap encoding for all legacy rulesets	2020-04-22 09:06:04 +09:00
smoogipoo	d27ca725f9	Use IEnumerable<T> instead	2020-04-22 09:04:44 +09:00
smoogipoo	516e6a4bb1	Fix overlapping control points not written correctly	2020-04-22 09:04:44 +09:00
smoogipoo	1421e876b1	Remove implicit new combo from spinners	2020-04-22 09:04:44 +09:00
smoogipoo	d8d85e5b08	Don't output certain properties if they don't exist	2020-04-22 09:04:44 +09:00
smoogipoo	3093c3e185	Fix custom sample set not being written correctly	2020-04-22 09:04:44 +09:00
smoogipoo	a702a521f8	Fix not being able to serialise converted beatmaps	2020-04-22 09:04:44 +09:00
Dean Herbert	6193b80589	Update framework	2020-04-21 21:20:57 +09:00
Dean Herbert	231a2b9f81	Merge pull request #8821 from peppy/replace-direct-overlay ... Replace direct overlay with new beatmaplisting overlay	2020-04-21 21:19:33 +09:00
Dean Herbert	ed9663985b	Rename panels	2020-04-21 20:55:33 +09:00
Dan Balasescu	6e68728ade	Merge branch 'master' into fix-beatmap-listing-focus	2020-04-21 20:05:13 +09:00
smoogipoo	a41ac50e2f	Line widths should not receive scale factor	2020-04-21 17:15:06 +09:00
smoogipoo	b8a1831d98	Read line widths from skin	2020-04-21 17:14:04 +09:00
Dean Herbert	9b9b710ded	Move and rename remaining direct classes	2020-04-21 16:41:07 +09:00
Dean Herbert	1cec0575b7	Remove unused classes and replace overlay in game	2020-04-21 16:38:47 +09:00
Dean Herbert	594cef1473	Fix BeatmapListingOverlay not taking focus	2020-04-21 16:35:24 +09:00
Dean Herbert	c3b36d8f20	Merge pull request #7924 from EVAST9919/beatmap-listing-expanded ... Implement sorting by genre and language in BeatmapListingOverlay	2020-04-21 16:34:59 +09:00
Dean Herbert	aa153290a9	Merge pull request #8815 from smoogipoo/fix-controlpoint-decode ... Fix control point overriding working incorrectly	2020-04-21 16:18:50 +09:00
Dean Herbert	eeb7612010	Update DirectOverlay implementation	2020-04-21 15:40:10 +09:00
Dean Herbert	c2ed6491a9	Move and shorten enum names	2020-04-21 15:39:15 +09:00
Dean Herbert	89320b510c	Apply class renaming	2020-04-21 15:13:19 +09:00
smoogipoo	fcfb2b9026	Merge branch 'master' into fix-select-new-from-sub-screen	2020-04-21 14:36:53 +09:00
Dean Herbert	1e683fe553	Merge pull request #8814 from smoogipoo/allcontrolpoint-serialisation ... Don't serialise AllControlPoints	2020-04-21 14:31:19 +09:00
smoogipoo	72fb34f82c	Fix overriding control points incorrectly	2020-04-21 14:19:05 +09:00
smoogipoo	9252b7876b	Don't serialise AllControlPoints	2020-04-21 13:58:23 +09:00
Dean Herbert	af32f51116	Merge pull request #8800 from iiSaLMaN/allow-cancelling-completion ... Fix results screen pushed after rewinding in-between push delay	2020-04-21 12:49:49 +09:00
Dean Herbert	a91c63819b	Refactor updateCompletionState implementation for legibility and code share	2020-04-21 11:55:28 +09:00
Dean Herbert	5a2129da7c	Merge branch 'master' into allow-cancelling-completion	2020-04-21 11:22:37 +09:00
Dan Balasescu	f16ae522b7	Merge branch 'master' into taiko-drumroll-skinning	2020-04-21 11:16:34 +09:00
Dan Balasescu	3b3a7bdd85	Merge branch 'master' into scroll-to-center	2020-04-21 10:21:08 +09:00
Bartłomiej Dach	e3cd3cf1da	Convert to auto-properties	2020-04-20 21:43:07 +02:00
Bartłomiej Dach	9b6e26583b	Add xmldocs	2020-04-20 21:42:43 +02:00
Lucas A	a541f92682	Resolve ruleset dependencies on game core / framework assemblies by checking already loaded assemblies in AppDomain.	2020-04-20 13:56:15 +02:00
Dean Herbert	a842f17630	Merge branch 'master' into taiko-drumroll-skinning	2020-04-20 20:48:41 +09:00
Dean Herbert	8ebc2ae03d	Never run subtree masking	2020-04-20 20:48:35 +09:00
Dan Balasescu	ea77fc222d	Merge pull request #8810 from peppy/fix-web-request-result ... Fix inline executions of APIRequest.Perform not getting result populated early enough	2020-04-20 20:23:08 +09:00
Dan Balasescu	6ba1bef683	Merge pull request #8771 from EVAST9919/dashboard-overlay-new ... Replace SocialOverlay with DashboardOverlay	2020-04-20 20:22:37 +09:00
Dan Balasescu	4cb57f8205	Merge pull request #8769 from peppy/fix-osu-hidden-mod-alt ... Fix spinners being considered the "first object" for increased visibility in hidden	2020-04-20 19:51:15 +09:00
Dean Herbert	cf41b90193	Merge branch 'master' into dashboard-overlay-new	2020-04-20 18:25:47 +09:00
Dean Herbert	b3d4b4a3f4	Add back missing fill flow	2020-04-20 18:25:39 +09:00
dependabot-preview[bot]	3f3ff5fdb1	Bump Humanizer from 2.7.9 to 2.8.2 ... Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.9 to 2.8.2. - [Release notes](https://github.com/Humanizr/Humanizer/releases) - [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md) - [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.9...v2.8.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-20 09:24:40 +00:00
Dean Herbert	801f02a3d7	Fix inline executions of APIRequest.Perform not getting result populated early enough	2020-04-20 17:48:02 +09:00
Dan Balasescu	eb7b04d8bc	Merge branch 'master' into fix-osu-hidden-mod-alt	2020-04-20 17:47:27 +09:00
Dan Balasescu	477d519df3	Merge branch 'master' into beatmap-listing-expanded	2020-04-20 17:18:18 +09:00
Dan Balasescu	0428ea4dac	Merge pull request #8779 from peppy/fix-song-select-desync ... Fix presenting new ruleset and beatmap at once causing wedge display desync	2020-04-20 16:02:16 +09:00
Dean Herbert	e61a90d469	Throw instead of returning zero	2020-04-20 15:50:48 +09:00
Dean Herbert	8766886b24	Merge branch 'master' into fix-select-new-from-sub-screen	2020-04-20 15:38:43 +09:00
Dean Herbert	c759bcc893	Merge branch 'dashboard-overlay-new' of https://github.com/EVAST9919/osu into dashboard-overlay-new	2020-04-20 15:35:04 +09:00
Dean Herbert	6b89c638c9	Move load to bdl	2020-04-20 15:34:48 +09:00
Dean Herbert	8d3f6ee463	Merge branch 'master' into dashboard-overlay-new	2020-04-20 15:33:23 +09:00
Dean Herbert	99e13b8ed9	Add better xml documentation and extract fetch method	2020-04-20 15:32:50 +09:00
Dean Herbert	5464746d3d	Switch to using CompositeDrawable	2020-04-20 15:25:58 +09:00
Dan Balasescu	367c3e69c4	Merge pull request #8788 from peppy/fix-editor-hard-crash ... Fix hard crash in editor on legacy modes without encoder implementation	2020-04-20 15:25:48 +09:00
Dan Balasescu	dd7c6a83bd	Merge branch 'master' into fix-song-select-desync	2020-04-20 15:23:19 +09:00
Dean Herbert	f26c080512	Merge branch 'master' into dashboard-overlay-new	2020-04-20 15:19:03 +09:00
Dan Balasescu	ddc5489fc9	Merge pull request #8801 from peppy/add-np-command ... Add /np (now playing) command support in chat	2020-04-20 14:07:39 +09:00
Dean Herbert	ee1ccb8bcb	Fix in a slightly different and hopefully more understandable way	2020-04-20 14:03:55 +09:00
Dean Herbert	f56b85ce27	Merge branch 'master' into fix-song-select-desync	2020-04-20 12:54:32 +09:00
Salman Ahmed	4c945b5feb	Merge remote-tracking branch 'upstream/master' into allow-cancelling-completion	2020-04-20 06:43:30 +03:00
Salman Ahmed	e12e3391fb	Base wait steps duration on the delay used for results display ... With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.	2020-04-20 06:42:33 +03:00
Salman Ahmed	6f233917b1	Centralize updating HasCompleted bindable logic	2020-04-20 06:40:51 +03:00
Dean Herbert	f3fee73441	Fix DatabasedKeyBindingContainer not using defaults for non-databased ruleset	2020-04-20 09:35:00 +09:00
Endrik Tombak	b57d709d15	Don't use Parent	2020-04-19 18:29:06 +03:00
Endrik Tombak	a8bfd21f3f	Merge branch 'master' of https://github.com/ppy/osu into scroll-to-center	2020-04-19 18:21:34 +03:00
Bartłomiej Dach	1dcb0f53a2	Fix whitespace formatting	2020-04-19 16:29:32 +02:00
Lucas A	ba1c465edf	Add comment in regards to the attaching of event handler to the assembly lookup event before call to loadUserRulesets().	2020-04-19 15:26:00 +02:00
Dean Herbert	07b8ef83c9	Add /np to help line	2020-04-19 22:15:07 +09:00
Lucas A	a7179d1c87	Fix comment wording ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-04-19 15:15:04 +02:00
Dean Herbert	3444227a91	Merge branch 'master' into add-np-command	2020-04-19 22:14:37 +09:00
Dean Herbert	48cf7becd1	Merge branch 'master' into catch-hyperdash-fruit-colouring	2020-04-19 21:48:41 +09:00
Dean Herbert	1dd471dfcc	Add /np (now playing) command support in chat	2020-04-19 15:13:25 +09:00
Salman Ahmed	6d276890a7	Fix results screen pushed after rewinding in-between push delay	2020-04-19 05:59:56 +03:00
Salman Ahmed	7e64bec94f	Use HasCompleted in Player	2020-04-19 05:58:22 +03:00
Salman Ahmed	fc6c245de5	Replace all judged event logic with HasCompleted bindable	2020-04-19 05:36:04 +03:00
Dean Herbert	6b16908c05	Move todo to appease dotnet-format	2020-04-18 21:51:37 +09:00
Dean Herbert	c00a386ff6	Remove exceptions instead	2020-04-18 21:46:04 +09:00
Dean Herbert	61e3491e60	Fix hard crash in editor on legacy modes without encoder implementation	2020-04-18 12:59:22 +09:00
Dean Herbert	f875ad6ba1	Merge branch 'master' into timing-equivalence	2020-04-17 23:48:09 +09:00
Dean Herbert	5f3ed3e93a	Update framework	2020-04-17 22:25:24 +09:00
Dean Herbert	d4788e39bb	Merge branch 'master' into taiko-drumroll-skinning	2020-04-17 19:30:18 +09:00
Dean Herbert	5833a7ac91	Fix presenting new ruleset and beatmap at once causing wedge display desync	2020-04-17 18:56:17 +09:00
Dan Balasescu	4e22e569f5	Merge branch 'master' into timing-equivalence	2020-04-17 17:12:38 +09:00
smoogipoo	0fba93bf65	Add back null check	2020-04-17 17:10:13 +09:00
smoogipoo	9aac98664c	Remove unnecessary time property	2020-04-17 17:06:12 +09:00
smoogipoo	69fb984e71	Remove EquivalentTo() and Equals()	2020-04-17 17:04:09 +09:00
Andrei Zavatski	c5a343d3a0	Fix overlay accepting state changes while hidden	2020-04-16 14:10:39 +03:00
smoogipoo	ae210d567d	Add temporary solution for tick hit/miss count	2020-04-16 18:16:08 +09:00
Dean Herbert	d62094cd4b	Fix carousel not correctly updating when selection changes to a new beatmap from a child screen	2020-04-16 18:10:35 +09:00
Andrei Zavatski	87f52b8233	Remove redundant switch section	2020-04-16 12:09:44 +03:00
Andrei Zavatski	eb86be0a6d	Adjust header content margin	2020-04-16 12:07:38 +03:00
Andrei Zavatski	894598eb22	Replace SocialOverlay with DashboardOverlay	2020-04-16 12:05:51 +03:00
Andrei Zavatski	29bea4e11c	Implement OverlayView component	2020-04-16 11:42:21 +03:00
Dean Herbert	2ab4a7293e	Clean up enum sorting attribute code	2020-04-16 17:26:09 +09:00
Andrei Zavatski	ef0da9e3e8	Basic overlay layout implementation	2020-04-16 11:01:36 +03:00
Dean Herbert	86e8aaa2f4	Merge branch 'master' into beatmap-listing-expanded	2020-04-16 16:15:40 +09:00
Dean Herbert	9dda7da489	Fix spinners being considered the "first object" for increased visibility in hidden	2020-04-16 14:11:38 +09:00
Dean Herbert	5ec8d49241	Merge pull request #8764 from smoogipoo/disable-undo-redo ... Disable undo/redo menu items when they can't be performed	2020-04-16 13:47:23 +09:00
smoogipoo	9e2be6f2f4	Remove bindable to promote one-way access	2020-04-16 13:25:08 +09:00
Dean Herbert	03a74a4320	Apply same conditional check changes to DrawableCarouselBeatmapSet	2020-04-16 12:13:26 +09:00
Dean Herbert	91b13f91ea	Add exception disallowing potential edit when disabled at a property level	2020-04-16 12:11:12 +09:00
Dean Herbert	c4caf38feb	Simplify menu item checks (and add for other items)	2020-04-16 12:10:20 +09:00
Dean Herbert	255ae0ea61	Merge branch 'master' into hide-edit-item-multiplayer	2020-04-16 11:46:10 +09:00
Dean Herbert	4eefe47ce3	Merge branch 'master' into fix-0-customsampleset	2020-04-16 11:20:31 +09:00
Joehu	e2b28bfe88	Hide edit context menu item in multiplayer song select	2020-04-15 18:17:12 -07:00
Dean Herbert	18c28390ef	Setup drumroll testing	2020-04-15 16:29:39 +09:00
smoogipoo	ce21cfbb03	Use bindables in menu items	2020-04-15 16:17:34 +09:00
smoogipoo	e8c955ed9b	Add CanUndo/CanRedo bindables	2020-04-15 16:17:17 +09:00
smoogipoo	102c1d9095	Add disabled state to menu items	2020-04-15 16:17:17 +09:00
Dean Herbert	c0a1aae63a	Merge branch 'master' into beatmap-listing-expanded	2020-04-15 13:26:16 +09:00
smoogipoo	44981431c5	Remove suffix hackery	2020-04-14 21:33:32 +09:00
smoogipoo	b29957798f	Fix no audiomanager in test scene working beatmap	2020-04-14 21:05:42 +09:00
smoogipoo	6935221463	Improve logic for CSB transfer	2020-04-14 21:05:07 +09:00
smoogipoo	f3dbddd75c	Update bindings in LoadComplete()	2020-04-14 15:52:38 +09:00
smoogipoo	b8b334ca27	Always unbind bindings	2020-04-14 15:21:56 +09:00
smoogipoo	3183827329	Reorder fields	2020-04-14 15:09:31 +09:00
smoogipoo	7d2d0785fd	Fix potential unsafe ordering of binds	2020-04-14 15:07:32 +09:00
smoogipoo	9619fb9f6a	Remove bind in Player	2020-04-14 15:00:36 +09:00
Dan Balasescu	ac8a3efc46	Merge branch 'master' into low-hp-red-layer	2020-04-14 14:47:01 +09:00
Dan Balasescu	33f7e429a8	Merge pull request #8444 from LittleEndu/select-recommended ... Make beatmap carousel select recommended difficulties	2020-04-14 14:25:17 +09:00
Dan Balasescu	79a306cb79	Merge pull request #8714 from peppy/dummy-api-request-support ... Add support for testing arbitrary API requests/responses via Dummy API	2020-04-14 14:08:54 +09:00
Dan Balasescu	eb968d2bdb	Merge branch 'master' into timing-equivalence	2020-04-14 14:02:02 +09:00
Dan Balasescu	948e225e12	Merge branch 'master' into select-recommended	2020-04-14 13:59:03 +09:00
Dan Balasescu	d965baa4bd	Merge branch 'master' into dummy-api-request-support	2020-04-14 13:42:42 +09:00
Dan Balasescu	2d2c8700b4	Merge branch 'master' into fix-missing-background-when-video	2020-04-14 13:29:33 +09:00
Dean Herbert	c5f8bbb25f	Fix beatmap background not displaying when video is present	2020-04-14 11:56:37 +09:00
Dean Herbert	68c25c38a7	Merge branch 'master' into no-video-option	2020-04-14 11:36:31 +09:00
Dean Herbert	081a02f748	Merge branch 'master' into catch-hyperdash-fruit-colouring	2020-04-14 10:01:15 +09:00
Bartłomiej Dach	06407a1081	Merge branch 'master' into fix-classic-scoring	2020-04-14 02:13:45 +02:00
Bartłomiej Dach	13c81db0cf	Fix incorrect classic score formula ... Upon closer inspection the classic score formula was subtly wrong. The version given in the wiki is: Score = Hit Value + (Hit Value * ((Combo multiplier * Difficulty multiplier * Mod multiplier) / 25)) The code previously used: bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1) * scoreMultiplier) / 25); which is not equivalent to the version on the wiki. The error is in the 1 factor, as in the above version it is being divided by 25, while it should be outside the division to keep parity with the previous formula. The tests attached in the previous commit demonstrate that this change causes a single hit without combo to increase total score by its exact numeric value.	2020-04-14 01:09:58 +02:00
Endrik Tombak	d9c91fb943	Merge branch 'master' of https://github.com/ppy/osu into no-video-option ... Conflicts: osu.Game/Overlays/Direct/PanelDownloadButton.cs	2020-04-13 17:40:28 +03:00
Endrik Tombak	13812fef4c	Replace BindTo with setting the bindable	2020-04-13 17:28:02 +03:00
Dean Herbert	bdec4ca2b4	Merge pull request #8736 from smoogipoo/fix-red-point-placement ... Rework slider control point placement to improve path progression	2020-04-13 22:30:49 +09:00
Dean Herbert	89d8063588	Add support for Perform/PerformAsync	2020-04-13 21:35:35 +09:00
Dean Herbert	1c8a71b284	Exception instead of assert	2020-04-13 21:24:47 +09:00
Dean Herbert	e2a49ebf32	Merge pull request #8741 from peppy/limit-max-history ... Limit upper number of editor beatmap states saved to 50	2020-04-13 21:16:58 +09:00
Dean Herbert	63de493c85	Merge branch 'master' into fix-red-point-placement	2020-04-13 20:56:50 +09:00
Dean Herbert	69c371d1f5	Merge pull request #8740 from EVAST9919/scroll-to-top-overlays ... Use OverlayScrollContainer for overlays	2020-04-13 20:49:41 +09:00
Dean Herbert	2388799acf	Limit upper number of editor beatmap states saved to 50	2020-04-13 20:37:46 +09:00
Dean Herbert	64422fbf6d	Merge pull request #8697 from smoogipoo/more-change-state-support ... Add change state support to more Editor components	2020-04-13 20:19:04 +09:00
Dean Herbert	0be2dc9b2d	Tidy up SectionsContainer class layout/ordering	2020-04-13 20:13:48 +09:00
smoogipoo	58a7313091	Fix fallback for file hit samples	2020-04-13 20:09:17 +09:00
Dan Balasescu	71d7ab3ba7	Merge pull request #8711 from peppy/taiko-hit-skinning ... Add basic taiko "hit" skinning support	2020-04-13 20:00:53 +09:00
smoogipoo	cee4b005e6	Fix custom sample set 0 not falling back to default samples	2020-04-13 20:00:06 +09:00
Dean Herbert	ca5971578a	Merge branch 'master' into more-change-state-support	2020-04-13 19:13:07 +09:00
Dean Herbert	ef5e88dd82	Merge pull request #8696 from smoogipoo/editor-undo-redo ... Add undo/redo support to the Editor	2020-04-13 19:12:47 +09:00
Dan Balasescu	63c3139d22	Merge branch 'master' into taiko-hit-skinning	2020-04-13 18:48:26 +09:00
Andrei Zavatski	4c5d01a611	Remove unused usings	2020-04-13 12:34:51 +03:00
Andrei Zavatski	b741e359cd	Use OverlayScrollContainer for overlays	2020-04-13 12:23:28 +03:00
Dean Herbert	0e88c28060	Merge branch 'editor-undo-redo' into more-change-state-support	2020-04-13 18:07:00 +09:00
Dan Balasescu	5416b2d2ff	Merge branch 'master' into stereo-shifted-playback	2020-04-13 17:51:05 +09:00
Dan Balasescu	2fd6555f2a	Merge branch 'master' into stereo-shifted-playback	2020-04-13 17:28:41 +09:00
Dean Herbert	6aab19413c	Rename differ to patcher, add xmldoc	2020-04-13 17:20:20 +09:00
Dean Herbert	bb53f96c71	Store states as byte[] instead of Streams	2020-04-13 17:18:50 +09:00
Andrei Zavatski	1e3251e3e9	Remove excessive logic	2020-04-13 10:59:53 +03:00
Andrei Zavatski	b8ecc41667	Add comment	2020-04-13 10:52:34 +03:00
Andrei Zavatski	29dd225205	Make button protected	2020-04-13 10:45:15 +03:00
Dean Herbert	0c60dbe796	Merge branch 'master' into editor-undo-redo	2020-04-13 16:03:53 +09:00
Dean Herbert	39b5c9f396	Merge branch 'master' into overlay-scroll-container	2020-04-13 15:44:20 +09:00
smoogipoo	bde0b259c1	Improve slider placement test scene	2020-04-13 15:31:54 +09:00
Dean Herbert	142cddfb10	Rename CurrentBeatmap to SelectedBeatmap	2020-04-13 15:13:35 +09:00
Dean Herbert	72fb466a0b	Merge branch 'master' into present-from-overlay	2020-04-13 15:01:24 +09:00
Andrei Zavatski	b4800dd461	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container	2020-04-13 08:09:17 +03:00
smoogipoo	f38b64d201	Fix placement blueprints handling double clicks	2020-04-13 13:57:15 +09:00
Dean Herbert	c51bad0e35	Cache ManiaPlayfield instead	2020-04-13 13:42:21 +09:00
Dean Herbert	cdff6060d3	Remove recursive hierarchy traversal for mania sample balance	2020-04-13 13:01:27 +09:00
Dean Herbert	65b96079a0	Move dampening to base implementation and change range to 0..1	2020-04-13 13:01:02 +09:00
Endrik Tombak	633b969017	Apply review suggestions	2020-04-12 21:57:35 +03:00
Bartłomiej Dach	3efb4aba25	Use BindTarget	2020-04-12 19:48:15 +02:00
Endrik Tombak	b475316a4e	Simplify and comment	2020-04-12 20:40:08 +03:00
Endrik Tombak	3b9e0fa67d	Use readonly IBindable	2020-04-12 19:42:28 +03:00
Endrik Tombak	ed28e8c8f5	Rename param	2020-04-12 19:38:09 +03:00
Endrik Tombak	ecd25e567d	Present selected difficulty	2020-04-12 16:00:05 +03:00
TheWildTree	07dc277321	Remove unused changelog comments class	2020-04-12 14:55:42 +02:00
Endrik Tombak	63a1686dfb	Scroll to screen middle	2020-04-12 12:42:52 +03:00
Dean Herbert	c5d6c7728a	Update resources	2020-04-12 18:29:25 +09:00
Andrei Zavatski	7a9ee907bf	Fix incorrect button state in some cases	2020-04-12 07:34:58 +03:00
Dean Herbert	25f36e87a6	Merge branch 'master' into overlay-scroll-container	2020-04-12 12:34:41 +09:00
Fire937	22d89dbff7	Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback	2020-04-12 01:46:32 +02:00
Fire937	f274ec297c	Add positional sound support for all rulesets ... The SamplePlaybackBalance is calculated in a way that the balance remains between -0.4 and 0.4. Positional sound is not supported in osu!taiko.	2020-04-12 01:33:25 +02:00
Endrik Tombak	fc1d497a86	Change PlaylistDownloadButton default	2020-04-11 14:21:28 +03:00
Endrik Tombak	df76636ffc	Implement "prefer no video" option	2020-04-11 14:08:16 +03:00
Dean Herbert	c96df97586	Add support for non-generic requests	2020-04-11 18:02:49 +09:00
Dean Herbert	415adecdf6	Add support for Result fetching	2020-04-11 18:02:43 +09:00
Dean Herbert	832822858c	Add basic request / response support	2020-04-11 17:48:23 +09:00
Dean Herbert	73a3f1fe65	Remove unnecessary DI	2020-04-11 17:30:34 +09:00
Dean Herbert	7aac0e59a8	Reduce dictionary lookups	2020-04-11 17:13:35 +09:00
Dean Herbert	310cf830d4	Simplify api request logic	2020-04-11 17:13:35 +09:00
Dean Herbert	abea7b5299	Tidy up function passing, naming, ordering etc.	2020-04-11 17:13:35 +09:00
smoogipoo	a84fe2525b	Fix nested hitobjects potentially indirectly masked away	2020-04-11 16:53:45 +09:00
Dean Herbert	7f753f6b4d	Remove current ruleset from function call	2020-04-11 16:43:09 +09:00
Dean Herbert	a843793957	Un-nest class	2020-04-11 16:41:11 +09:00
Dean Herbert	ff591299e0	Merge branch 'master' into select-recommended	2020-04-11 16:40:07 +09:00
Dean Herbert	eb1fbdacde	Remove unintentional edge effect	2020-04-11 15:29:52 +09:00
Dean Herbert	e206df479b	Update framework	2020-04-11 15:13:20 +09:00
Salman Ahmed	bf124a5cc6	Simplify IntervalList implementation enough to work for its usages	2020-04-10 15:50:40 +03:00
Salman Ahmed	5966c9af9c	Limit generic type to IConvertible structures (common number types)	2020-04-10 15:50:07 +03:00
Salman Ahmed	b7ed17dfbd	Throw if interval with reversed values added ... May reduce in subtle bugs.	2020-04-10 15:49:06 +03:00
Salman Ahmed	1001fcfb94	Revert nearest index accessibility back to private ... Implementation details should not be tested.	2020-04-10 15:48:00 +03:00
smoogipoo	4a87ac7840	Add support for sample changes	2020-04-10 13:53:09 +09:00
smoogipoo	ee7e2b0854	Fix editor beatmap potentially not updating hitobjects	2020-04-10 13:29:46 +09:00
Fire937	c17e470266	Fix PositionalSound calculation implementation ... The position used to calculate the stereo balance is now the position of the drawable (as opposed to the position specified in the beatmap file previously).	2020-04-10 00:01:35 +02:00
Salman Ahmed	9a29797a5b	Use IntervalList<double> for tracking break periods	2020-04-09 23:00:16 +03:00
Salman Ahmed	91b3aa2914	Implement interval list	2020-04-09 22:56:10 +03:00
Andrei Zavatski	518acf03e9	Remove BeatmapSearchSmallFilterRow component	2020-04-09 19:41:35 +03:00
Alchyr	f115fecb23	Fix formatting	2020-04-09 09:34:40 -07:00
Endrik Tombak	deaf24f141	Fix oversight on null	2020-04-09 19:30:40 +03:00
Andrei Zavatski	474dae368f	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-listing-expanded	2020-04-09 19:30:28 +03:00
Andrei Zavatski	b6d8e487d2	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-listing-expanded	2020-04-09 19:18:59 +03:00
Fire937	2201e9b4ae	Add stereo shifted hitsound playback support ... There is now a setting in the general settings called "Positional hitsounds". If the setting is enabled, the hitsounds playback will be shifted according to their position on the beatmap.	2020-04-09 18:12:15 +02:00
Endrik Tombak	35f97dfc75	Style changes	2020-04-09 18:59:18 +03:00
Endrik Tombak	f40bdcd34e	Initial rewrite, moving API logic to SongSelect	2020-04-09 18:47:28 +03:00
smoogipoo	575b061dd7	Add change state support to more editor components	2020-04-09 22:02:42 +09:00
smoogipoo	2e33d38cd7	Merge branch 'master' into editor-undo-redo	2020-04-09 22:02:28 +09:00
Dean Herbert	cc0bcea6e5	Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup ... Cleanup handling of hitobject updates	2020-04-09 21:32:58 +09:00
smoogipoo	14eca3655b	Add change state handling to the editor	2020-04-09 21:22:07 +09:00
Dean Herbert	a457880eaa	Merge pull request #8695 from smoogipoo/fix-timeline-crash ... Fix crash when trying to edit long beatmaps	2020-04-09 21:05:25 +09:00
smoogipoo	86243d463f	Add legacy beatmap diffing	2020-04-09 20:48:59 +09:00
Dean Herbert	f961ae862a	Merge pull request #8694 from smoogipoo/fix-encoder-nullref ... Fix possible legacy beatmap encoder nullref	2020-04-09 20:44:08 +09:00
smoogipoo	e58bf8a0d0	Add DiffPlex package	2020-04-09 20:38:38 +09:00
smoogipoo	aad0ada20b	Merge branch 'fix-encoder-nullref' into editor-undo-redo	2020-04-09 20:37:00 +09:00
smoogipoo	fde5cd34b2	Merge branch 'editorbeatmap-update-cleanup' into editor-undo-redo	2020-04-09 20:36:57 +09:00
smoogipoo	683302a77d	Fix crash when trying to edit long beatmaps	2020-04-09 20:25:26 +09:00
smoogipoo	b900f229e7	Fix possible legacy beatmap encoder nullref	2020-04-09 20:21:42 +09:00
smoogipoo	ee6ea08cf8	Cleanup handling of hitobject updates	2020-04-09 20:16:44 +09:00
Andrei Zavatski	134feefa14	Remove bindable	2020-04-09 13:10:09 +03:00
Andrei Zavatski	2d3ea95469	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container	2020-04-09 13:06:22 +03:00
Dean Herbert	e8f836a410	Merge pull request #8454 from TheWildTree/update-overlay-headers ... Update overlay header elements to match osu-web	2020-04-09 17:17:03 +09:00
Dean Herbert	e10576325c	Merge branch 'master' into update-overlay-headers	2020-04-09 16:29:34 +09:00
Dean Herbert	cb6372acac	Merge branch 'master' into mania-stage-background-skinning	2020-04-09 15:37:48 +09:00
Dean Herbert	260de77304	Merge branch 'master' into select-recommended	2020-04-09 15:30:35 +09:00
Dean Herbert	53b2f58eda	Merge branch 'master' into overlay-scroll-container	2020-04-09 15:05:49 +09:00
Dean Herbert	c5005eb378	Adjust gradient size slightly and make const	2020-04-09 14:55:02 +09:00
Dean Herbert	5a78e74470	Use Lerp instead of ValueAt	2020-04-09 14:51:50 +09:00
Dean Herbert	c44957db3f	Change initial health to 1 to avoid false fail display	2020-04-09 14:49:09 +09:00
Dean Herbert	52c9762651	Remove pointless keywords	2020-04-09 14:36:04 +09:00
Dean Herbert	947745d87e	Change fail effect to be less distracting	2020-04-09 14:34:23 +09:00
Dean Herbert	4976f80b71	Move implementation to HUD	2020-04-09 14:31:25 +09:00
Dean Herbert	0e2d5213ce	Merge branch 'master' into low-hp-red-layer	2020-04-09 13:53:57 +09:00
Dean Herbert	4bfc738f5b	Merge pull request #7639 from santerinogelainen/master ... Add top rank to the beatmap carousel	2020-04-08 23:36:47 +09:00
Dean Herbert	9bdc881b3c	Merge pull request #8677 from smoogipoo/fix-minwidth-override ... Fix hidden notes due to 0 minimum width	2020-04-08 23:32:25 +09:00
Dean Herbert	825a9bcf42	Merge pull request #8681 from peppy/fix-drum-alignment ... Fix osu!taiko input drum alignment for old skin versions	2020-04-08 23:11:33 +09:00
Dean Herbert	61d8cfd224	Fix triangle intro video being out of time	2020-04-08 19:51:55 +09:00
Dean Herbert	4b16b2e720	Bump legacy skin version	2020-04-08 19:42:31 +09:00
smoogipoo	7d787dde89	Move comparison to decoder	2020-04-08 18:17:45 +09:00
Alchyr	3d975f30a3	Merge branch 'timing-equivalence' of https://github.com/Alchyr/osu into timing-equivalence	2020-04-08 01:45:53 -07:00
Alchyr	65823fb2e1	Use redundancy test	2020-04-08 01:42:35 -07:00
smoogipoo	2ddea018cf	Fix hidden notes due to 0 minimum width	2020-04-08 17:15:59 +09:00
smoogipoo	83db6cebb6	Implement bottom stage image	2020-04-08 16:20:54 +09:00
smoogipoo	cd15b672eb	Implement left and right stage images	2020-04-08 16:20:47 +09:00
Alchyr	46ce258ebb	Merge branch 'master' into timing-equivalence	2020-04-07 18:57:18 -07:00
Dean Herbert	d63cfdc024	Merge pull request #8669 from bdach/fix-legacy-skin-fallback ... Fix legacy skin texture fallback logic	2020-04-08 10:47:11 +09:00
Alchyr	66a474619c	Adjust TimingControlPoint equivalency	2020-04-07 18:13:26 -07:00
Alchyr	737a3b608a	Correct spelling	2020-04-07 17:34:18 -07:00
Bartłomiej Dach	f5f0b94944	Fix incorrect fallback logic ... The recently-modified skin texture fallback logic was very subtly incorrect. If at the end of the first loop no texture was found, it would be checked for null to avoid setting scale adjust on a null texture, but then returned anyway, bypassing the fallback logic for subsequent possible paths entirely. Invert the check and explicitly continue to the next fallback path if neither a 2x, nor 1x texture with the given name is found in the store.	2020-04-07 22:50:25 +02:00
Dan Balasescu	35d66c3c1d	Fix missing comma	2020-04-07 23:37:30 +09:00
Dean Herbert	2062087155	Merge branch 'master' into more-mania-colours	2020-04-07 23:36:42 +09:00
Dean Herbert	955361be08	Merge pull request #8656 from peppy/per-ruleset-skinnable-tests ... Add per-ruleset skinnable test scenes to correct dynamic compilation cases	2020-04-07 23:35:52 +09:00
Lucas A	2087d8d09e	Don't search for user rulesets if rulesetsStorage isn't set (Testing environnment)	2020-04-07 16:01:47 +02:00
Dan Balasescu	7951a52a15	Merge branch 'master' into per-ruleset-skinnable-tests	2020-04-07 22:59:42 +09:00
Dean Herbert	9ff4458fd6	Merge branch 'master' into mania-skin-note-images	2020-04-07 22:41:22 +09:00
Dean Herbert	780784217d	Merge pull request #8652 from smoogipoo/mania-multiple-columnwidth ... Make note height scale by minimum column width	2020-04-07 22:38:12 +09:00
Dean Herbert	fcb3d3091a	Merge pull request #8660 from peppy/better-resources-retrieval ... Retrieve dll resources using a more reliable method	2020-04-07 22:31:50 +09:00
Dean Herbert	e597ee9ffd	Update framework	2020-04-07 21:52:15 +09:00
Dean Herbert	f0443bca3c	Merge pull request #8643 from smoogipoo/fix-legacy-version ... Make version-less skins fallback to version 1.0	2020-04-07 21:28:06 +09:00
Lucas A	08308e07e7	Apply review suggestions	2020-04-07 12:22:09 +02:00
Dean Herbert	c9872f1d93	Retrieve dll resources using a more reliable method	2020-04-07 18:55:03 +09:00
smoogipoo	2568f3f588	Fix off-by-one indexing	2020-04-07 17:11:32 +09:00
smoogipoo	11d58fb7f6	Implement column background and light colours	2020-04-07 16:53:55 +09:00
smoogipoo	9fd73492ca	Implement judgement line colour	2020-04-07 16:53:55 +09:00
Dean Herbert	0a340bac5a	Ensure the correct (up-to-date) ruleset is retrieved	2020-04-07 16:20:13 +09:00
Dean Herbert	39fd297d7d	Merge pull request #8650 from peppy/skinnable-test-scene-recompilation ... Fix SkinnableTestScene losing test resources on dynamic recompilation	2020-04-07 16:20:00 +09:00
smoogipoo	3ecb99462f	Make note height scale by minimum column width	2020-04-07 16:07:18 +09:00
smoogipoo	ed3e0a01e1	Re-namespace into song select	2020-04-07 15:31:22 +09:00
smoogipoo	ed17a1c990	Improve visual display	2020-04-07 15:30:06 +09:00
smoogipoo	933314d724	Remove unnecessary method	2020-04-07 14:50:11 +09:00
smoogipoo	c46ea7bdef	Add disposal, prevent memory leaks	2020-04-07 14:49:24 +09:00
Dan Balasescu	de99eab52a	Merge branch 'master' into fix-storyboard-video-offset	2020-04-07 14:30:37 +09:00
Dean Herbert	8506029237	Fix SkinnableTestScene losing test resources on dynamic recompilation	2020-04-07 13:46:37 +09:00
Dan Balasescu	5758a9fa4d	Merge branch 'master' into fix-results-star-display-alignment	2020-04-07 12:28:33 +09:00
Dan Balasescu	cc9757f958	Merge pull request #8630 from iiSaLMaN/add-break-period-constructor ... Add a simple constructor for BreakPeriod	2020-04-07 12:13:40 +09:00
Dan Balasescu	6fc9507cbf	Merge branch 'master' into add-break-period-constructor	2020-04-07 11:39:31 +09:00
Dan Balasescu	6dbe8cd575	Merge branch 'master' into animate-judgements	2020-04-07 11:29:07 +09:00
Dean Herbert	b7308f5ed4	Fix storyboard videos being offset incorrectly	2020-04-07 00:26:38 +09:00
dependabot-preview[bot]	9ed0560da3	Bump SharpCompress from 0.24.0 to 0.25.0 ... Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.24.0 to 0.25.0. - [Release notes](https://github.com/adamhathcock/sharpcompress/releases) - [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.24...0.25) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-06 11:37:56 +00:00
Dean Herbert	00f390c850	Update framework	2020-04-06 20:13:53 +09:00
smoogipoo	a4208f35c4	Make versionless skins fallback to version 1.0	2020-04-06 19:36:17 +09:00
smoogipoo	db6db861c0	Implement mania note + key image configs	2020-04-06 19:04:02 +09:00
smoogipoo	eff17c2da5	Allow legacy skin textures from subpaths	2020-04-06 19:03:15 +09:00
smoogipoo	0182448262	Fix performance when parsing mania skins	2020-04-06 18:35:39 +09:00
Dean Herbert	33c64428a8	Fix playback position being set incorrectly for IAnimationTimeReference	2020-04-06 13:04:32 +09:00
Joehu	57b6a91449	Remove unnecessary input override on footer button mods ... Was used when it expanded on hover, but doesn't anymore.	2020-04-05 14:57:44 -07:00
Joehu	0f11ecce01	Make icons container private	2020-04-05 14:53:49 -07:00
Salman Ahmed	1b76a53d32	Move CatchTheBeat section handling to LegacySkinDecoder ... Best place to reside at	2020-04-05 22:10:35 +03:00
Salman Ahmed	7fab07670e	Remove no longer necessary usage of IsBreakTime	2020-04-05 21:35:09 +03:00
Salman Ahmed	e71a9668a5	Disallow draining in non-draining sections	2020-04-05 21:34:53 +03:00
Salman Ahmed	0eaea8ef9d	Create a constructor for break period ... For simple construction of break periods (e.g. filling a method with an array of break periods inside a test case)	2020-04-05 21:29:03 +03:00
Shane Woolcock	2fec8b7b85	Use DisplayModes rather than AvailableResolutions	2020-04-05 13:01:10 +09:30
Salman Ahmed	10e65c4f53	Add handling for legacy CatchTheBeat section in LegacyDecoder	2020-04-05 00:10:12 +03:00
Santeri Nogelainen	da59baa779	Add line break	2020-04-04 22:42:13 +03:00
Santeri Nogelainen	163de36777	Merge remote-tracking branch 'upstream/master'	2020-04-04 22:29:15 +03:00
Santeri Nogelainen	1e8badb14a	Move all logic to TopLocalRank and remove CarouselBeatmapRank	2020-04-04 22:28:36 +03:00
Lucas A	0e45a4d54e	Add back cached ruleset assembly lookup	2020-04-04 20:13:46 +02:00
Endrik Tombak	6700ef910f	use startAtCurrentTime	2020-04-04 11:35:15 +03:00
Lucas A	8cdae790c3	Load user rulesets from the game data directory	2020-04-03 21:40:09 +02:00
Joehu	88cc552534	Fix results star rating display not being centered when no mods are present ... Needed or the spacing will apply to the fill flow container, causing alignment issues.	2020-04-03 11:30:22 -07:00
Joehu	493b654011	Remove horizontal margin from mod display ... Can skew center alignment on fill flow containers. Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.	2020-04-03 11:30:02 -07:00
Dean Herbert	7b2144a1a7	Fix merge mishap	2020-04-03 23:31:46 +09:00
Dean Herbert	3289fa7c66	Merge branch 'master' into better-mania-scrollspeed	2020-04-03 23:25:14 +09:00
Dean Herbert	eacbb20d87	Merge branch 'master' into fix-convert-scroll-speed	2020-04-03 22:47:53 +09:00
Dean Herbert	53c99d137a	Merge branch 'master' into mania-config-lookup-refactor	2020-04-03 22:22:59 +09:00
Dean Herbert	258dcceffc	Merge branch 'master' into update-animation-usage	2020-04-03 21:54:11 +09:00
Dean Herbert	f59479fa07	Update framework	2020-04-03 21:09:33 +09:00
smoogipoo	d90db5649d	Improve comment slightly	2020-04-03 18:32:07 +09:00
Dean Herbert	fd9d4a8d32	Update resources	2020-04-03 18:29:32 +09:00
smoogipoo	1ff2cc31d1	Implement more familiar scroll speed options in mania	2020-04-03 18:25:01 +09:00
smoogipoo	b1268a73f1	Add keybinding repeat extension method	2020-04-03 18:15:24 +09:00
Dean Herbert	51db361c32	Update usages of Animation and Video in line with framework changes	2020-04-03 16:00:06 +09:00
smoogipoo	b42d1104b7	Fix mania converts scrolling at incorrect speeds	2020-04-03 13:16:01 +09:00
smoogipoo	1f797207f7	Rework lookups to not require total playfield columns	2020-04-03 12:31:05 +09:00
Will Kennedy	57944bd335	fix(?) InspectCode warnings	2020-04-02 21:36:31 -04:00
Will Kennedy	c042e709a5	Fix GetDecoder getting fallback decoder too often	2020-04-02 20:43:54 -04:00
smoogipoo	24a7b5f0d6	Fix missing comma	2020-04-02 23:59:53 +09:00
Dean Herbert	f919a2f267	Merge branch 'master' into mania-hitexplosion-skinning	2020-04-02 23:57:03 +09:00
Dean Herbert	c35dd0153d	Merge branch 'master' into mania-column-line-colour	2020-04-02 23:03:22 +09:00
smoogipoo	2a6c0de225	Add frameLength parameter to GetAnimation	2020-04-02 22:56:30 +09:00
Dean Herbert	23b53bee56	Update resources	2020-04-02 22:05:32 +09:00
Dean Herbert	8f2a3578bd	Merge branch 'master' into mania-hitexplosion-skinning	2020-04-02 21:59:01 +09:00
Dean Herbert	a6d6bab0cc	Update framework	2020-04-02 21:21:29 +09:00
Dean Herbert	c18248c827	Fix crash caused by user json order changing	2020-04-02 18:46:09 +09:00
smoogipoo	62f1bc276d	Add skinning support for column line colour	2020-04-02 18:10:17 +09:00
smoogipoo	a77933f5e0	Add support for parsing mania skin colours	2020-04-02 17:56:12 +09:00
smoogipoo	fa3a449c3b	Implement legacy normal hit explosions	2020-04-02 14:37:29 +09:00
smoogipoo	b375a02cff	Cleanup positioning factor definition	2020-04-02 14:37:29 +09:00
smoogipoo	beb1f037e9	Add startAtCurrentTime parameter to GetAnimation()	2020-04-02 14:33:15 +09:00
Dean Herbert	a76428f965	Move lookup to own function	2020-04-01 23:46:50 +09:00
Dean Herbert	c2c7ff7334	Add temporary logic to LegacySkin	2020-04-01 23:32:48 +09:00
Lucas A	1562612f41	Update visual tests and remove unessecary XMLDoc tag	2020-04-01 15:12:31 +02:00
Dean Herbert	4d8b6c47cc	Update framework	2020-04-01 21:23:43 +09:00
smoogipoo	ff2c5b446e	Fix column lights positioned incorrectly	2020-04-01 16:06:09 +09:00
smoogipoo	2d6d1a8cc6	Implement column width and column spacing	2020-04-01 13:38:03 +09:00
smoogipoo	66486b094c	Remove unnecessary dependency, allow null mods	2020-04-01 13:31:17 +09:00
杜Nate	9d9780707d	Merge branch 'master' into mania-skinning-refactor	2020-04-01 10:27:40 +08:00
Dean Herbert	3454983d7a	Merge branch 'master' into mania-hold-note-skinning	2020-04-01 00:04:49 +09:00
Dean Herbert	1e88d3c17a	Merge conflict "resolution"	2020-03-31 23:36:06 +09:00
Dean Herbert	03689adda8	Update resources	2020-03-31 21:33:59 +09:00
Dean Herbert	fe35f696c3	Merge branch 'master' into mania-column-background-skinning	2020-03-31 21:29:37 +09:00
Dean Herbert	7a9d878a34	Merge branch 'master' into fix-follow-point-transforms	2020-03-31 20:03:42 +09:00
Andrei Zavatski	e26fbd5ed8	Remove overcomplicated stuff	2020-03-31 13:45:59 +03:00
Andrei Zavatski	fd8d4cf23b	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container	2020-03-31 13:33:27 +03:00
Dean Herbert	da129ddf6a	Merge pull request #8513 from smoogipoo/mania-skinning-testability ... Implement basis for mania skinning	2020-03-31 19:03:18 +09:00
mcendu	c0f8c1dc28	rename variable used for mania lookup key storage	2020-03-31 17:22:46 +08:00
Dean Herbert	f2416f15a3	Merge pull request #8509 from bdach/fix-widescreen-storyboards ... Support widescreen per-layer storyboard masking	2020-03-31 17:47:42 +09:00
Dean Herbert	9602ab17b0	Fix replay imports failing for certain mod combinations	2020-03-31 17:13:42 +09:00
smoogipoo	1952fcc0ce	Implement mania hold note skinning	2020-03-31 16:42:35 +09:00
smoogipoo	c4f76ffdaf	Implement mania note skinning	2020-03-31 15:29:25 +09:00
smoogipoo	b926d570ee	Allow skinnabledrawable to be auto-sized	2020-03-31 15:28:50 +09:00
Dean Herbert	2109c98481	Merge branch 'master' into fix-widescreen-storyboards	2020-03-31 15:28:22 +09:00
smoogipoo	211a8db4c5	Merge branch 'mania-key-area-skinning' into mania-note-skinning	2020-03-31 15:23:59 +09:00
smoogipoo	538dc0c558	Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning	2020-03-31 15:20:56 +09:00
smoogipoo	1a858c602a	Merge branch 'mania-column-background-skinning' into mania-note-skinning	2020-03-31 15:20:14 +09:00
Dean Herbert	bf1fc9f7a0	Update framework	2020-03-31 15:18:50 +09:00
smoogipoo	4b05f7ff27	Merge branch 'mania-skinning-testability' into mania-key-area-skinning	2020-03-31 15:11:32 +09:00
Dean Herbert	877d5849bb	Merge branch 'master' into mania-skinning-testability	2020-03-31 15:09:11 +09:00
smoogipoo	71387016b2	Add missing judgement line	2020-03-31 12:26:31 +09:00
smoogipoo	02237133cb	Implement mania hit target skinning	2020-03-31 12:17:44 +09:00
Dean Herbert	6d4f9247ea	Revert "Remove osu!catch GotoFrame usage" ... This reverts commit 4406f44165.	2020-03-31 11:49:18 +09:00
smoogipoo	cb1513b374	Add mania key area skinning	2020-03-31 11:23:33 +09:00
smoogipoo	44727eb2b8	Implement column background skinning	2020-03-31 10:57:56 +09:00
smoogipoo	2b5e9885f6	Implement mania skin reading functionality	2020-03-31 10:55:58 +09:00
Dan Balasescu	e0a876ceaf	Merge pull request #8494 from peppy/fix-invalid-set-ids-on-import ... Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID	2020-03-31 10:42:58 +09:00
smoogipoo	f6f5de7ad1	Allow LineBufferedReader to keep underlying stream open	2020-03-31 10:13:50 +09:00
Bartłomiej Dach	522bbc1e9c	Support widescreen per-layer storyboard masking	2020-03-30 21:51:39 +02:00
Lucas A	ab01111c36	Fix merge conflicts.	2020-03-30 17:39:11 +02:00
smoogipoo	a8f7d7ea42	Add structure for mania configuration lookups	2020-03-30 23:21:40 +09:00
Dan Balasescu	250bdbef6b	Merge branch 'master' into dont-retry-on-replay-results	2020-03-30 22:30:15 +09:00
Dan Balasescu	8964001423	Merge branch 'master' into fix-invalid-set-ids-on-import	2020-03-30 22:24:12 +09:00
Lucas A	3cae0cedee	Add a game setting to disable the layer	2020-03-30 12:59:39 +02:00
Andrei Zavatski	179bd1ce7e	Fix failing test	2020-03-30 13:38:04 +03:00
Andrei Zavatski	2dc81bbcfa	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container	2020-03-30 13:37:25 +03:00
Dean Herbert	0d4830550e	Fix tooltips not showing inside ManualInputManagerTestScenes	2020-03-30 19:15:44 +09:00
Dean Herbert	113660b621	Merge if statements	2020-03-30 18:56:35 +09:00
Dean Herbert	ec18fe1f9f	Merge branch 'master' into dont-retry-on-replay-results	2020-03-30 18:56:00 +09:00
smoogipoo	881ec146af	Ignore duplicate configs	2020-03-30 17:36:57 +09:00
Dean Herbert	4406f44165	Remove osu!catch GotoFrame usage	2020-03-30 17:26:35 +09:00
smoogipoo	4719aac235	Add basic mania skin parsing	2020-03-30 17:18:09 +09:00
Dean Herbert	0044d00d07	Update framework	2020-03-30 16:53:23 +09:00
Dean Herbert	812583a4cd	Remove stray newline	2020-03-30 16:17:42 +09:00
Dean Herbert	f71c8cb30f	Only drop online set ID if beatmap IDs were stripped in online retrieval	2020-03-30 15:07:56 +09:00
Dean Herbert	7ecce713bb	Keep provided IDs where possible if not online	2020-03-30 15:07:39 +09:00
Dan Balasescu	03cd9aa060	Merge branch 'master' into spun-out	2020-03-30 12:31:53 +09:00
Dean Herbert	7db9bd798c	Remove handle overrides	2020-03-30 11:59:51 +09:00
Dean Herbert	09d860d5f5	Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID	2020-03-30 11:52:25 +09:00
Dan Balasescu	ea1a2e1955	Merge branch 'master' into dont-retry-on-replay-results	2020-03-30 11:01:25 +09:00
Dan Balasescu	113bbe8c4d	Merge pull request #8488 from peppy/fix-autoplay-results-display ... Fix auto mod results screen not displaying correctly	2020-03-30 11:01:16 +09:00
Dean Herbert	bac5f79731	Merge branch 'master' into rewrite-select-next	2020-03-30 00:08:06 +09:00
Dean Herbert	b47a532df3	Adjust code formatting slightly	2020-03-30 00:07:48 +09:00
Dean Herbert	6e68b968f8	Hide "retry" button on results screen after watching a replay	2020-03-29 23:52:50 +09:00
Dean Herbert	66a990cd5e	Remove redundant this	2020-03-29 23:50:16 +09:00
Dean Herbert	653480b2f8	Add regression test	2020-03-29 23:29:46 +09:00
Dean Herbert	4f5557096c	Fix auto mod results not displaying correctly	2020-03-29 22:51:28 +09:00
Dean Herbert	2abb8a37df	Merge branch 'master' into show-mod-settings-tooltip	2020-03-29 14:35:04 +09:00
Dean Herbert	a2b3fe180e	Add the ability to disable user input on specific DrawableHitObjects	2020-03-29 14:30:45 +09:00
Endrik Tombak	b4f0500706	Invert logic	2020-03-28 20:21:21 +02:00
Endrik	2c27894527	Use All instead of ToList Any ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-28 19:58:33 +02:00
Santeri Nogelainen	6bde102207	Merge remote-tracking branch 'upstream/master'	2020-03-28 18:14:17 +02:00
Santeri Nogelainen	faa2b49be4	Fix namespace for CarouselBeatmapRank, make UpdateableRank in TopLocalRank readonly	2020-03-28 18:13:39 +02:00
Santeri Nogelainen	1c711147f3	Move all carousel rank logic into separate classes (TopLocalRank and CarouselBeatmapRank)	2020-03-28 17:22:01 +02:00
Endrik Tombak	87854fc4fa	Rename variable	2020-03-28 13:23:31 +02:00
Endrik Tombak	6a0c5c87aa	Use already existing variable	2020-03-28 13:06:03 +02:00
Endrik Tombak	fc3f9ff6fa	Don't use drawables for select next	2020-03-28 12:54:48 +02:00
Dean Herbert	3cc574e62d	Merge branch 'master' into overlay-scroll-container	2020-03-28 16:46:01 +09:00
Dean Herbert	944926e950	Merge branch 'master' into fix-break-overlay-z-order	2020-03-28 13:04:19 +09:00
Dean Herbert	a317ef65b8	Remove default for argument	2020-03-28 12:18:28 +09:00
Bartłomiej Dach	3a3bfe9a5e	Reorder children to fix pause overlay z-order	2020-03-27 21:19:49 +01:00
Bartłomiej Dach	adc759771f	Hook up score processor in player	2020-03-27 19:47:42 +01:00
Andrei Zavatski	7b24cc325f	Implement OverlayScrollContainer component	2020-03-27 20:57:57 +03:00
Dean Herbert	4f77850790	Merge pull request #8467 from peppy/update-framework ... Update framework	2020-03-27 21:22:39 +09:00
Dean Herbert	6ecfeb8cc3	Merge pull request #8455 from Game4all/handle-novideo-beatmaps ... Fix NullReferenceException when starting the no-video version of a beatmap with video	2020-03-27 21:12:40 +09:00
Dean Herbert	5be8934c8c	Merge pull request #8407 from peppy/disable-raw-input ... Disable raw input toggle on all but windows	2020-03-27 21:10:02 +09:00
Dean Herbert	f25b1b33e3	Merge pull request #8461 from peppy/fix-minia-mod-replay-recording ... Fix osu!mania replays recording incorrectly when key mod applied	2020-03-27 20:55:58 +09:00
Dean Herbert	4106700771	Update framework	2020-03-27 20:51:44 +09:00
Dan Balasescu	5e1cb0e9e9	Merge branch 'master' into fix-minia-mod-replay-recording	2020-03-27 19:26:41 +09:00
Dan Balasescu	005a818f32	Merge branch 'master' into fix-slider-end-sounds	2020-03-27 19:26:32 +09:00
Dean Herbert	d36f5fb96f	Fix animated follow points not (re)animating after rewind	2020-03-27 18:03:02 +09:00
Dean Herbert	f75c082601	Fix osu!mania replays recording incorrectly when key mod applied	2020-03-27 15:50:11 +09:00
Endrik Tombak	bbbaaae3ee	Write tests	2020-03-26 19:18:16 +02:00
Endrik Tombak	ee112c6f50	Move and change logic	2020-03-26 18:42:08 +02:00
TheWildTree	83410315c6	Make fields private	2020-03-26 17:18:01 +01:00
Lucas A	01c9112f82	Add a null check to prevent NRE when playing the "no video" version of a beatmap.	2020-03-26 17:09:22 +01:00
TheWildTree	543f584595	Adjust user profile tabs	2020-03-26 16:44:46 +01:00
TheWildTree	9a30ff5a00	Fix code quality issues	2020-03-26 16:11:58 +01:00
Lucas A	00c1ff993a	Fix merge conflicts.	2020-03-26 15:48:18 +01:00
TheWildTree	da996ffe74	Update header breadcrumb tab control	2020-03-26 15:44:53 +01:00
TheWildTree	46ebf6ef78	Update user profile section tabs and rename classes for better readibility	2020-03-26 15:44:22 +01:00
TheWildTree	816418742e	Update header tab control	2020-03-26 15:43:48 +01:00
TheWildTree	e33055e2c4	Simplify active tab font changes and expose necessary fields in OsuTabItem	2020-03-26 14:19:36 +01:00
Lucas A	c1ac57e70f	Add back visual tests and add easing to alpha fade.	2020-03-26 12:14:44 +01:00
Dean Herbert	f80efd10c2	Avoid using a miss judgement	2020-03-26 19:54:17 +09:00
Dean Herbert	07462120e4	Split break tracking into its own component	2020-03-26 15:30:23 +09:00
Dean Herbert	d372ddaadd	Move break overlay to a location it is not affected by gameplay scale	2020-03-26 12:50:18 +09:00
Dean Herbert	2b1245f63a	Improve xmldoc in a couple of places	2020-03-26 12:50:00 +09:00
Endrik Tombak	2f5dc93d61	Select recommended difficulty	2020-03-26 00:19:54 +02:00
Andrei Zavatski	454e402e88	Fix last seen message has been visible when it shouldn't	2020-03-25 21:02:45 +03:00
Andrei Zavatski	1e025b7c31	Add tests to cover the issue	2020-03-25 20:58:51 +03:00
Dean Herbert	8a2aac5f83	Rename conversion methods for clarity	2020-03-25 20:21:34 +09:00
Dean Herbert	800e395bc8	Merge branch 'master' into replay-recording	2020-03-25 20:20:59 +09:00
Dan Balasescu	e7f32d951d	Merge pull request #8431 from peppy/fix-intro-tests ... Fix intro tests not asserting pass or working at all	2020-03-25 19:25:26 +09:00
Dan Balasescu	791bf95396	Merge pull request #8433 from peppy/fix-song-select-looping ... Fix track looping state not being reset when entering editor from song select	2020-03-25 19:21:18 +09:00
Dean Herbert	b1d4261402	Fix track looping state not being reset when entering editor from song select ... Closes #8432.	2020-03-25 15:50:19 +09:00
Dean Herbert	880d138a47	Fix intro tests not asserting pass or working at all	2020-03-25 15:12:19 +09:00
Dean Herbert	87db1ba487	Remove unused text transform helpers	2020-03-25 14:58:49 +09:00
voidedWarranties	b8f20831a1	Video no longer modifies storyboard resolution	2020-03-24 20:04:09 -07:00
Dean Herbert	f2e0fba164	Remove VideoFile from BeatmapMetadata ... Leaving in database because it's a pain to drop columns.	2020-03-25 12:00:02 +09:00
Dean Herbert	6d81da5419	Merge branch 'master' into video-offset	2020-03-25 11:28:59 +09:00
Dean Herbert	368bf58521	Rename and make fields readonly	2020-03-25 11:08:08 +09:00
Dean Herbert	971249338d	Merge branch 'master' into storyboard-masking	2020-03-25 11:05:40 +09:00
TheWildTree	05de65937b	Update ruleset selector design	2020-03-24 22:14:15 +01:00
TheWildTree	a5781d7fc5	Replace ScreenTitle with OverlayTitle and update titles to match new design	2020-03-24 22:08:20 +01:00
TheWildTree	127c16fccd	Implement OverlayTitle component	2020-03-24 22:03:38 +01:00
TheWildTree	e85f45f911	Move old ScreenTitle to MultiHeaderTitle	2020-03-24 22:03:16 +01:00
Dean Herbert	7818251c3e	Merge pull request #8406 from smoogipoo/taiko-random-mod ... Implement random mod for taiko	2020-03-24 17:11:49 +09:00
Dean Herbert	4070b2b75f	Merge branch 'basic-replay-recorder' into replay-recording	2020-03-24 16:31:14 +09:00
Dean Herbert	cc1863ca3d	Merge branch 'master' into basic-replay-recorder	2020-03-24 16:26:13 +09:00
Dean Herbert	2735a2250c	Move replay recorder to final location	2020-03-24 15:49:52 +09:00
Dean Herbert	a7bfaad60f	More correctly handle rulesets which don't support replay recording	2020-03-24 15:44:39 +09:00
Dean Herbert	2feb66d423	Correctly handle missing positional data	2020-03-24 15:43:34 +09:00
Dean Herbert	02a3c7c025	Fix incorrect ruleset being recorded to file	2020-03-24 15:43:22 +09:00
Dean Herbert	448961b330	Rename incorrect variable	2020-03-24 15:39:01 +09:00
Dean Herbert	388cf5c83a	Fix catch positional data being incorrectly recorded	2020-03-24 15:38:54 +09:00
Dean Herbert	022465f546	Add encoding and import support	2020-03-24 14:51:52 +09:00
voidedWarranties	4bb15a8b93	Allow individual storyboard layers to disable masking	2020-03-23 22:51:37 -07:00
Dean Herbert	68ebe98fde	Remove unused GetUnderlyingStream method	2020-03-24 14:08:25 +09:00
Dean Herbert	2a1e7a7ff0	Merge branch 'master' into fix-select-filter-not-absorbing-input	2020-03-24 14:03:58 +09:00
Dan Balasescu	6279c78e3c	Merge branch 'master' into fix-keypad-autoplay-shortcut	2020-03-24 13:34:31 +09:00
Dean Herbert	546772192c	Add helper method to convert to legacy mods enums	2020-03-24 13:07:51 +09:00
Dean Herbert	e5f4d8686e	Rename decoder	2020-03-24 13:07:50 +09:00
Dan Balasescu	d574fabf7d	Merge branch 'master' into fix-song-select-play-crash	2020-03-24 12:54:10 +09:00
Joehu	5bc5119389	Handle OnHover on song select filter and footer	2020-03-23 16:03:33 -07:00
Joehu	96d962ab30	Fix autoplay keyboard shortcut not working with keypad enter key	2020-03-23 11:25:40 -07:00
Joehu	96848405fd	Fix song select filter not absorbing input from carousel	2020-03-23 10:54:45 -07:00
Liam DeVoe	2fa42ed644	use N2 for ModTimeRamp, add x text	2020-03-23 12:54:08 -04:00
Dean Herbert	617149fb27	Implement in player	2020-03-23 20:06:18 +09:00
Dean Herbert	14a85a84bf	Add proper screen space - gamefield mapping	2020-03-23 20:06:18 +09:00
Dean Herbert	6d48068061	Move replay recorder to final location	2020-03-23 20:04:15 +09:00
dependabot-preview[bot]	66f2a52dd2	Bump Sentry from 2.1.0 to 2.1.1 ... Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/getsentry/sentry-dotnet/releases) - [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.0...2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-03-23 08:59:47 +00:00
Dean Herbert	232c255986	Basic test scene setup	2020-03-23 17:33:02 +09:00
Dean Herbert	47c7673c9e	Fix crash when holding a key down while entering player	2020-03-23 17:04:54 +09:00
Dean Herbert	2dbcf9e346	Merge branch 'master' into taiko-random-mod	2020-03-23 16:33:59 +09:00
Dean Herbert	680d058f3f	Merge branch 'master' into friends-layout-split	2020-03-23 15:36:04 +09:00
Dean Herbert	205f4dcb54	Simplify string construction logic	2020-03-23 15:20:56 +09:00
Dean Herbert	a6b153673e	Fix icons not updating tooltip text correctly	2020-03-23 14:58:02 +09:00
Dean Herbert	4f9ac7b81e	Merge branch 'master' into show-mod-settings-tooltip	2020-03-23 14:57:54 +09:00
Dan Balasescu	a98885a172	Merge pull request #8408 from peppy/fix-settings-double-dim ... Fix some pieces of SettingsItem getting dimmed twice when disabled	2020-03-23 14:31:09 +09:00
Dan Balasescu	37ad787d90	Merge pull request #8404 from peppy/remove-tournament-chat-scrollbars ... Hide scrollbars in tournament chat display	2020-03-23 13:54:49 +09:00
Dean Herbert	3a3df06e0b	Fix some pieces of SettingsItem getting dimmed twice when disabled	2020-03-23 13:11:40 +09:00
Dean Herbert	997ce397ef	Disable raw input toggle on all but windows	2020-03-23 12:48:05 +09:00
Dan Balasescu	6e0cafa7a0	Merge branch 'master' into increase-sample-concurrency	2020-03-23 12:39:58 +09:00
smoogipoo	e3a5be71cc	Implement random mod for taiko	2020-03-23 12:09:30 +09:00
Liam DeVoe	64fc116d67	use two decimal points for ModRateAdjust format	2020-03-22 23:08:00 -04:00
Dean Herbert	1b6342438f	Hide scrollbars in tournament chat display	2020-03-23 12:05:16 +09:00
Liam DeVoe	5cc626d37b	move SettingDescription override to ModRateAdjust	2020-03-22 22:57:46 -04:00
Liam DeVoe	1da590c63f	use N1 format instead of 0.#	2020-03-22 22:54:21 -04:00
Liam DeVoe	889608a408	remove redundant ToString call	2020-03-22 22:51:29 -04:00
Dan Balasescu	d0c7b49376	Merge branch 'master' into fix-carousel-root-selects-from-nothing	2020-03-23 11:34:04 +09:00
smoogipoo	448e5c0deb	Merge branch 'master' into fix-carousel-root-selects-from-nothing	2020-03-23 11:15:22 +09:00
Liam DeVoe	481031b207	Merge branch 'show-mod-settings-tooltip' of github.com:tybug/osu into show-mod-settings-tooltip	2020-03-22 22:10:31 -04:00
Liam DeVoe	98b8f82810	simplify SettingDescription default definition	2020-03-22 22:07:09 -04:00
Liam DeVoe	ea87afd577	use string.Empty in IconTooltip	2020-03-22 22:06:54 -04:00
Liam DeVoe	cb6e602556	enforce single signficiant digit precision for other mods	2020-03-22 22:06:35 -04:00
Dan Balasescu	fb21c7d82d	Merge branch 'master' into fix-carousel-restore-previous-selection	2020-03-23 11:01:18 +09:00
Dean Herbert	bfd643dd16	Rename classes	2020-03-23 10:47:27 +09:00
Liam DeVoe	67667b3d22	enforce precision for ModDifficultyAdjust and derived classes	2020-03-22 21:22:46 -04:00
Dean Herbert	0b728f483f	Rename base test class to help avoid incorrect reference	2020-03-23 10:01:33 +09:00
Liam DeVoe	63e9b2a299	use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust	2020-03-22 18:50:09 -04:00
Andrei Zavatski	9482fc5b99	Refactor grouping logic	2020-03-22 20:13:54 +03:00
Dean Herbert	68b501b032	Merge branch 'master' into show-mod-settings-tooltip	2020-03-22 13:36:31 +09:00
Andrei Zavatski	2b0c267cb9	Expose Fetch method	2020-03-21 20:37:21 +03:00
Andrei Zavatski	d241f7c55f	Better variable naming	2020-03-21 20:32:55 +03:00
Andrei Zavatski	f8169e9712	Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-layout-split	2020-03-21 20:31:38 +03:00
Dean Herbert	febf9adabd	Merge pull request #8329 from Fuewburvpoa/MyBranch ... Fix beat divisor control selecting invalid divisors on drag end	2020-03-22 02:21:13 +09:00
Dean Herbert	d8041a0dcb	Increase sample concurrency to better match stable	2020-03-22 02:16:28 +09:00
Dean Herbert	29009c85c0	Fix typo in comment ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-22 00:32:53 +09:00
Dean Herbert	729e006c3a	Merge branch 'master' into video-offset	2020-03-21 20:03:46 +09:00
Liam DeVoe	4907fb8fd1	remove another ToString statement	2020-03-20 17:04:22 -04:00
Liam DeVoe	eab705a9b6	remove another ToString statement	2020-03-20 17:00:36 -04:00
Liam DeVoe	ac202ba7ea	remove unused using directive	2020-03-20 16:57:37 -04:00
Liam DeVoe	55568ee6a5	remove extra parentheses	2020-03-20 16:44:38 -04:00
Liam DeVoe	6a63ba1bb8	use humanizer for ModEasy lives setting	2020-03-20 16:42:35 -04:00
Liam DeVoe	cda1efef0b	move overridability to SettingDescription method	2020-03-20 16:34:36 -04:00
Liam DeVoe	7bdbdd25f8	Revert "use SettingSource to define IconTooltip format" ... This reverts commit 5a6d8f1932.	2020-03-20 16:05:12 -04:00
Liam DeVoe	3d95592130	use var for list declaration ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-03-20 14:37:31 -04:00
Liam DeVoe	52469fccbe	Merge branch 'master' into show-mod-settings-tooltip	2020-03-20 13:41:04 -04:00
Liam DeVoe	9e3bff3b97	oops, missed a newline	2020-03-20 13:36:16 -04:00
Liam DeVoe	9dc8146811	fix style issues	2020-03-20 13:21:44 -04:00
Liam DeVoe	5a6d8f1932	use SettingSource to define IconTooltip format	2020-03-20 12:47:17 -04:00
OctopuSSX	157f05c3e5	Update osu.Game/Users/Drawables/DrawableAvatar.cs ... Co-Authored-By: Dean Herbert <pe@ppy.sh>	2020-03-20 14:35:27 +03:00
OctopuSSX	b813c0aff1	Don't open profile if it's Autoplay	2020-03-20 14:26:26 +03:00
Dean Herbert	9b60b535e5	Fix selection not occurring when switching from empty ruleset on first load	2020-03-20 15:01:26 +09:00
Dean Herbert	e64a100e8b	Merge branch 'master' into fix-carousel-restore-previous-selection	2020-03-20 13:03:18 +09:00