15664 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	b86a3dbfab	PathStandardise -> ToStandardisedPath	2019-12-11 16:06:56 +08:00
Huo Yaoyuan	6b3c7c8421	Remove usages of FileSafety class.	2019-12-11 16:05:35 +08:00
Albie	83b2e0525e	further fixes, not perfect yet	2019-12-11 07:02:51 +00:00
Dean Herbert	75f9250645	Don't automatically pause when window is inactive if in break time	2019-12-11 15:46:07 +09:00
Dean Herbert	6c8f325063	Add failing test	2019-12-11 15:46:07 +09:00
Dean Herbert	9ebad16436	Fix logic regression	2019-12-11 14:37:10 +09:00
Dean Herbert	77b9989e11	Fix some weird private field names	2019-12-11 14:10:35 +09:00
Dean Herbert	9eed64997f	Merge branch 'customized-mods' into adjustable-rate-mods	2019-12-11 13:26:05 +09:00
Dean Herbert	5624b9fd3f	Fix US english	2019-12-11 13:19:13 +09:00
Dean Herbert	a37af311d0	Simplify settings update logic	2019-12-11 13:19:02 +09:00
Salman Ahmed	53daa37eaa	Fix failing tests	2019-12-10 23:06:13 +03:00
Albie	a61f8cc2c3	Merge branch 'master' into cinema-mod	2019-12-10 17:06:53 +00:00
Albie	6c1ae3bc8a	add tests	2019-12-10 16:59:31 +00:00
Salman Ahmed	38f1a8bc17	Bind UserDimContainer.IsBreakTime from Player	2019-12-10 15:14:47 +03:00
Salman Ahmed	bb078c2afc	Lighten user-dim container if on break time	2019-12-10 15:13:44 +03:00
Salman Ahmed	b93bbf81aa	Add lighten background during breaks setting	2019-12-10 15:10:35 +03:00
smoogipoo	c378e525da	Extract the rest of legacy enums	2019-12-10 20:23:15 +09:00
smoogipoo	3c18872a16	Extract legacy effect flags enum	2019-12-10 20:19:31 +09:00
smoogipoo	e3f925f69a	Extract legacy hitobject type enum	2019-12-10 20:19:16 +09:00
smoogipoo	8012b21ffa	Extract legacy sound type enum	2019-12-10 20:18:44 +09:00
Dean Herbert	138b83c9ea	Merge branch 'master' into customized-mods	2019-12-10 19:13:32 +09:00
Dean Herbert	f6c0b5c44a	Merge branch 'master' into settings-source	2019-12-10 18:49:41 +09:00
Dean Herbert	efc3b7fc9f	Merge branch 'master' into fix-settings-bindable-logic	2019-12-10 18:30:27 +09:00
Dean Herbert	55c938e5da	Fix bindable usage	2019-12-10 18:08:24 +09:00
Dean Herbert	65f2d1f875	Update framework	2019-12-10 17:49:42 +09:00
Dean Herbert	f7f4a57c5f	Update bindable types in line with framework	2019-12-10 16:48:24 +09:00
Dean Herbert	609c511309	Update framework	2019-12-10 16:43:58 +09:00
Dan Balasescu	bd6a08a21b	Merge branch 'master' into apply-to-track	2019-12-10 16:15:24 +09:00
smoogipoo	94a298a82d	Refactor distance snap grid to not require hitobjects	2019-12-10 16:00:09 +09:00
Dean Herbert	5f3d163772	Merge branch 'master' into segmented-slider-paths-3	2019-12-10 14:28:20 +09:00
smoogipoo	ab0f2e7c6a	Apply suggested refactorings	2019-12-10 13:12:54 +09:00
Dean Herbert	cdde5d1d69	Fix song select filters not reapplied if in a child screen ... Closes https://github.com/ppy/osu/issues/6980.	2019-12-10 02:30:23 +09:00
Dean Herbert	dc9775742c	Fix incorrect code migration ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2019-12-10 02:23:17 +09:00
Dean Herbert	12bdb1dafd	Pin DC/NC pitch	2019-12-09 20:40:38 +09:00
smoogipoo	47f3c4a596	Don't serialise path version	2019-12-09 20:18:18 +09:00
Dean Herbert	edc8220554	Add time ramp settings	2019-12-09 19:58:51 +09:00
Dean Herbert	7fd52c21f5	Update mods and user adjust to use adjustments	2019-12-09 19:41:31 +09:00
Dean Herbert	6b667daf09	Update bindable types in line with framework	2019-12-09 19:41:18 +09:00
Huo Yaoyuan	ad1fb3bda2	Remove IComparable in constraint.	2019-12-09 17:48:41 +08:00
Huo Yaoyuan	c3518a2b94	Enum constraint for enum dropdown.	2019-12-09 17:45:26 +08:00
Huo Yaoyuan	40a5c1fd96	Constrain transformable with class.	2019-12-09 17:45:26 +08:00
Huo Yaoyuan	04b3297a05	Constrain configuration lookup as enum.	2019-12-09 17:45:26 +08:00
smoogipoo	cd61893814	Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3	2019-12-09 18:25:27 +09:00
smoogipoo	6d9cd0fafe	Split out complex method	2019-12-09 18:25:13 +09:00
smoogipoo	b6e2738236	Remove unused using	2019-12-09 18:15:00 +09:00
Dean Herbert	9fa745aecc	Merge branch 'apply-to-track' into adjustable-rate-mods	2019-12-09 18:12:01 +09:00
Dean Herbert	d650bfb6d6	Remove unnecessary cast	2019-12-09 18:05:14 +09:00
smoogipoo	a1798fd38d	Fix bad ctor implementation	2019-12-09 18:01:13 +09:00
smoogipoo	bfbb9aa18e	Remove outdated assert	2019-12-09 18:01:02 +09:00
Dean Herbert	c39d2f006c	Merge branch 'master' into fix-settings-bindable-logic	2019-12-09 17:55:17 +09:00
smoogipoo	883d5bc11d	Remove automatic slider path offsetting	2019-12-09 17:54:22 +09:00
smoogipoo	9cb649436c	Default to linear control point type	2019-12-09 17:47:05 +09:00
smoogipoo	5a093c039c	Simplify path/point construction	2019-12-09 17:46:40 +09:00
Dean Herbert	ba538cf09b	Merge branch 'apply-to-track' into adjustable-double-time	2019-12-09 17:45:19 +09:00
Dean Herbert	eb074b7058	Allow mods to apply to track, not clock	2019-12-09 17:44:45 +09:00
Dean Herbert	0c7e5a2e3b	Add bindable adjustments for DT/HT rate	2019-12-09 16:54:00 +09:00
Dean Herbert	e37526888c	Merge remote-tracking branch 'upstream/master' into adjustable-double-time	2019-12-09 16:43:17 +09:00
dependabot-preview[bot]	12cfb7dedb	Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0 ... Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0. - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-12-09 07:28:11 +00:00
smoogipoo	c18f2e6436	Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3	2019-12-09 15:34:49 +09:00
Dan Balasescu	0c9f7a64f1	Merge branch 'master' into improve-dialog-button-visuals	2019-12-09 15:31:48 +09:00
Dan Balasescu	07efd66287	Merge pull request #7075 from peppy/editor-timeline-hitobject-display ... Editor timeline hitobject display	2019-12-09 14:53:25 +09:00
Dan Balasescu	5738ef5fab	Merge branch 'master' into editor-timeline-hitobject-display	2019-12-09 14:34:55 +09:00
Dean Herbert	58db745121	Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals	2019-12-09 14:11:52 +09:00
Dean Herbert	03d18186c2	Fix broken merge	2019-12-09 14:11:44 +09:00
Andrei Zavatski	69deb0ca96	Fix unavailable replays can be accessed via leaderboard	2019-12-09 07:19:55 +03:00
smoogipoo	4905709ea4	Remove unused usings	2019-12-09 13:19:21 +09:00
Dean Herbert	003eef8595	Fix mod buttons being selected when drag scrolling overlay (#7099) ... Fix mod buttons being selected when drag scrolling overlay	2019-12-09 12:24:48 +09:00
Dean Herbert	ad2ecf4dff	Fix key config search not clearing after pressing escape (#7105) ... Fix key config search not clearing after pressing escape	2019-12-09 12:22:30 +09:00
Dean Herbert	4fbe5b7002	Merge branch 'master' into rankings-overlay-refactor	2019-12-09 11:34:32 +09:00
Joehu	9974fff5cc	Make sub panel back button inherit osu button	2019-12-08 10:51:25 -08:00
Joehu	5cf35869e9	Fix key config search not clearing after pressing escape	2019-12-08 10:40:39 -08:00
Lucas A	88ec0c1486	Add missing async content loading logic to NewsOverlay	2019-12-08 18:49:58 +01:00
Dean Herbert	fd38e56435	Merge branch 'master' into fix-settings-bindable-logic	2019-12-09 02:18:51 +09:00
Dean Herbert	c2a40c574d	Split out if statement for readability	2019-12-09 02:13:47 +09:00
Joehu	e394b28799	Remove redundant transform	2019-12-08 09:12:32 -08:00
Joehu	463b6c0030	Remove whitespace	2019-12-08 09:04:34 -08:00
Joehu	8956768fe0	Fix mod buttons being selected when drag scrolling overlay	2019-12-08 08:55:45 -08:00
Andrei Zavatski	929be3e9e7	Highlight own score in BeatmapSetOverlay	2019-12-08 12:34:07 +03:00
Dan Balasescu	52a0d98012	Merge pull request #7077 from peppy/fix-player-loader-speed ... Fix mod speed adjustments unapplying if exiting the player loading screen early	2019-12-08 03:53:55 +09:00
Dan Balasescu	54798b134e	Add accessibility modifiers	2019-12-08 03:16:41 +09:00
Dan Balasescu	299daa26da	Merge branch 'master' into dont-confine-skins	2019-12-08 03:14:24 +09:00
Dean Herbert	5347e7c4a2	Apply code quality improvements	2019-12-06 20:14:06 +09:00
Dean Herbert	347373a3ba	Fix test failures	2019-12-06 19:04:55 +09:00
Dean Herbert	46d055604a	Customize -> Customise	2019-12-06 18:59:45 +09:00
Dean Herbert	680b2653ae	Improve animation of popup dialog buttons	2019-12-06 18:51:30 +09:00
smoogipoo	16f8341a02	Handle control point positional updates within SliderPath	2019-12-06 18:49:01 +09:00
Dean Herbert	cf0413663d	Merge branch 'settings-source' into customized-mods	2019-12-06 18:05:39 +09:00
Dean Herbert	2fa0b30fa2	Add textbox and dropdown support	2019-12-06 18:04:46 +09:00
Dean Herbert	ed6d1ccd95	Add a method for getting settings UI components automatically from a target class	2019-12-06 18:04:46 +09:00
Dean Herbert	901eb5d996	Fix incorrect trigger logic	2019-12-06 18:03:50 +09:00
Dean Herbert	9de032e35f	Fix SettingsItem bindable logic	2019-12-06 17:10:06 +09:00
Dean Herbert	a5d5099868	Use SettingsSource for mod cusomisation	2019-12-06 17:09:48 +09:00
Dean Herbert	23e47530c5	Add a method for getting settings UI components automatically from a target class	2019-12-06 17:09:24 +09:00
smoogipoo	b4e1b5fa98	Explose + use the full calculated length of the path	2019-12-06 15:53:19 +09:00
Dean Herbert	af35df4077	Add multiple mod testing and update test code style	2019-12-06 15:42:11 +09:00
smoogipoo	2654710d91	Add tests and fix negative expected distances	2019-12-06 15:37:06 +09:00
Dean Herbert	170954bc6e	Merge remote-tracking branch 'upstream/master' into customized-mods	2019-12-06 15:31:20 +09:00
Dean Herbert	f4bc9f087e	Merge remote-tracking branch 'upstream/master' into fix-player-loader-speed	2019-12-06 15:29:06 +09:00
smoogipoo	27dd12a66d	Rewrite slider length calculation for readability	2019-12-06 15:06:31 +09:00
Dean Herbert	21ceb7f85d	Always display skins at native sizes for now	2019-12-06 14:40:45 +09:00
Dean Herbert	04b89c8242	Merge branch 'master' into expertplus-tooltip-colour	2019-12-06 13:54:13 +09:00
Dean Herbert	48c6279e8b	Only undo adjustments in GameplayClockContainer if applied at least once	2019-12-06 13:49:22 +09:00
Dean Herbert	de23364608	Add failing test	2019-12-06 13:47:34 +09:00
Dean Herbert	b1426d1b22	Full impossible nullref	2019-12-06 12:51:43 +09:00
Dean Herbert	9248fbe881	Remove extra checkboxes for now	2019-12-06 12:22:44 +09:00
Dean Herbert	9f4c8db395	Add xmldoc	2019-12-06 12:17:41 +09:00
Ganendra Afrasya	8be6abf607	Add param to let function return lighter colour for some diff	2019-12-06 10:07:16 +07:00
smoogipoo	23c7132c4f	Add missing license header	2019-12-06 11:53:22 +09:00
Dean Herbert	28400aa865	Update test scene	2019-12-06 11:27:24 +09:00
Dean Herbert	12a9843835	Move thickness to a constant	2019-12-06 10:48:18 +09:00
Dean Herbert	e76f8bdd64	Fix warnings	2019-12-05 23:31:21 +09:00
Dean Herbert	d8620a70fb	Make work in editor	2019-12-05 20:12:25 +09:00
smoogipoo	3ebbf62b2a	Initial game-wide update with the new SliderPath	2019-12-05 19:53:36 +09:00
Dean Herbert	e225b0032a	Add basic hitobject display to timeline	2019-12-05 19:31:40 +09:00
smoogipoo	c9a66c0d07	Expose a version to indicate path changes	2019-12-05 18:31:28 +09:00
Dean Herbert	2419077c07	Update framework	2019-12-05 18:31:13 +09:00
smoogipoo	1585d83b96	Add legacy constructor	2019-12-05 18:19:42 +09:00
smoogipoo	986ac1cee4	Make expected distance a bindable	2019-12-05 17:51:29 +09:00
smoogipoo	2702edfa55	Rename new path, replace existing one	2019-12-05 17:49:32 +09:00
Ganendra Afrasya	0e97871461	Change colour if difficulty is ExpertPlus	2019-12-05 14:53:01 +07:00
smoogipoo	5e9b739b67	Re-implement slider paths to support multiple segments	2019-12-05 16:45:02 +09:00
Andrei Zavatski	33737d3d89	Move tests to TestSceneRankingsOverlay due to refactoring	2019-12-05 09:53:25 +03:00
Andrei Zavatski	22863da360	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor	2019-12-05 09:29:37 +03:00
Dean Herbert	de413418c7	Remove redundant prefix	2019-12-05 14:50:12 +09:00
smoogipoo	0149e47673	Expose general control point change event	2019-12-05 14:38:32 +09:00
smoogipoo	3e0f499e72	Add xmldocs	2019-12-05 14:38:21 +09:00
Dean Herbert	6e9157d59c	Standardise request/response handling	2019-12-05 14:29:48 +09:00
Dean Herbert	cd473f207a	Use child set, not Clear/Add	2019-12-05 14:09:33 +09:00
Dean Herbert	5f9b9631ef	Move scope/country restrictions into RankingsOverlay	2019-12-05 14:07:39 +09:00
Dean Herbert	753715f7db	Merge branch 'master' into rankings-overlay-refactor	2019-12-05 13:46:21 +09:00
smoogipoo	40d0700fa5	Add structure for path control points	2019-12-05 13:43:38 +09:00
Dan Balasescu	36c734c4c2	Merge branch 'master' into decouple-api-room-scoreinfo	2019-12-05 12:43:43 +09:00
Dan Balasescu	f18519965c	Merge branch 'master' into eager-skip-filters	2019-12-05 12:27:42 +09:00
Andrei Zavatski	f8f144b6c0	Remove pointless ScheduledDelegate	2019-12-05 05:20:22 +03:00
Andrei Zavatski	48732e49b9	Improve async logic	2019-12-05 04:20:13 +03:00
Andrei Zavatski	0560a6637c	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor	2019-12-05 04:11:45 +03:00
Dean Herbert	48287459a0	Optimise filters to avoid property retrieval ... Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.	2019-12-05 01:52:22 +09:00
Dean Herbert	36224dca13	Fix multiplayer aggregate score inheriting from ScoreInfo	2019-12-05 01:45:28 +09:00
Dean Herbert	9ac0ac0944	Merge branch 'master' into fix-pause-testcase	2019-12-05 01:00:27 +09:00
Dean Herbert	0734b52483	Update framework	2019-12-04 23:33:26 +09:00
Dean Herbert	ca1f3417a3	Merge pull request #7046 from smoogipoo/fix-replay-button ... Fix replay download button not working	2019-12-04 23:00:40 +09:00
Dan Balasescu	19c5848e73	Merge branch 'master' into decouple-legacy-score-info	2019-12-04 11:47:27 +09:00
Dan Balasescu	242e1b0b2e	Merge branch 'master' into add-missing-long-running	2019-12-04 11:29:25 +09:00
Huo Yaoyuan	46c9bdcf62	Replace Convert.ChangeType with IConvertible.	2019-12-03 20:49:41 +08:00
Huo Yaoyuan	5375af7820	Remove other Equals(object) calls.	2019-12-03 20:23:27 +08:00
Huo Yaoyuan	05cfef92f9	Don't compare spans with null.	2019-12-03 20:09:58 +08:00
Huo Yaoyuan	a42f9447e6	Don't use Equals(object) on T?.	2019-12-03 20:07:22 +08:00
Dean Herbert	e2591f154b	Only parse statistics when not null	2019-12-03 16:16:46 +09:00
Dean Herbert	1ce6a5ceb3	Rename class	2019-12-03 15:38:57 +09:00
Dean Herbert	f0d49d0cdf	Decouple APILegacyScoreInfo from ScoreInfo	2019-12-03 15:31:11 +09:00
smoogipoo	aadbbb1af3	Fix replay download button not working	2019-12-03 13:33:42 +09:00
recapitalverb	1ec11946c6	Fix spelling in comment on SearchTextBox.OnPressed	2019-12-02 18:45:57 +07:00
Dean Herbert	6893ec22bb	Fix currenTrackCompleted not being run on main thread	2019-12-02 18:26:45 +09:00
Dan Balasescu	700fe5162d	Merge branch 'master' into fix-overlays-drag-closing	2019-12-02 14:12:37 +09:00
Dan Balasescu	133c25f4c1	Merge branch 'master' into hide-mouse-in-playfield	2019-12-02 13:29:32 +09:00
Joehu	74176a6954	Remove redundant ternary expression	2019-12-01 12:54:37 -08:00
Joehu	3b88afd069	Fix overlays closing when dragging from in/out or out/in	2019-12-01 12:02:47 -08:00
Andrei Zavatski	62daea195c	Fix possible null	2019-12-01 04:09:45 +03:00
Andrei Zavatski	f375db368f	Remove useless null check	2019-12-01 03:56:03 +03:00
Andrei Zavatski	0ac4675546	Implement IEquatable<Country>	2019-12-01 03:52:41 +03:00
Andrei Zavatski	c451542915	Rankings overlay basic implementation	2019-11-30 03:01:07 +03:00
Dean Herbert	c49aeb08c4	Add API methods to perform requests out-of-queue	2019-11-29 20:03:14 +09:00
Dean Herbert	f181ee1843	Hide the menu cursor while inside the playfield by default	2019-11-29 17:35:11 +09:00
Dean Herbert	5dbc32f49b	Fix MedalIcon usage	2019-11-29 16:19:57 +09:00
Dean Herbert	b51ebe4431	Fix ScoreResultsPage usage	2019-11-29 15:50:50 +09:00
Dean Herbert	7efbf9f38f	Merge remote-tracking branch 'upstream/master' into rankings-tables	2019-11-29 15:37:08 +09:00
Dean Herbert	e678fe7a77	Move potentially expensive load to BDL	2019-11-29 15:35:33 +09:00
Dean Herbert	2663e5d756	Add some more missing LongRunningLoad flags	2019-11-29 13:52:23 +09:00
Dean Herbert	f4f54bc46b	Fix social browser calling game-wide load stalls	2019-11-29 13:03:17 +09:00
Andrei Zavatski	36d694ad2d	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables	2019-11-28 20:43:17 +03:00
Dean Herbert	9a941c4f94	Update font loading to use new method	2019-11-29 02:15:13 +09:00
Andrei Zavatski	83e3ad9e69	Make Rankings a ctor variable	2019-11-28 20:09:05 +03:00
Andrei Zavatski	da01f0ee5a	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables	2019-11-28 20:08:41 +03:00
Dean Herbert	b20e62096d	Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale	2019-11-29 01:49:25 +09:00
Albie	7864899249	Merge branch 'master' into cinema-mod	2019-11-28 16:42:01 +00:00
Dean Herbert	bb0a4db847	Fix failing tests	2019-11-29 01:17:58 +09:00
Dean Herbert	b9a8a36e60	Update framework	2019-11-29 00:44:32 +09:00
Ganendra Afrasya	71a871d7d1	Add loved enum on BeatmapApproval	2019-11-28 21:59:57 +07:00
Dean Herbert	56e8a1fdd5	Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale	2019-11-28 22:02:31 +09:00
Dean Herbert	a4f584c6a4	Update framework	2019-11-28 22:00:01 +09:00
Ganendra Afrasya	ada8dabf7e	Add right margin on score multiplier text	2019-11-28 18:48:43 +07:00
Dean Herbert	46379902be	Merge branch 'master' into hover-debounce	2019-11-28 20:44:32 +09:00
Dean Herbert	aa9776d51a	seal and compact rows	2019-11-28 19:07:43 +09:00
smoogipoo	f504370867	Make player block exit if pausable	2019-11-28 15:58:26 +09:00
Min	92ab8026a0	Completely remove click sound debounce	2019-11-28 16:03:59 +11:00
Ganendra Afrasya	944835da23	Add multiplier score text on mods footer button	2019-11-28 12:01:40 +07:00
Andrei Zavatski	8077c86d13	CI fixes	2019-11-27 23:58:31 +03:00
Andrei Zavatski	800bda7e81	Refactor tables to avoid code duplication	2019-11-27 23:35:02 +03:00
Andrei Zavatski	c546df8a80	Refactor API logic	2019-11-27 21:56:22 +03:00
Andrei Zavatski	2135a7fd7b	Don't use repetitive headers in each class	2019-11-27 21:46:41 +03:00
Andrei Zavatski	4cf5968026	Simplify place calculation	2019-11-27 21:39:38 +03:00
Andrei Zavatski	14c471fe5d	Move Rankings property below ctor	2019-11-27 21:37:34 +03:00
Andrei Zavatski	bb3152ac8b	Use string.empty for empty headers	2019-11-27 21:35:03 +03:00
Dean Herbert	e1302d84dd	Use string.Empty	2019-11-28 00:26:10 +09:00
Dean Herbert	2865f32052	Fix nullref on clicking links in tests	2019-11-28 00:13:44 +09:00
Dean Herbert	4221a0126c	Merge branch 'master' into rankings-tables	2019-11-27 23:26:54 +09:00
phosphene47	786fb9ede3	Split click and hover and disable click debounce	2019-11-28 00:44:01 +11:00
phosphene47	d4afea0b5e	Use double instead of TimeSpan	2019-11-27 23:06:07 +11:00
phosphene47	037d927e45	TimeSpans can be negative!	2019-11-27 22:51:27 +11:00
phosphene47	b126700f01	Debounce hover sounds	2019-11-27 22:47:00 +11:00
Huo Yaoyuan	ffb5b6c82b	Merge branch 'master' into ci	2019-11-27 19:38:24 +08:00
Dean Herbert	01a37771bc	Merge branch 'master' into customized-mods	2019-11-27 19:44:32 +09:00
Dan Balasescu	c6a85a11bd	Merge branch 'master' into sharpen	2019-11-27 17:09:11 +09:00
Dean Herbert	9494a477b6	Consider intro and outro time as "break" time (#6960) ... Consider intro and outro time as "break" time Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-11-27 17:09:01 +09:00
smoogipoo	d1e3718038	Reduce the scale of background blurs	2019-11-27 15:04:09 +09:00
Huo Yaoyuan	eba8657d38	Remove newly introduced redundant this.	2019-11-26 18:41:19 +08:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Huo Yaoyuan	deaeda7348	Change packing to be runned by AppVeyor.	2019-11-26 17:17:10 +08:00
Huo Yaoyuan	ffb2f21f50	Merge branch 'master' into ci	2019-11-26 15:41:34 +08:00
Albie	09158b6b08	Merge branch 'master' into cinema-mod	2019-11-26 06:57:47 +00:00
Dean Herbert	ab017ee648	Update framework	2019-11-26 15:37:13 +09:00
Dean Herbert	77ce9642ba	Add test coverage and simplify break time updating	2019-11-26 15:32:48 +09:00
Dean Herbert	a453129d44	Fix nullref in tests	2019-11-26 15:13:50 +09:00
Dan Balasescu	8a8e863c0e	Merge branch 'master' into intro-outro-break	2019-11-26 12:47:42 +09:00
Dan Balasescu	7c5a49c4d8	Merge branch 'master' into username-login	2019-11-26 12:28:57 +09:00
Dan Balasescu	b21de98296	Merge branch 'master' into get-end-time	2019-11-26 11:47:01 +09:00
Dean Herbert	fbebbab5db	Remove excess parenthesis	2019-11-25 22:37:07 +09:00
Albie	87ee3f1083	Merge branch 'master' into cinema-mod	2019-11-25 13:35:14 +00:00
Dean Herbert	1fd5ed3c0f	Change login placeholder text to ask for username	2019-11-25 21:35:25 +09:00
Huo Yaoyuan	d2f6439d5f	Merge branch 'master' into ci	2019-11-25 19:48:26 +08:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Dean Herbert	6b8983b489	Consider intro and outro time as "break" time	2019-11-25 19:02:11 +09:00
smoogipoo	719f0d5947	Fix stutters when changing beatmap difficulties	2019-11-25 18:28:43 +09:00
Huo Yaoyuan	575b4db186	Patch csproj version.	2019-11-25 16:42:20 +08:00
Huo Yaoyuan	3a62406c58	Update deploy script.	2019-11-25 16:42:20 +08:00
Albie	0a70ec0b11	Merge branch 'master' into cinema-mod	2019-11-25 07:25:30 +00:00
Albie	9fdbb2a58e	change name of interface and expose method instead of seperate values	2019-11-25 07:24:29 +00:00
Dan Balasescu	dd7e4b2340	Merge branch 'master' into dimmed-load-input-blocking	2019-11-25 13:49:10 +09:00
Dan Balasescu	51eff3d49c	Merge branch 'master' into add-access-to-skin-legacy-version	2019-11-25 12:40:01 +09:00
Dan Balasescu	92c4e8e4f6	Merge pull request #6911 from peppy/fix-spritetext-usage ... Fix usage of SpriteText instead of OsuSpriteText	2019-11-25 12:30:45 +09:00
Dean Herbert	22bdc8435d	Increase padding on mod section title (#6916) ... Increase padding on mod section title	2019-11-25 12:28:38 +09:00
Dan Balasescu	9f93727a80	Merge branch 'master' into fix-spritetext-usage	2019-11-25 12:15:05 +09:00
Dan Balasescu	ffd2ba5d7d	Merge branch 'master' into beatmap-overlay-no-supporter-filter	2019-11-25 11:51:10 +09:00
Dean Herbert	36cabe72cf	Make DimmedLoadingLayer block input when active	2019-11-25 11:49:54 +09:00
Dean Herbert	b85189f855	Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage	2019-11-25 11:31:12 +09:00
Dean Herbert	45514ff660	Apply fixes	2019-11-25 11:30:55 +09:00
Dan Balasescu	19339326e2	Merge branch 'master' into andy840119/_20191124_fix_ApplyToDrawableHitObjects	2019-11-25 11:30:44 +09:00
Berkan Diler	fccdbffa93	Use MathF instead of Math- functions when possible ... MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.	2019-11-25 00:45:42 +01:00
Albie	9a8e3fe1da	add brackets	2019-11-24 07:44:35 +00:00
Albie	1d6665fe57	improve code quality using resharper and codefactor advice	2019-11-24 07:42:39 +00:00
Albie	8294b9ebe7	Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod	2019-11-24 07:37:47 +00:00
Albie	b8e5796af5	add forced video/storyboard and disabled dim for mod inside new interface	2019-11-24 07:37:06 +00:00
andy840119	6126fd9a6b	ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield	2019-11-24 10:42:05 +09:00
iiSaLMaN	b58afa3eb6	Remove unnecessary mentioning in xmldoc	2019-11-24 04:36:34 +03:00
iiSaLMaN	20a8a653c2	Change LegacySkin.Configuration accessibility	2019-11-24 04:10:04 +03:00
Andrei Zavatski	96533631fc	Simplify if/else statement	2019-11-24 01:29:11 +03:00
Andrei Zavatski	29b05e2939	Fix getScores can be fired twice on user change	2019-11-24 00:01:49 +03:00
Andrei Zavatski	ced78dc900	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-no-supporter-filter	2019-11-23 23:54:46 +03:00
Albie	aa00909ef7	Merge branch 'master' into cinema-mod	2019-11-23 18:38:41 +00:00
Albie Spriddell	20edaf4ba6	add cinema mod support	2019-11-23 17:32:16 +00:00