1905 Commits

Author	SHA1	Message	Date
Lucas A	ab01111c36	Fix merge conflicts.	2020-03-30 17:39:11 +02:00
Lucas A	3cae0cedee	Add a game setting to disable the layer	2020-03-30 12:59:39 +02:00
Dean Herbert	6e68b968f8	Hide "retry" button on results screen after watching a replay	2020-03-29 23:52:50 +09:00
Dean Herbert	4f5557096c	Fix auto mod results not displaying correctly	2020-03-29 22:51:28 +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
Dan Balasescu	5e1cb0e9e9	Merge branch 'master' into fix-minia-mod-replay-recording	2020-03-27 19:26:41 +09:00
Dean Herbert	f75c082601	Fix osu!mania replays recording incorrectly when key mod applied	2020-03-27 15:50:11 +09:00
Lucas A	00c1ff993a	Fix merge conflicts.	2020-03-26 15:48:18 +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	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	800e395bc8	Merge branch 'master' into replay-recording	2020-03-25 20:20:59 +09:00
Dean Herbert	6d81da5419	Merge branch 'master' into video-offset	2020-03-25 11:28:59 +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	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	617149fb27	Implement in player	2020-03-23 20:06:18 +09:00
Dean Herbert	729e006c3a	Merge branch 'master' into video-offset	2020-03-21 20:03:46 +09:00
Dean Herbert	855f0a4253	Fix bracket style	2020-03-19 14:38:49 +09:00
Dean Herbert	17c3455b36	Fix potentially invalid push in player while already exiting	2020-03-19 14:10:59 +09:00
Lucas A	a4171253a3	Make LowHealthThreshold a field.	2020-03-18 21:45:01 +01:00
Lucas A	e9f224b5e8	Apply review suggestions	2020-03-18 21:16:54 +01:00
Lucas A	a1274a9eb0	Fix and add missing XMLDoc	2020-03-18 08:29:00 +01:00
Lucas A	ed4f9f8ba9	Bind every HealthDisplay on Player load	2020-03-17 22:57:47 +01:00
Lucas A	6b0c5bc65d	Rename to LowHealthLayer to FaillingLayer.	2020-03-17 22:32:07 +01:00
smoogipoo	3628814e4e	Merge branch 'fix-score-population' into results-screen	2020-03-17 17:48:39 +09:00
smoogipoo	1c4296f5e7	Implement the new results screen	2020-03-17 17:43:16 +09:00
smoogipoo	daa5e63d0d	Fix replay scores not being populated via player	2020-03-17 16:42:55 +09:00
Joehu	f7ea20a926	Limit font weight to bold	2020-03-16 16:32:25 -07:00
Lucas A	1aacd1aaa2	Initial implementation of LowHealthLayer	2020-03-16 21:04:59 +01:00
voidedWarranties	c27751050b	Switch back to strings and update setting labels	2020-03-12 23:29:11 -07:00
Dan Balasescu	1d556bfc5f	Merge branch 'master' into video-offset	2020-03-11 15:13:18 +09:00
voidedWarranties	6de244389b	Use OffsetClock instead of ManualClock	2020-03-10 22:50:20 -07:00
Dan Balasescu	5b8035052f	Merge branch 'master' into fix-hit-error-ticks-outside-bounds	2020-03-09 09:16:51 +09:00
voidedWarranties	22dd93a4f6	Code quality, read position offsets	2020-03-08 14:02:39 -07:00
Lucas A	0953751d24	Clamp relative position of judgement ticks in range [0;1]	2020-03-08 15:51:57 +01:00
voidedWarranties	48282dea8b	Remove individual setting to disable videos, fix tests	2020-03-07 22:08:38 -08:00
voidedWarranties	76c832518f	Render video as a part of the storyboard	2020-03-07 21:32:03 -08:00
voidedWarranties	d68d7edea3	Start background video playback based on provided offset	2020-03-07 14:08:13 -08:00
Dean Herbert	fa8e7adf07	Merge branch 'master' into fix-testscene-rate	2020-03-06 22:40:02 +09:00
Dean Herbert	a59c3d997d	Refactor implementation to better match what already existed	2020-03-06 18:00:17 +09:00
Dean Herbert	90dbb90470	Merge branch 'master' into disable-keycounter-breaks	2020-03-06 17:53:10 +09:00
Dean Herbert	ebc86c1075	Fix random test failure	2020-03-06 02:14:16 +09:00
Dan Balasescu	e77cefeabe	Merge branch 'master' into fix-volume-bninding-handling	2020-03-03 16:32:18 +09:00
smoogipoo	2e4adc056f	Fix potential deadlock during gameplay tests	2020-03-03 13:42:05 +09:00
naoey	3d344a076d	Add test for disabled keycounter, don't discard change event values	2020-03-03 06:17:25 +05:30
Dean Herbert	48f2f615cd	Merge branch 'master' into fix-volume-bninding-handling	2020-03-02 19:28:36 +09:00
Dean Herbert	489bf16bea	Add SelectNext and SelectPrevious global actions	2020-03-02 18:55:28 +09:00
Dean Herbert	dc79c11b6a	Merge branch 'master' into layout-rework	2020-03-02 16:36:48 +09:00
naoey	bca58ddb42	Make KeyCounter stop counting during breaks	2020-02-29 21:18:43 +05:30
Dean Herbert	f18a1cde53	Fix crash when reaching results screen on single threaded execution mode	2020-02-29 08:39:27 +09:00
Dean Herbert	ed2bdd7106	Fix stutter when showing game HUD after being hidden for a while	2020-02-26 20:45:57 +09:00
smoogipoo	da89798765	Merge remote-tracking branch 'origin/master' into layout-rework	2020-02-26 15:06:40 +09:00
smoogipoo	6c28fd21c7	osu-side changes	2020-02-24 20:52:15 +09:00
Dean Herbert	0c3286fa5e	Merge branch 'judgement-line-performance' into follow-point-performance	2020-02-23 05:36:22 +09:00
Dean Herbert	560cf21b12	Add lenience to comparison ... Noticed that they could still stack up on maps with hitcircles at the same point in time (centipede).	2020-02-23 05:29:17 +09:00
Dean Herbert	4949977d7e	Merge branch 'judgement-line-performance' into follow-point-performance	2020-02-23 05:14:21 +09:00
Dean Herbert	8dbcdebd28	Use LoadingLayer at player loading screen	2020-02-23 05:00:08 +09:00
Dean Herbert	e8ebb31517	Expire old judgement lines if too many exist	2020-02-23 03:53:51 +09:00
Dean Herbert	3daa49f1bd	Clean up old judgement lines if too many are already present	2020-02-23 03:39:12 +09:00
Dean Herbert	5aa5a1bbdd	Reduce transform time of judgement lines (visually looks almost the same)	2020-02-23 03:36:15 +09:00
Dean Herbert	92f6f0207c	Rename LoadingAnimation to LoadingSpinner	2020-02-21 15:33:31 +09:00
recapitalverb	7c9569c9a3	Merge branch 'master' into remove-duplicated-load	2020-02-15 12:10:34 +07:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
Dan Balasescu	851e353093	Merge branch 'master' into fix-player-loader-focused-overlay-interaction	2020-02-14 20:36:38 +09:00
Dan Balasescu	45734f8e8d	Merge branch 'master' into player-loader-code-quality	2020-02-14 19:35:40 +09:00
Dean Herbert	4d4ec3515d	Fix player loading sequence continuing even when a priority overlay is visible	2020-02-14 19:16:08 +09:00
Dean Herbert	2808f8167d	Use more regions	2020-02-14 18:28:58 +09:00
Dean Herbert	b69d1ad678	Reorder and clean up PlayerLoader	2020-02-14 18:22:57 +09:00
Dean Herbert	be30ef3cca	Move BeatmapMetadataDisplay to its own class	2020-02-14 18:13:52 +09:00
Dean Herbert	884a5fbad4	Fix osu! gameplay cursor not adjusting to mod/convert circle size changes	2020-02-14 14:30:15 +09:00
smoogipoo	d4f14e552a	Improve extensibility of mod display expansion	2020-02-13 18:05:53 +09:00
Bartłomiej Dach	9bfd3a1a63	Make PercentageBreakInfoLine use FormatAccuracy	2020-02-08 00:11:19 +01:00
Dean Herbert	b7996f91fc	Update the windows platform offset to match stable	2020-02-07 17:51:38 +09:00
Salman Ahmed	4cd4055e7c	Rename to AlwaysVisible and add XMLDoc	2020-02-03 20:00:43 +03:00
Salman Ahmed	51ed289c59	Revert namings and behaviour changes	2020-02-03 19:59:58 +03:00
Salman Ahmed	351cb8ac1a	Rename Visible to HasReplayLoaded and change default value ... Doesn't make sense to be true by default	2020-02-03 15:47:52 +03:00
Salman Ahmed	4cdf4b223c	Rename to alwaysShow and add XMLDoc	2020-02-02 18:47:12 +03:00
Salman Ahmed	28e340c486	Inherit Container and fade the key flow instead of individual children	2020-02-02 18:46:27 +03:00
Salman Ahmed	6a11c3a8f9	Expose ConfigVisibility bindable for testing purposes	2020-02-02 14:48:07 +03:00
Salman Ahmed	abccf05155	Update visibility of each key counter instead of this container ... For isolating changing visibility of the key counter display based on config and internal values from just fading the container.	2020-02-02 14:47:14 +03:00
Dean Herbert	bea20efb64	Merge branch 'master' into mod_content_centering	2020-01-30 10:34:46 +09:00
Bartłomiej Dach	c9dda78ded	Refactor drawable hierarchy to center properly ... * Use FillFlowContainer.Spacing instead of manually applying margins. * Use Update() for calculating button padding to preserve it after mod button expansion and adjust FooterButtonRandom to use this method while avoiding flickering. * Expose mod display margin to clear it in the footer button.	2020-01-29 18:59:51 +01:00
unknown	aa264cd2a8	allow tooltip to show as percentage as needed	2020-01-28 12:32:30 +08:00
Dean Herbert	997b49f6dc	Change display to always show progress bar, only hiding seeking handle instead	2020-01-24 14:21:22 +09:00
Dean Herbert	da65fff48e	Merge remote-tracking branch 'upstream/master' into collapse-graph-option	2020-01-24 13:55:42 +09:00
Dean Herbert	eb5abcab8c	Rename and simplify circle logic	2020-01-24 12:01:40 +09:00
Dean Herbert	851b891285	Fix incorrect insert logic	2020-01-24 12:01:14 +09:00
Dean Herbert	c390348eab	Merge remote-tracking branch 'upstream/master' into colour-score-meter	2020-01-24 11:45:33 +09:00
Dean Herbert	8a7f7c5e46	Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework	2020-01-22 22:57:56 +09:00
Dean Herbert	7c62cc3ac3	Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework	2020-01-22 22:57:52 +09:00
smoogipoo	7b2f58eb30	Apply OnRelease method signature refactorings	2020-01-22 13:22:34 +09:00
smoogipoo	40f502c6d1	Apply input method signature refactorings	2020-01-20 19:35:37 +09:00
smoogipoo	1b1003bd73	Refactor	2020-01-20 18:31:25 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
Dan Balasescu	03c778df75	Merge branch 'master' into update-framework	2020-01-09 19:02:26 +09:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
Bartłomiej Dach	f0fe3bc804	Pass bindable to BeatmapMetadataDisplay ... It was reported that mods selected in song select would show up during loading of replays which were recorded under a different set of mods. This was caused by BeatmapMetadataDisplay accepting a plain read-only value of the Mods bindable in PlayerLoader.load(), therefore making the mod value assignment in ReplayPlayerLoader.OnEntering() have no effect on that component. To resolve this issue, make BeatmapMetadataDisplay accept the higher-level bindable, bind to it locally and pass it down the hierarchy to ModDisplay.	2020-01-08 20:10:43 +01:00
Bartłomiej Dach	a3f7d3c445	Add failing test ... Add test case demonstrating the lack of update of the metadata display's mods upon setting the Mods property in PlayerLoader.	2020-01-08 19:55:35 +01:00
Dean Herbert	ca862124a5	Fix replay import from main menu causing a hard crash	2019-12-27 19:36:48 +09:00
Dean Herbert	b330aec03e	Drain starting at the first hitobject, not gameplay start	2019-12-27 16:16:30 +09:00
Dean Herbert	cac011edc1	Merge branch 'master' into hp-drain	2019-12-26 23:51:12 +09:00
Dean Herbert	033bb15500	Fix early-escape not continuing to results screen (#7362) ... Fix early-escape not continuing to results screen	2019-12-26 23:50:21 +09:00
Dean Herbert	a041f32072	Use cleaner solution via cancellation of older schedule	2019-12-26 19:05:32 +09:00
smoogipoo	8903f286ef	Fix escape not continuing to results screen	2019-12-26 18:27:48 +09:00
smoogipoo	522847987b	Implement break/gameplay start times	2019-12-26 15:00:58 +09:00
smoogipoo	b348abcd07	Only drain health in non-break times	2019-12-26 14:59:49 +09:00
smoogipoo	977fb3d1bf	Make processors and break overlay frame-stable	2019-12-26 14:59:49 +09:00
smoogipoo	a4b1c79e18	Initial implementation of HP drain	2019-12-26 14:59:49 +09:00
smoogipoo	90cb9d9162	Simplify scoreprocesor/healthprocessor implementations	2019-12-26 14:59:49 +09:00
smoogipoo	7414a6aadd	Merge remote-tracking branch 'huoyaoyuan/master' into health-processor ... # Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Mania/ManiaRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs	2019-12-26 14:56:54 +09:00
smoogipoo	c7936e40d5	Protect against potential nullref	2019-12-23 19:13:36 +09:00
Andrei Zavatski	7a0d76ae77	Fix nullref	2019-12-22 03:41:19 +03:00
Andrei Zavatski	aded12af9e	Refactoor to avoid bindable usage	2019-12-22 03:30:17 +03:00
Andrei Zavatski	eb75c6c70f	Update FadeIn animation for new judgement	2019-12-22 03:17:56 +03:00
Andrei Zavatski	46501cf0ac	Use FillFlowContainer	2019-12-22 03:06:57 +03:00
Andrei Zavatski	14a77a8f16	Improve animations	2019-12-21 16:08:28 +03:00
Andrei Zavatski	b61aa660c6	Move colours to HitErrorMeter class	2019-12-21 14:52:53 +03:00
Andrei Zavatski	5e3c3f2a90	Make judgements work	2019-12-21 14:30:41 +03:00
Andrei Zavatski	5b115d8d8a	Implement basic logic	2019-12-21 13:41:50 +03:00
Salman Ahmed	7d090d6cd9	Fix key overlay appearing regardless of the setting	2019-12-19 17:52:58 +03:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
Dean Herbert	e0ce87adca	Move CreateScoreProcessor() to Ruleset (#7244) ... Move CreateScoreProcessor() to Ruleset	2019-12-17 22:15:42 +09:00
Dan Balasescu	fd2785bab3	Merge branch 'master' into fxcop	2019-12-17 20:14:45 +09:00
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
Huo Yaoyuan	d5994ed484	CA2208: create exceptions correctly.	2019-12-17 13:00:10 +08:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	b5db927d93	Merge branch 'master' into cinema-mod	2019-12-17 12:56:06 +09:00
smoogipoo	6cf318c34b	Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding	2019-12-16 18:41:21 +09:00
smoogipoo	a276643a4b	Reorder health display and score elements	2019-12-16 18:41:14 +09:00
smoogipoo	83f77d9c35	Make the layout faster	2019-12-16 18:41:02 +09:00
Dean Herbert	59538bfd32	Merge branch 'global-available-mods' into adjustable-rate-mods	2019-12-13 21:57:27 +09:00
Dean Herbert	7559012fb7	Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks	2019-12-12 19:55:09 +09:00
Dean Herbert	d15f49f60f	Also hide the break overlay	2019-12-12 16:13:02 +09:00
Dean Herbert	37a94988a3	Merge branch 'improve-hud-hiding' into cinema-mod	2019-12-12 16:12:19 +09:00
Dean Herbert	94f3dbb2f6	Adjust transitions slightly	2019-12-12 16:09:50 +09:00
Dean Herbert	3ccfee64f6	Add HUDOverlay tests	2019-12-12 16:09:42 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
Dean Herbert	ffb5cdc6ae	Hide settings overlay along with other HUD-hidden content	2019-12-12 15:20:42 +09:00
Dean Herbert	ad2528d4d2	Hide key counter along with other hud elements ... Also tidies up HUD hide logic and protects against incorrect hiding.	2019-12-12 15:19:45 +09:00
Dean Herbert	9961fa7385	Merge branch 'master' into adjustable-rate-mods	2019-12-12 15:10:23 +09:00
Dean Herbert	a93d57b77e	Merge branch 'master' into lighten-playfield-during-breaks	2019-12-12 11:57:21 +09:00
Dean Herbert	d2ada90434	Merge branch 'master' into single-scoreprocessor	2019-12-12 11:36:45 +09:00
Albie	4a1c6db3ed	Merge branch 'master' into cinema-mod	2019-12-11 18:00:17 +00:00
Dan Balasescu	b77f9504d0	Merge branch 'master' into adjustable-rate-mods	2019-12-11 19:28:59 +09:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09: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	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
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
Salman Ahmed	38f1a8bc17	Bind UserDimContainer.IsBreakTime from Player	2019-12-10 15:14:47 +03:00
Dean Herbert	7fd52c21f5	Update mods and user adjust to use adjustments	2019-12-09 19:41:31 +09:00
Dean Herbert	d650bfb6d6	Remove unnecessary cast	2019-12-09 18:05:14 +09:00
Dean Herbert	eb074b7058	Allow mods to apply to track, not clock	2019-12-09 17:44:45 +09:00
Dan Balasescu	54798b134e	Add accessibility modifiers	2019-12-08 03:16:41 +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
Albie	7864899249	Merge branch 'master' into cinema-mod	2019-11-28 16:42:01 +00:00
smoogipoo	f504370867	Make player block exit if pausable	2019-11-28 15:58:26 +09:00
Dan Balasescu	c6a85a11bd	Merge branch 'master' into sharpen	2019-11-27 17:09:11 +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
Albie	09158b6b08	Merge branch 'master' into cinema-mod	2019-11-26 06:57:47 +00: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
Dean Herbert	fbebbab5db	Remove excess parenthesis	2019-11-25 22:37:07 +09: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
Albie	9fdbb2a58e	change name of interface and expose method instead of seperate values	2019-11-25 07:24:29 +00: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	b8e5796af5	add forced video/storyboard and disabled dim for mod inside new interface	2019-11-24 07:37:06 +00:00
Dean Herbert	83080c3b5f	Fix merge regression	2019-11-22 14:14:18 +09:00
Dan Balasescu	5d2a608be0	Merge branch 'master' into lead-in-fixes	2019-11-22 13:48:55 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	bd6831624a	Decouple skip button animations from gameplay clock	2019-11-21 19:51:22 +09:00
Dean Herbert	ffd0e17826	Merge branch 'skip-multiple-times' into lead-in-fixes	2019-11-21 19:01:28 +09:00
Dean Herbert	46a94821d4	Add support for consecutive skips	2019-11-21 18:59:55 +09:00
Dean Herbert	29d2374928	Add back skip button actuation count tests	2019-11-21 17:23:52 +09:00
Dean Herbert	2dd2e3d861	Add correct AudioLeadIn support	2019-11-21 16:55:18 +09:00
Dean Herbert	8369be90f2	Allow skip button to actuate more than once	2019-11-21 15:19:06 +09:00
Dean Herbert	c0b9bb5a12	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-21 14:22:17 +09:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Dean Herbert	eee5902851	Merge remote-tracking branch 'upstream/master' into lead-in-fixes	2019-11-15 14:05:31 +09:00
Huo Yaoyuan	87d40cf8d0	Resolve equals usages.	2019-11-13 22:35:50 +08:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	cd1dd0f898	Fix adjustments not being removed correctly on retry from pause	2019-11-06 10:38:04 +09:00
Dean Herbert	6dde755ef2	Merge branch 'master' into add-retry-button	2019-11-02 21:23:16 +09:00
Dean Herbert	fd13f0bc55	Move ReplayDownloadButton to correct namespace (#6689) ... Move ReplayDownloadButton to correct namespace	2019-11-02 21:22:23 +09:00
Dean Herbert	551032803d	Fix GameplayClockContainer operating on beatmap's track after s… (#6688) ... Fix GameplayClockContainer operating on beatmap's track after screen exited	2019-11-02 21:22:13 +09:00
Dan Balasescu	8a5d3ab40a	Merge branch 'master' into add-retry-button	2019-11-02 10:51:14 +09:00
Dean Herbert	daa0ebe2b5	Add xmldoc	2019-11-01 15:51:45 +09:00
Dean Herbert	14453da1d2	Centralise MakeCurrent call	2019-11-01 15:51:10 +09:00