4513 Commits

Author	SHA1	Message	Date
smoogipoo	2b155e5407	Merge remote-tracking branch 'origin/master' into multi-room-update	2019-08-13 17:03:44 +09:00
Dan Balasescu	f6e1df8952	Merge branch 'master' into triangles	2019-08-13 16:34:08 +09:00
Andrei Zavatski	982066dfdf	Convert to method group	2019-08-12 10:38:34 +03:00
Dean Herbert	75cb0d093b	Use description correctly ... Required for localisation	2019-08-12 16:10:48 +09:00
Andrei Zavatski	cb910a6518	Replace if/else statement	2019-08-12 10:02:45 +03:00
Andrei Zavatski	5b68a2f34a	Rename trackManager to previewTrackManager	2019-08-12 09:50:49 +03:00
Andrei Zavatski	520924b440	Don't create a new request if onlineId is null	2019-08-12 09:45:21 +03:00
Andrei Zavatski	6095480a54	Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update	2019-08-12 09:36:15 +03:00
Dean Herbert	d0f2d22995	Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim	2019-08-12 05:46:15 +09:00
Dean Herbert	9ac4870a21	Merge branch 'master' into triangles	2019-08-12 02:24:45 +09:00
Dean Herbert	359261d4a4	Fix game not starting if intro music is disabled	2019-08-12 02:04:06 +09:00
Andrei Zavatski	e7964c165f	Make judgement lines alive for a bit longer	2019-08-11 19:09:50 +03:00
Andrei Zavatski	3136d46c7f	Do not generate new judgement line on miss	2019-08-11 19:04:56 +03:00
Andrei Zavatski	5e0ac28ca8	Add basic colours	2019-08-11 18:30:03 +03:00
Andrei Zavatski	177a317a48	rename AccuracyBar to HitErrorDisplay	2019-08-11 18:11:49 +03:00
Andrei Zavatski	2a35c3c3e2	Calculate real position for judgement lines	2019-08-11 18:04:54 +03:00
Andrei Zavatski	0a255fe4d1	Add moving arrow	2019-08-11 16:38:03 +03:00
Andrei Zavatski	ed409d113b	Add judgement lines generator	2019-08-11 15:53:15 +03:00
Andrei Zavatski	fd334e0319	Implement basic layout for AccuracyBar	2019-08-11 14:57:21 +03:00
Dean Herbert	cb0cd7ed58	Add triangles intro	2019-08-09 20:05:28 +09:00
Dean Herbert	90b1fe81f3	Update cached usage in line with framework changes	2019-08-09 19:12:29 +09:00
iiSaLMaN	0fcc6c1676	Add DimLevel property	2019-08-08 22:13:48 +03:00
iiSaLMaN	bedb744a2e	Add parentheses	2019-08-08 17:11:26 +03:00
iiSaLMaN	88b9942b2a	Move EnableUserDim check to defualt value of ShowDimContent	2019-08-08 17:07:06 +03:00
Andrei Zavatski	9ab132520c	Testcase improvements	2019-08-08 12:25:46 +03:00
Andrei Zavatski	e9b5c91690	Fade out existing panel on beatmap change	2019-08-08 12:08:51 +03:00
Andrei Zavatski	08a92c38d7	adjust naming	2019-08-08 12:04:44 +03:00
Andrei Zavatski	1b559c1585	Use async loading	2019-08-08 12:01:33 +03:00
Dean Herbert	a3dbaef4ca	Adjust background gradient	2019-08-08 17:29:50 +09:00
Andrei Zavatski	8668bce25d	Fix preview can be played on start	2019-08-08 09:52:42 +03:00
Andrei Zavatski	cbcdc28900	Fix hard crash when clicking on a preview button	2019-08-08 09:04:24 +03:00
Andrei Zavatski	f5cd0eae48	Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update	2019-08-08 09:04:06 +03:00
Dean Herbert	2172c5a52b	Merge branch 'master' into use-bindable-break-time-in-player	2019-08-08 14:24:52 +09:00
Andrei Zavatski	4a38c4f9d1	Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update	2019-08-08 07:36:53 +03:00
Dean Herbert	f774c46f57	Remove linq usage in BreakOverlay update (#5641) ... Remove linq usage in BreakOverlay update	2019-08-08 13:33:23 +09:00
Joehu	77df6a0cb7	Remove unused direct placeholder screen	2019-08-07 21:16:36 -07:00
Andrei Zavatski	a4459972b6	Remove ViewBeatmapButton	2019-08-08 07:15:30 +03:00
Andrei Zavatski	ffed642929	Implement MatchBeatmapPanel	2019-08-08 07:08:51 +03:00
Dean Herbert	7d42561da9	Remove linq usage in BreakOverlay update	2019-08-08 12:58:20 +09:00
Salman Ahmed	3f9f9e7bc9	Merge branch 'master' into use-bindable-break-time-in-player	2019-08-08 05:36:45 +03:00
Dean Herbert	99f5ca07ce	Remove redundant comment	2019-08-08 10:42:54 +09:00
Dean Herbert	40a33b3382	Move IsLoaded check to more correct place	2019-08-08 10:41:23 +09:00
Dean Herbert	a2e3ab6463	Merge branch 'master' into add-bindable-for-break-times	2019-08-08 10:13:14 +09:00
iiSaLMaN	ba269a49ee	Expose break fade duration and add it in the calculation	2019-08-07 16:59:35 +03:00
iiSaLMaN	d3657d82cd	Simplify final check for break time	2019-08-07 16:28:16 +03:00
iiSaLMaN	c2b3c28c79	Use IsBreakTime for checking if currently in a break ... Rather than iterating over all breaks to find which is in current time	2019-08-07 16:15:53 +03:00
Dean Herbert	616de1830a	Less sheep	2019-08-07 12:20:49 +09:00
Dean Herbert	9033327923	Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds	2019-08-07 12:19:25 +09:00
Dean Herbert	dda078277a	Minor variable name changes	2019-08-06 23:05:12 +09:00
iiSaLMaN	2a68bb2749	onCompletionEvent -> pushResults	2019-08-06 14:11:43 +03:00
iiSaLMaN	dd701eaa62	Safely cancel the completion task on restart or immediate exit	2019-08-06 14:10:03 +03:00
Joehu	1fc7ddf621	Fix text depth regression	2019-08-05 18:14:41 -07:00
Joehu	a7ac411c25	Fix footer button hover sounds playing in unclickable area	2019-08-05 17:57:04 -07:00
Dan Balasescu	cd27e1eb70	Merge branch 'master' into update-direct-categories-sorting	2019-08-05 17:11:48 +09:00
Andrei Zavatski	fd44ca3233	Rename Animation to Layer	2019-08-04 13:54:23 +03:00
Andrei Zavatski	a30d7912b1	Move DimmedLoadingAnimation to it's own file	2019-08-04 11:09:12 +03:00
Joehu	0082695cd8	Choose default category sorting instead of being always first	2019-08-02 13:22:58 -07:00
Dean Herbert	4c6cccb3a3	Update settings in line with framework changes	2019-07-30 23:31:21 +09:00
iiSaLMaN	e6e315e07b	Expose current break index	2019-07-30 13:29:41 +03:00
Salman Ahmed	c8b7cf8672	Merge branch 'master' into add-bindable-for-break-times	2019-07-30 06:23:47 +03:00
Dean Herbert	2d03c849bf	Improve testability of intro sequence (#5275) ... Improve testability of intro sequence	2019-07-29 18:56:38 +09:00
Dan Balasescu	0dc25d7a35	Merge branch 'master' into exit-multi-from-null	2019-07-29 13:52:26 +09:00
David Zhao	26fc782de9	Don't exit if screenstack is null	2019-07-29 10:35:51 +09:00
Dean Herbert	088c04a20f	Revert "Fix BackButton handling escape before all other elements (#5440)" ... This reverts commit 17a6563f4c.	2019-07-28 23:38:55 +09:00
iiSaLMaN	5bf0277fd4	Remove unnecessary quick check ... Not saving for anything	2019-07-28 09:17:13 +03:00
iiSaLMaN	1dd3a66300	Remove unnecessary index resets	2019-07-28 09:16:19 +03:00
Dean Herbert	872822035a	Merge branch 'master' into back-button-priority	2019-07-28 12:50:18 +09:00
iiSaLMaN	95b568eb46	Remove unnecessary condition	2019-07-27 15:52:30 +03:00
iiSaLMaN	6c580ac9d5	Use while loops instead	2019-07-27 15:52:01 +03:00
Dean Herbert	3571cb96b0	Fix broken merge	2019-07-27 12:56:55 +09:00
David Zhao	57e6c388a1	Merge branch 'master' into carousel-sizing	2019-07-27 11:40:07 +09:00
Salman Ahmed	934439e138	Merge branch 'master' into add-bindable-for-break-times	2019-07-26 12:57:52 +03:00
Dean Herbert	392e1cbafb	Merge pull request #5456 from peppy/fix-import-select ... Fix beatmap present failing directly after an import	2019-07-26 18:48:49 +09:00
Dean Herbert	4d49aad153	Start not visible	2019-07-26 15:51:51 +09:00
Dean Herbert	7fa419a38b	Fix file layout order	2019-07-26 15:49:21 +09:00
iiSaLMaN	4c9e8527d8	Modify global index directly in the for loop ... Moves the global index to a near break if not in a break yet	2019-07-26 09:24:53 +03:00
David Zhao	0f6c6c7de0	consolidate halfheight as well	2019-07-26 15:22:29 +09:00
Joehu	0b6cfec21c	Hide leaderboard mod filter when on details tab	2019-07-25 23:20:56 -07:00
iiSaLMaN	5a94a22314	Add a quick check if we're not in a break with current index	2019-07-26 09:17:39 +03:00
David Zhao	6765e9f7fa	Combine into properties and update for framework changes	2019-07-26 15:13:10 +09:00
iiSaLMaN	3fa6804501	Use better loops for moving index ... Easy to read, suggested by peppy	2019-07-26 08:12:32 +03:00
iiSaLMaN	806d41daf4	Add function to reset break index	2019-07-26 08:11:13 +03:00
iiSaLMaN	91fa8a6552	Simplify null and any check	2019-07-26 08:09:18 +03:00
David Zhao	c89830f3d8	move constants, combine local vars into properties	2019-07-26 13:07:28 +09:00
iiSaLMaN	44895c4b69	Use IReadOnlyList for break periods list	2019-07-26 05:41:10 +03:00
iiSaLMaN	b4c93b1777	Use lookup direction than 2 while loops	2019-07-26 05:11:01 +03:00
iiSaLMaN	a08d54eb06	Remove unnecessary checks	2019-07-26 03:11:59 +03:00
Shane Woolcock	1d6c321e14	Ensure we don't ping-pong nearestBreakIndex between breaks	2019-07-26 08:34:18 +09:30
Shane Woolcock	5e51012800	Rewrite updateBreakTimeBindable	2019-07-25 22:54:05 +09:30
iiSaLMaN	cdda264c49	Use global index and move it to find if break time ... Avoid using iterations	2019-07-25 12:28:21 +03:00
iiSaLMaN	5a55433d6c	Return if breaks are null ... Fixes a test	2019-07-25 11:53:32 +03:00
iiSaLMaN	172a9ce33a	Use a for loop instead of foreach ... avoid allocating an iterator	2019-07-25 11:40:45 +03:00
David Zhao	a9f0dda9d7	Confine positional input	2019-07-25 17:36:13 +09:00
David Zhao	97eb5293a8	Don't depend on parent sizing	2019-07-25 17:32:21 +09:00
iiSaLMaN	9bd66b6e7a	Better xmldoc	2019-07-25 11:27:32 +03:00
iiSaLMaN	69d2f57f4f	Avoid using LINQ	2019-07-25 11:27:01 +03:00
iiSaLMaN	0ea0a10ca4	Expose as IBindable<bool>	2019-07-25 11:26:38 +03:00
iiSaLMaN	7b82d184bd	Add bindable boolean for break times	2019-07-25 11:07:53 +03:00
David Zhao	c4bed0e6d2	Resize BeatmapCarousel, update carouselitem logic	2019-07-25 15:31:21 +09:00
Dean Herbert	69844e6c24	Fix beatmap present failing directly after an import	2019-07-25 12:18:18 +09:00
David Zhao	6ef3c71e22	remove unused using	2019-07-25 11:31:46 +09:00
David Zhao	e63c97b306	remove unnecessary overrides	2019-07-25 11:20:24 +09:00
David Zhao	bbcc8f0721	Add new container level and unblock footer	2019-07-25 11:11:20 +09:00
Dean Herbert	ade661236a	Merge branch 'master' into intro-testing-improvements	2019-07-22 23:44:14 +09:00
Dean Herbert	a05a6bbb77	Set "Title" as the default grouping/sorting modes in song select (#5396) ... Set "Title" as the default grouping/sorting modes in song select	2019-07-22 18:06:23 +09:00
Dean Herbert	e76b3e2b40	User property instead of method	2019-07-21 10:42:40 +09:00
iiSaLMaN	842417cf42	Check if selected scope requires API	2019-07-21 03:07:27 +03:00
smoogipoo	1ce2b2eace	Set title as default grouping/sorting modes	2019-07-18 13:18:06 +09:00
Dean Herbert	a6ddcd78d4	Fix results screen not showing first tab correctly	2019-07-18 01:08:12 +09:00
Dean Herbert	98d0713fa9	Merge branch 'master' into fix-background-blur-safety	2019-07-17 22:01:10 +09:00
smoogipoo	7c5a227fc5	Fix crashes when presenting replays	2019-07-17 14:46:25 +09:00
Dean Herbert	7634e3cc81	Fix song select iterating over all beatmaps in database unnnecessarily	2019-07-16 14:57:11 +09:00
Dean Herbert	d4c1005c7e	Fix incorrect comparison in line updating logic	2019-07-15 15:53:19 +09:00
Dean Herbert	12e7668afc	Fix potential cross-thread talk from bindable updates	2019-07-15 11:48:33 +09:00
Dan Balasescu	986031e127	Merge branch 'master' into storyboard-clock-di	2019-07-12 23:14:12 +09:30
Dan Balasescu	fc96fbc8a1	Merge branch 'master' into fix-skip-button-clickability	2019-07-12 22:44:20 +09:30
Dean Herbert	44855d8bb2	Ensure any existing background is expired if set more than once	2019-07-12 13:45:34 +09:00
Dean Herbert	671f7f99cd	Use constant for blur amount	2019-07-12 13:44:43 +09:00
Dean Herbert	8b67f88d16	Don't expose dimmable container creation in player	2019-07-12 12:04:45 +09:00
Dean Herbert	46f7bb885b	Move classes to local namespaces ... Also renames test scene to more appropriate name.	2019-07-12 11:50:06 +09:00
Dean Herbert	c9599b65eb	Merge remote-tracking branch 'upstream/master' into storyboard-clock-di	2019-07-12 11:20:43 +09:00
Dean Herbert	a1e64106d4	Merge branch 'master' into intro-testing-improvements	2019-07-11 23:46:02 +09:00
Dean Herbert	ecbd0f7eff	Merge branch 'master' into fix-skip-button-clickability	2019-07-11 23:10:28 +09:00
Dean Herbert	19e8198bff	Merge branch 'master' into flow_container_insert	2019-07-11 22:53:57 +09:00
David Zhao	ac170a6957	add comment and cleanup	2019-07-11 14:00:25 +09:00
David Zhao	6c0de0b436	Merge remote-tracking branch 'upstream/master' into storyboard-clock-di	2019-07-11 13:33:35 +09:00
David Zhao	321266e96f	Make UserDimContainer abstract	2019-07-11 13:17:28 +09:00
Dean Herbert	3b448b0086	Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master	2019-07-11 00:25:35 +09:00
Dean Herbert	ad873b542a	Simplify editor logic	2019-07-11 00:22:40 +09:00
Dean Herbert	6819c528db	Use canBeNull instead of needlessly caching MusicController for tests	2019-07-11 00:20:01 +09:00
Dean Herbert	b225b2eb39	Rename to IsUserPaused	2019-07-11 00:18:19 +09:00
Salman Ahmed	1eed6955fa	Merge branch 'master' into implement-other-sorting-criteria	2019-07-10 14:33:48 +03:00
Desconocidosmh	100d15e651	Move reseting tempo to Editor	2019-07-10 10:43:02 +02:00
Desconocidosmh	8b8e67fd72	Add accidentally deleted code	2019-07-10 10:41:52 +02:00
David Zhao	7929104b8a	move default into StoryboardContainer, fix load bug, remove comment	2019-07-10 12:24:05 +09:00
David Zhao	41afe89c0b	delete no longer needed bindable	2019-07-10 00:46:34 +09:00
iiSaLMaN	38bc652bf2	Remove sorting by length for beatmaps	2019-07-09 17:02:51 +03:00
Oskar Solecki	2fb9b5dd69	Merge branch 'master' into master	2019-07-09 13:49:07 +02:00
iiSaLMaN	e0c1fb7818	Compare by milliseconds for length	2019-07-09 14:47:54 +03:00
Oskar Solecki	3472979d0b	Make sure exiting editor doesn't unpause the music	2019-07-09 12:53:40 +02:00
Desconocidosmh	2546f647be	Completely change the way we fix the bug	2019-07-09 11:32:49 +02:00
Dean Herbert	e835cd0f6f	Improve information flow to Disclaimer	2019-07-09 18:08:44 +09:00
Dean Herbert	0580c32263	Abstract intro screen logic to base class	2019-07-09 18:05:57 +09:00
Dean Herbert	32fb811bc9	Merge branch 'master' into intro-testing-improvements	2019-07-09 18:05:52 +09:00
David Zhao	5bb21ecae0	remove storyboard region	2019-07-09 16:50:37 +09:00
David Zhao	89cb8a0cac	Move storyboard initialization to new StoryboardContainer	2019-07-09 16:23:59 +09:00
Oskar Solecki	8f7476e9cc	Remove unused stuff	2019-07-09 00:26:57 +02:00
Oskar Solecki	a4957909b4	Merge branch 'master' into Fix-music-playing-while-exiting-from-editor	2019-07-09 00:11:29 +02:00
Desconocidosmh	338371c3fc	Fix music playing while exiting from editor	2019-07-09 00:08:18 +02:00
Dean Herbert	8a98aff318	Merge branch 'master' into replay-local-mods	2019-07-08 22:38:02 +09:00
Dean Herbert	54f5e6aedf	Add assertion and comment about lease logic	2019-07-08 22:37:39 +09:00
David Zhao	0cf4bf2352	Manually set clock for storyboard if loading before being given a parent	2019-07-08 18:46:12 +09:00
David Zhao	d489a77fe1	remove new container and comment	2019-07-08 17:57:29 +09:00
iiSaLMaN	5f3f59629e	Use the length field instead of recalculating	2019-07-08 11:55:07 +03:00
David Zhao	fbd300e664	Move ruleset into ReplayPlayerLoader as well	2019-07-08 17:37:20 +09:00
David Zhao	e78e326f34	remove unused using	2019-07-08 17:02:42 +09:00
iiSaLMaN	129899f419	Add a BPM property in BeatmapInfo	2019-07-08 10:43:35 +03:00
David Zhao	ef22ab9340	remove bindable	2019-07-08 16:32:11 +09:00
David Zhao	6a86f62d17	Get mods from score info	2019-07-08 16:13:03 +09:00
David Zhao	5853a877c2	create base dependencies before caching, create player in playerloader	2019-07-08 15:40:10 +09:00
iiSaLMaN	90d5484818	Return BPM back to OnlineInfo ... Revert commit of "Move BPM out of OnlineInfo"	2019-07-08 09:10:41 +03:00
David Zhao	2747d7692b	Create ReplayPlayerLoader for local mod caching	2019-07-08 14:55:05 +09:00
iiSaLMaN	729f0901f7	Move Length out of OnlineInfo	2019-07-07 20:25:36 +03:00
iiSaLMaN	3ea9629daf	Move BPM out of OnlineInfo	2019-07-07 20:11:44 +03:00
iiSaLMaN	6ee10640e3	Remove unnecessary migration + Fix CI issues	2019-07-07 19:26:41 +03:00
iiSaLMaN	b4ef64fa61	Add sorting by Length	2019-07-07 18:26:56 +03:00
iiSaLMaN	65c8249c94	Add beatmap extension for calculating length	2019-07-07 18:25:52 +03:00
iiSaLMaN	188c80374e	Add sorting by BPM	2019-07-07 18:14:23 +03:00
Desconocidosmh	84cadc688a	Change method name	2019-07-07 17:11:54 +02:00
Desconocidosmh	1a117d1511	Closes #5277	2019-07-07 17:05:53 +02:00
Dean Herbert	ebc0e50295	Simplify conditions	2019-07-07 13:21:41 +09:00
Dean Herbert	1eec69c6b6	Merge remote-tracking branch 'Joehuu/master' into fix-unranked-map-lb-placeholder	2019-07-07 13:06:34 +09:00
Dean Herbert	8f2ec73626	Move logic inside of HUDOverlay ... Add vertical offset adjust.	2019-07-07 05:30:53 +09:00
Joseph Madamba	7c0e3a50b6	Merge branch 'master' into fix-unranked-map-lb-placeholder	2019-07-06 12:09:28 -07:00
Dean Herbert	3f332cca2f	Merge branch 'master' into applicable-to-hud	2019-07-07 01:03:50 +09:00
Dean Herbert	be2d0048db	Merge branch 'master' into buttonsystem-entermode	2019-07-07 00:01:41 +09:00
Salman Ahmed	dfabed3d85	Merge branch 'master' into applicable-to-hud	2019-07-06 16:30:02 +03:00
Dean Herbert	ea911b2fd2	Ensure intro restarts track	2019-07-06 19:05:42 +09:00
Dean Herbert	2149d639de	Merge branch 'master' into leaderboard-mod-filter	2019-07-06 13:27:49 +09:00
Dan Balasescu	3a9f16ccf2	Merge branch 'master' into idle-still-starts	2019-07-06 00:08:59 +09:30
David Zhao	a259247a98	use const	2019-07-05 16:07:17 +09:00
Dean Herbert	598b0d668b	Merge branch 'master' into import-stable-scores	2019-07-05 15:54:33 +09:00
Dean Herbert	b54c0176eb	Merge branch 'master' into disable-own-replays	2019-07-05 15:41:43 +09:00
Dean Herbert	b902457f8d	Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel	2019-07-05 15:32:07 +09:00
Dean Herbert	adf6d6c942	Update initial run import process to include scores	2019-07-05 14:25:52 +09:00
Joehu	1534b75d27	Fix ci errors	2019-07-04 21:39:21 -07:00
Joehu	e8168037f9	Fix unranked beatmap leaderboards showing "no records" placeholder	2019-07-04 21:19:51 -07:00
Dean Herbert	d77d49f595	Merge branch 'master' into fade-music-on-exit	2019-07-05 13:13:07 +09:00
David Zhao	9eeafa0861	Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode	2019-07-05 13:08:48 +09:00
David Zhao	79d6670dc5	Expose durations from MainMenu and reorder	2019-07-05 13:08:45 +09:00
naoey	1dab363be3	Require supporter for filtering mods on online leaderboards	2019-07-05 08:42:44 +05:30
naoey	98a242cc37	Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter	2019-07-05 08:38:33 +05:30
Dean Herbert	f4dcbbbfef	Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode	2019-07-05 11:29:29 +09:00
iiSaLMaN	d624157c45	Remove unnecessary fading	2019-07-05 05:17:36 +03:00
Dean Herbert	91d461eba7	Merge pull request #5251 from Joehuu/remove-edit-song-select-file ... Remove unused EditSongSelect file	2019-07-05 10:30:37 +09:00
Joehu	5f6544eebf	Fix beatmap leaderboards requiring supporter when signed out	2019-07-04 12:05:07 -07:00
naoey	f04adb7192	Apply mods filter to local scores too	2019-07-04 22:38:33 +05:30
Joehu	9b2ebed669	Remove unused EditSongSelect file	2019-07-04 08:36:34 -07:00
David Zhao	be4e7d0f50	remove comment	2019-07-04 17:08:21 +09:00
Dean Herbert	db24ac28ec	Add tests	2019-07-04 16:53:08 +09:00