4344 Commits

Author	SHA1	Message	Date
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
Dean Herbert	a20d5baa57	Fix skip button not being clickable after fade out	2019-07-04 16:21:01 +09:00
iiSaLMaN	b53aeec90d	Move audio adjustment inside OnResuming	2019-07-04 05:18:29 +03:00
iiSaLMaN	99603ca0b6	Fade out game volume on exiting ... Invokes 'this.Exit()' on completion (simplify lines)	2019-07-04 04:50:49 +03:00
Dean Herbert	4ecc690164	Merge branch 'master' into fix-logo-vis-catchup	2019-07-04 00:47:42 +09:00
naoey	99606a018b	Merge remote-tracking branch 'upstream/master' into leaderboard-mod-filter	2019-07-03 19:35:08 +05:30
naoey	4ba60ed089	Apply currently selected mods to filter leaderboard scores ... Modifies GetScoresRequest to build query string locally instead of using WebRequest.AddParameter since it doesn't support array parameters	2019-07-03 17:04:20 +05:30
naoey	ccae4ce95e	Fix local beatmap leaderboard displaying scores from all game modes	2019-07-03 14:39:11 +05:30
David Zhao	b2185cd3a2	Merge branch 'master' into buttonsystem-entermode	2019-07-03 15:54:34 +09:00
Dean Herbert	6e308945b1	Fix logo visualisation trying to catch up after being off-screen	2019-07-03 15:22:17 +09:00
Dean Herbert	23acddcb56	Rename download buttons to avoid ambiguity	2019-07-03 12:02:35 +09:00
Dean Herbert	466bc7f28a	Merge branch 'master' into watch-replays-4	2019-07-03 11:47:10 +09:00
Salman Ahmed	8b4ef52c13	Revert unnecessary changes	2019-07-03 07:27:24 +03:00
Dean Herbert	7caa6eaed5	Remove all non-transform LogoVisualisation per-frame allocations (#5200) ... Remove all non-transform LogoVisualisation per-frame allocations Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-07-02 22:42:18 +09:00
Dean Herbert	73474826f6	Avoid Intro screen holding references to the intro beatmap (#5211) ... Avoid Intro screen holding references to the intro beatmap	2019-07-02 22:41:34 +09:00
Dan Balasescu	15321ee0e8	Merge branch 'master' into reduce-logovis-allocs	2019-07-02 22:44:39 +09:30
naoey	eaa19d5a49	Remove unused/unnecessary fields	2019-07-02 16:13:47 +05:30
naoey	ee516d2515	Make direct panel download and replay buttons share UI	2019-07-02 15:55:30 +05:30
Dean Herbert	587be955c3	Increase number of backgrounds in line with resources	2019-07-02 17:57:23 +09:00
Dean Herbert	29bb227de2	Avoid Intro screen holding references to the intro beatmap	2019-07-02 16:28:06 +09:00
Dean Herbert	6539c6da17	Merge branch 'master' into watch-replays-4	2019-07-02 13:24:16 +09:00
Salman Ahmed	744e651a37	Merge branch 'master' into applicable-to-hud	2019-07-02 05:24:56 +03:00
Salman Ahmed	6a79349f4a	Move health display out of the visibility container	2019-07-02 02:19:59 +03:00
Roman Kapustin	9037fb59de	Make BeatmapOptionsButton insertion cleaner	2019-07-01 18:42:18 +03:00
Dan Balasescu	3d4c5104b3	Merge branch 'master' into reduce-db-contexts	2019-07-01 23:40:58 +09:30
Dean Herbert	9de4bb3423	Remove all non-transform LogoVisualisation per-frame allocations	2019-07-01 16:12:20 +09:00
Dean Herbert	8703f0ad40	Change song select initialisation to promote db context sharing	2019-06-30 22:23:48 +09:00
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
Dean Herbert	bd54b34538	Merge remote-tracking branch 'upstream/master' into combobreak	2019-06-30 21:27:53 +09:00
Dean Herbert	fa879b4b60	Add a note explaining why manual handling is required	2019-06-30 20:47:09 +09:00
Unknown	5b26ef75b1	allow exiting editor again	2019-06-30 12:31:31 +02:00
naoey	bfcbb47b77	Clean up some more leftover code	2019-06-30 10:56:20 +05:30
welsar55	d6561531a3	Merge branch 'master' into combobreak	2019-06-29 11:55:10 -05:00
Welsar55	a22c166575	Make ComboEffects its own class	2019-06-29 11:28:40 -05:00
naoey	d8f6bbc90e	Disable replay button when replay is unavailable	2019-06-29 12:49:03 +05:30
naoey	7d9e215744	Code quality fixes	2019-06-29 12:29:12 +05:30
naoey	424711d24b	Fix replay button shake container ... - Add license headers - Slightly reduce bottom margin of button in score screen	2019-06-29 12:26:37 +05:30
naoey	bc52f76556	Move replay button to score card	2019-06-29 10:55:30 +05:30
Welsar55	a57218e50e	Move to LocalSkinOverride	2019-06-28 20:45:11 -05:00
iiSaLMaN	d37cefbad8	Implement IApplicableToHUD	2019-06-29 04:23:59 +03:00
naoey	53d6d74537	Update to match upstream changes	2019-06-28 09:33:13 +05:30
naoey	ab0bb8b678	Implement replay downloading with ArchiveDownloadModelManager	2019-06-28 09:33:13 +05:30
Welsar55	826699a7e7	Remove unneeded bindable	2019-06-26 12:16:44 -05:00
Dean Herbert	c34f6180e6	Merge branch 'master' into generic-download-model-manager	2019-06-26 20:37:56 +09:00
Dan Balasescu	f06aabad5f	Merge branch 'master' into toolbar-rulesets-refactor	2019-06-26 18:33:45 +09:00
Welsar55	7dd1479050	Add combobreak sound	2019-06-26 00:20:33 -05:00
Dean Herbert	1eda4e0dd4	Merge remote-tracking branch 'upstream/master' into generic-download-model-manager	2019-06-26 12:21:04 +09:00
Dean Herbert	9e1cb90dd8	Remove existing argument for ItemAdded event ... For all usages, it looks like this was unnecessary.	2019-06-26 11:40:41 +09:00
Dan Balasescu	6063e7a69f	Merge branch 'master' into one-hit-screen	2019-06-26 11:34:54 +09:00
Dean Herbert	446fbce81c	Add base class for startup screens ... Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.	2019-06-26 01:36:17 +09:00
Dean Herbert	40cf573368	Fix pause not correctly showing pause screen	2019-06-25 23:15:58 +09:00
Dean Herbert	983cabdb98	Disallow back button on disclaimer screen	2019-06-25 22:27:50 +09:00
Dean Herbert	f9dad0f640	Merge remote-tracking branch 'upstream/master' into gamewide-backbutton	2019-06-25 20:23:49 +09:00
Andrei Zavatski	bae0258d8d	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-25 14:16:05 +03:00
smoogipoo	aa81c95f30	Remove unnecessary extra property	2019-06-25 18:38:14 +09:00
smoogipoo	531b107a98	Exit match before exiting multiplayer	2019-06-25 18:33:26 +09:00
smoogipoo	1a26608ba9	Close mod select before exiting song selection	2019-06-25 18:33:21 +09:00
smoogipoo	d9927204f8	Relieve OsuScreen of back button input duties	2019-06-25 18:33:18 +09:00
smoogipoo	8c96e4c1fa	Move back button to OsuGame	2019-06-25 18:33:08 +09:00
Dean Herbert	7bc7df2249	Reduce background brightness at PlayerLoader	2019-06-25 17:22:10 +09:00
Andrei Zavatski	9dedd62d9a	Revert a hotfix in multi screen ... since it's been fixed in a framework	2019-06-24 22:57:18 +03:00
Andrei Zavatski	35516e7304	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 22:52:24 +03:00
Dean Herbert	f91467eddc	Fix licence header	2019-06-24 18:34:23 +09:00
Dean Herbert	fad1ced1b5	Add correct conditionals to allow exit	2019-06-24 18:15:27 +09:00
Dean Herbert	d70248338d	Merge remote-tracking branch 'upstream/master' into quickEscape	2019-06-24 18:14:48 +09:00