693 Commits

Author	SHA1	Message	Date
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
smoogipooo	5508fa0fd9	Merge remote-tracking branch 'origin/master' into new-menus	2017-09-05 19:14:42 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	543a71efcc	Fix ObjectDisposal exceptions due to lingering event binds	2017-09-04 08:21:07 +09:00
Dean Herbert	dd26c80837	Delete -> Hide	2017-09-04 07:59:32 +09:00
Dan Balasescu	19ad5d5328	Merge branch 'master' into song-select-context-menus	2017-09-04 07:56:31 +09:00
Dean Herbert	3ede685ee9	Fix crash on random selection from a previously null selection	2017-09-01 18:44:51 +09:00
Dean Herbert	3d61cde266	Correctly delay loading of PlaySongSelect-specific components	2017-09-01 18:22:38 +09:00
Dean Herbert	f9d02afb00	Don't allow selection of a hidden beatmap	2017-09-01 18:13:21 +09:00
Dean Herbert	1f646e6d54	Add hiding support for beatmap difficulties	2017-09-01 17:57:12 +09:00
Dean Herbert	3b4b4b669b	Add framework for deleting difficulties	2017-08-30 21:12:46 +09:00
Dean Herbert	2fb4126ffc	Use BeatmapSetInfo instead of WorkingBeatmap	2017-08-30 20:53:33 +09:00
Dean Herbert	07da29ea1c	Add context menu to beatmap set header	2017-08-30 20:41:41 +09:00
Huo Yaoyuan	4aa5ce8b41	Always load background and info wedge when no beatmap available.	2017-08-28 17:53:57 +08:00
MrTheMake	6d401b5f21	Merge branch 'master' into leaderboard-scores	2017-08-19 00:00:40 +02:00
Shane Woolcock	4901ac9e35	Add some comments explaining why the Track is being forcefully added to the TrackManager	2017-08-18 18:01:18 +09:30
Dean Herbert	ffc8f763e5	Merge branch 'master' into fix-track-not-resetting	2017-08-18 17:24:22 +09:00
Dan Balasescu	cc6a5824f0	Merge branch 'master' into fix-ruleset-changing	2017-08-18 13:40:52 +09:00
Dean Herbert	7e21ddb5eb	Remove usage of HideOnEscape	2017-08-16 22:56:32 +09:00
MrTheMake	105048500a	Made modString private and moved the beatmap assignment inside GetScoresRequest	2017-08-15 15:30:53 +02:00
Dean Herbert	6ded194c53	Remove all usage of DI to retrieve InputManager ... Uses GetContainingInputManager instead, as per framework changes.	2017-08-15 14:30:50 +09:00
MrTheMake	920710e7d0	Assign a score's beatmap and cleanup to the Score class	2017-08-14 13:30:54 +02:00
Dean Herbert	9e1ffa27dc	Fix leaderboard icons not displaying correctly	2017-08-14 12:52:20 +09:00
MrTheMake	6b1184e8af	General formatting	2017-08-14 00:27:54 +02:00
MrTheMake	d9c26f98c7	Suggested changes	2017-08-13 19:54:07 +02:00
MrTheMake	e1e4eb78e3	Fix nullref in the leaderboard's test case	2017-08-13 18:00:53 +02:00
MrTheMake	4c2d7bf343	Parse the mods of a leaderboard's score	2017-08-13 17:41:13 +02:00
Dean Herbert	94b8d1de8b	Merge branch 'master' into fix-ruleset-changing	2017-08-13 11:14:41 +09:00
Dean Herbert	fe2911f165	Fix some formatting issues	2017-08-13 10:36:57 +09:00
Shane Woolcock	096e574401	Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)	2017-08-12 19:52:09 +09:30
Shane Woolcock	e48c5898bd	Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.	2017-08-11 17:26:30 +09:30
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	e8021c2b92	Move line inside if	2017-08-04 17:20:05 +09:00
Huo Yaoyuan	74facb32b4	Use removeAutoModOnResume as a field.	2017-08-04 15:34:11 +08:00
Huo Yaoyuan	62b3540fd6	Merge branch 'master' into fixes	2017-08-04 13:49:03 +08:00
Huo Yaoyuan	eb9972581e	Provide Autoplay mod in Ruleset.	2017-08-04 00:25:24 +08:00
Huo Yaoyuan	44fd0eb78b	Pass input state in OnSelected.	2017-08-04 00:09:41 +08:00
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +09:00
Dean Herbert	c8b5c1b8a5	Merge branch 'master' into scroll_to_selected	2017-08-01 11:06:32 +09:00
EVAST9919	700c7753c3	Applied suggestions	2017-07-31 14:20:12 +03:00
Huo Yaoyuan	df3f75b842	Merge branch 'master' into fixes	2017-07-31 17:51:34 +08:00
EVAST9919	62365090ad	Removed useless variable	2017-07-29 17:51:11 +03:00
EVAST9919	6b3a81f567	Fix hard crash when pressing random if no beatmaps avaliable	2017-07-29 17:42:32 +03:00
EVAST9919	e121b119be	Added "scroll to" container	2017-07-29 17:33:20 +03:00
EVAST9919	8458622c4d	Add ScrollToSelected method	2017-07-29 16:03:17 +03:00
Dean Herbert	e691dd12c5	Fix potential sequen of execution issues in BeatmapCarousel	2017-07-28 15:05:08 +09:00
Dean Herbert	6f4efbeda6	Merge remote-tracking branch 'upstream/master' into database-tidy	2017-07-27 17:41:29 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00