15158 Commits

Author	SHA1	Message	Date
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	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
andy840119	6126fd9a6b	ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield	2019-11-24 10:42:05 +09: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	5c55060173	Merge branch 'master' into master	2019-11-23 16:54:23 +00:00
Dean Herbert	65d71b9442	Fix beatmap lookups failing for beatmaps with no local path ... Turns out the underlying EscapeUriString doesn't like nulls	2019-11-23 20:55:42 +09:00
Andrei Zavatski	2e161f7e99	Hook up the rest of the logic	2019-11-22 22:25:58 +03:00
Andrei Zavatski	aede1b183a	Make ScopeSelector always visible	2019-11-22 22:04:58 +03:00
Andrei Zavatski	d6c9387beb	Implement NotSupporterPlaceholder	2019-11-22 21:55:21 +03:00
Albie Spriddell	4cb09df754	increase padding	2019-11-22 18:23:48 +00:00
Dean Herbert	4063135a3a	Fix result mode button's corner exponent	2019-11-22 20:45:05 +09:00
Dean Herbert	d0002cc1c2	Update performance logging setting	2019-11-22 19:50:30 +09:00
Dean Herbert	c2e85a2057	Apply CornerExponent fixes	2019-11-22 19:49:20 +09:00
Dean Herbert	6469199f0d	Update framework	2019-11-22 19:47:21 +09:00
Dean Herbert	2796a135bf	Add mod selector to beatmap overlay (#6812) ... Add mod selector to beatmap overlay Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-22 18:46:25 +09:00
Dean Herbert	b026197859	Add spacing	2019-11-22 18:23:48 +09:00
Dean Herbert	dad2e5c678	Improve legibility of NoScroesPlaceholder	2019-11-22 18:10:44 +09:00
Dean Herbert	16bdf4e6bd	Update english to be more readable	2019-11-22 18:07:56 +09:00
Dean Herbert	0cc1698b6d	Rename incorrectly named container	2019-11-22 18:05:12 +09:00
Dean Herbert	880f7ddca7	Merge remote-tracking branch 'upstream/master' into beatmap-overlay-mod-selector-new	2019-11-22 18:00:58 +09:00
Dean Herbert	f079ebe857	Simplify beatmap lookup to use a single endpoint	2019-11-22 16:13:48 +09: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
Dan Balasescu	7c19f7cd7b	Merge branch 'master' into improve-skip-button-feel	2019-11-22 13:36:27 +09:00
Dan Balasescu	ba0ac93f70	Merge branch 'master' into skip-multiple-times	2019-11-22 13:23:50 +09:00
Andrei Zavatski	745047fd19	Remove useless line from ModIcon	2019-11-22 05:10:47 +03:00
Andrei Zavatski	da425c93fa	Fix beatmap switch doesn't trigger scores update	2019-11-22 05:08:50 +03:00
Andrei Zavatski	dee9ffc694	Merge master with conflicts resolved	2019-11-22 04:59:46 +03:00
Dean Herbert	d8260f4a65	Reduce carousel scroll motion on initial display	2019-11-22 10:51:49 +09:00
Dean Herbert	e170cd2892	Move private methods below	2019-11-22 10:29:16 +09:00
Dean Herbert	ced0ad404e	Merge branch 'master' into beatmap-mod-selector	2019-11-22 10:17:40 +09:00
Dean Herbert	57d38c5c74	Add final newline	2019-11-22 02:39:54 +09:00
Dean Herbert	ab42fac43a	Improve naming	2019-11-22 02:38:31 +09:00
Andrei Zavatski	eb2f7c1d0a	Rename forgotten variable	2019-11-21 20:37:02 +03:00
Andrei Zavatski	0f1a3d97c8	Naming adjustments	2019-11-21 20:34:19 +03:00
Dean Herbert	f390e558c7	Combine and simplify beatmap change logic	2019-11-22 02:32:02 +09:00
Dean Herbert	a97d760afa	Merge remote-tracking branch 'upstream/master' into menu-background-modes	2019-11-22 02:23:02 +09:00
Andrei Zavatski	c7c8527f5f	Remove OnHighlightedChanged function	2019-11-21 20:22:15 +03:00
Andrei Zavatski	e22a71c6b8	Add visual difference between hovered and selected states	2019-11-21 19:42:07 +03:00
Andrei Zavatski	23fc7b1987	Implement updateHighlighted method	2019-11-21 19:02:24 +03:00
Andrei Zavatski	984ec11a78	Make Ruleset a bindable	2019-11-21 18:56:48 +03:00
Andrei Zavatski	737c2bd1c8	Remove pointless const	2019-11-21 18:50:29 +03:00