5822 Commits

Author	SHA1	Message	Date
Dan Balasescu	0eae8d078b	Merge branch 'master' into master	2020-05-05 13:33:29 +09:00
alex	0e2ccac33b	Add spaces to comments	2020-05-04 18:36:24 -07:00
alex	c987af988c	Fix typo	2020-05-04 18:26:12 -07:00
Dean Herbert	06f58dd3e3	Ensure correct beatmap and ruleset when presenting a score from song select	2020-05-04 15:20:43 +09:00
Dan Balasescu	5767bcb8d7	Merge branch 'master' into add-interval-list	2020-05-04 02:00:14 +09:00
Bartłomiej Dach	8118747732	Make PeriodTracker actually immutable	2020-05-02 01:33:33 +02:00
Joehu	700214d249	Truncate beatmap title and artist on score panel	2020-04-30 22:13:38 -07:00
Dean Herbert	d470e092a3	Merge branch 'master' into fix-overlapping-object-undoredo	2020-05-01 10:45:29 +09:00
Dan Balasescu	5740563391	Merge pull request #8903 from peppy/carousel-loading-spinner ... Show loading spinner when carousel is not ready to be displayed	2020-04-30 21:29:53 +09:00
Dean Herbert	53474c74ee	Merge pull request #8913 from smoogipoo/fix-mania-undo-redo-crash ... Fix mania crashing on undo/redo	2020-04-30 21:03:38 +09:00
Dean Herbert	000c34dc26	Move recommender to field construction	2020-04-30 21:01:53 +09:00
smoogipoo	c96bc5c51c	Fix undo/redo behaving poorly with simultaneous objects	2020-04-30 20:39:41 +09:00
smoogipoo	9bec42bc7e	Fix mania crashing on undo/redo	2020-04-30 20:03:46 +09:00
Dean Herbert	21c6ac8c43	Allow closing the game during intro	2020-04-30 12:12:28 +09:00
Dean Herbert	cf4e79cf38	Show loading spinner when carousel is not ready to be displayed	2020-04-30 11:51:06 +09:00
Dean Herbert	064e5004ed	Merge branch 'master' into fix-mania-selection	2020-04-29 17:15:48 +09:00
Salman Ahmed	6fa9feb15c	Merge remote-tracking branch 'upstream/master' into add-interval-list	2020-04-29 05:14:40 +03:00
Salman Ahmed	6e76e5900a	Rename is-in-any check method to a more legible name	2020-04-29 05:11:44 +03:00
Salman Ahmed	8d899f4e77	Apply changes to the BreakTracker and more adjustment	2020-04-29 05:11:43 +03:00
Dean Herbert	cd22e5883d	Merge pull request #8883 from peppy/dont-use-internal-ef-linq ... Avoid using internal EF methods in tests	2020-04-29 09:54:06 +09:00
Dean Herbert	119000f1ab	Reduce database includes where possible	2020-04-28 21:43:35 +09:00
Dean Herbert	c3a41c8476	Also avoid using internal TypeExtensions	2020-04-28 17:02:10 +09:00
smoogipoo	cebc0fc046	Attempt to fix multiple selection movements	2020-04-27 20:35:24 +09:00
smoogipoo	7f5a1d7f44	Merge branch 'master' into fix-mania-selection	2020-04-27 17:09:40 +09:00
smoogipoo	104c61d622	Remove unnecessary scale	2020-04-27 11:06:23 +09:00
Dean Herbert	48168dddce	Adjust editor timeline current marker to promote tick visibility	2020-04-27 10:54:32 +09:00
Dean Herbert	1c13fa6c61	Fix editor crashing when entering with no beatmap selected	2020-04-24 10:27:32 +09:00
smoogipoo	4ebb28d3e7	wip	2020-04-23 17:52:54 +09:00
smoogipoo	e1142b424d	Fix test failures	2020-04-22 18:14:21 +09:00
smoogipoo	9c22d2f1dd	Use platform bindings for editor actions	2020-04-22 17:41:24 +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
smoogipoo	fcfb2b9026	Merge branch 'master' into fix-select-new-from-sub-screen	2020-04-21 14:36:53 +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	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
Dean Herbert	ee1ccb8bcb	Fix in a slightly different and hopefully more understandable way	2020-04-20 14:03:55 +09: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
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
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	5833a7ac91	Fix presenting new ruleset and beatmap at once causing wedge display desync	2020-04-17 18:56:17 +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
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