2548 Commits

Author	SHA1	Message	Date
Dean Herbert	ae77c010e2	Merge remote-tracking branch 'upstream/master' into wave-container	2018-04-15 21:03:18 +09:00
Dean Herbert	fd54ae3c87	Simplify logic	2018-04-15 16:12:42 +09:00
Dean Herbert	069d48ac14	Remove unused variable	2018-04-15 15:29:00 +09:00
TocoToucan	671de4f6c2	Resolve merge conflicts	2018-04-14 15:11:28 +03:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
smoogipoo	733f70cbd5	Merge remote-tracking branch 'origin/master' into instant-hide-screenshot	2018-04-13 21:13:09 +09:00
Dean Herbert	9f5a52b641	Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler	2018-04-13 19:54:15 +09:00
Dean Herbert	81f0649e44	Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling	2018-04-13 19:50:44 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
tgi74000	e3cd0ef200	Add right click scrolling in song select (and its option)	2018-04-13 11:09:49 +02:00
Dean Herbert	a1a7e63646	Merge branch 'master' into ignored_input_handler	2018-04-13 18:05:12 +09:00
smoogipoo	826a8552e5	Reword options item to include "screenshot"	2018-04-13 17:30:02 +09:00
TocoToucan	9acea6eab0	Order beatmap difficulty icons correctly	2018-04-12 19:33:30 +03:00
Joehu	463b189d2f	Remove unused using directives	2018-04-12 08:13:24 -07:00
Joehu	f18594887b	Move enum to SearchBeatmapSetsRequest	2018-04-12 07:49:23 -07:00
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03:00
Joehu	461e063f19	Rename RankStatus to BeatmapSearchCategory	2018-04-11 22:50:39 -07:00
DrabWeb	0bede52381	Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.	2018-04-11 16:22:27 -03:00
TocoToucan	6a8f568f66	BeatmapContainer -> beatmapContainer	2018-04-11 16:32:58 +03:00
TocoToucan	6cdfaffcf7	PaginatedBeatmapContainer.BeganPlayingPreview	2018-04-11 16:19:21 +03:00
Dean Herbert	903dd7a015	Fix regression causing hard crash ... Regressed in #2373. My bad.	2018-04-11 19:24:19 +09:00
aQaTL	90beff83f6	Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width	2018-04-11 08:07:26 +02:00
aQaTL	38277bff35	Changed mapping of deleting key binding to shift+delete	2018-04-10 18:00:22 +02:00
naoey	d851446aca	Remove redundant anchor and use Show/Hide instead of FadeIn/Out.	2018-04-10 19:15:37 +05:30
Dean Herbert	c33cb9c02e	Merge branch 'master' into show-beatmap-id	2018-04-10 16:05:32 +09:00
UselessToucan	9225c06872	Merge branch 'master' into hide_menu_cursor	2018-04-09 21:41:54 +03:00
aQaTL	dbee936748	Allow mapping delete key via alt+delete key combination	2018-04-09 18:48:47 +02:00
smoogipoo	b97c4e8b44	Fix all possible cases of crossthread import data races	2018-04-09 12:45:44 +09:00
TocoToucan	640be621ac	Handle multiple song previews playing in different beatmap categories on profile	2018-04-07 13:29:46 +03:00
naoey	ca4299c6fe	Remove unused using and fix possible nullref.	2018-04-04 22:07:24 +05:30
naoey	7482d5986a	Add a loading state to BeatmapSetOverlay. ... - Handle null value in header and info sections - Add item to context menu for carousel beatmaps to show details	2018-04-04 21:46:31 +05:30
naoey	c304c1eecf	Make LinkFlowContainer handle beatmap id lookup in game.	2018-04-04 21:23:51 +05:30
Dan Balasescu	6dfca4b2fa	Merge branch 'master' into osu-tab-strip	2018-04-04 14:20:06 +09:00
smoogipoo	c39fb9a200	Update with framework changes	2018-04-03 20:10:26 +09:00
smoogipoo	e9ec544bf6	Implement joystick keybindings	2018-04-03 02:04:40 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
Joseph Madamba	ee14ca7cc5	Merge branch 'master' into score-multiplier-edits	2018-03-31 10:43:58 -07:00
DrabWeb	3d05798d80	Change SearchableListOverlay to use OsuTabControl strip.	2018-03-29 15:34:53 -03:00
Joseph Madamba	af9e3a849f	Merge branch 'master' into score-multiplier-edits	2018-03-28 20:42:35 -07:00
Joseph Madamba	5457f17e79	Clean up code from reviews	2018-03-28 19:53:15 -07:00
DrabWeb	19bc6b9168	Merge https://github.com/ppy/osu into beatmap-set-status	2018-03-27 18:13:58 -03:00
Joseph Madamba	ac9527147f	Fix transitioning of unranked label	2018-03-27 03:05:05 -07:00
DrabWeb	eb374c5774	Add beatmap set online status and display it in direct panels and the beatmap set overlay.	2018-03-26 21:04:45 -03:00
Joseph Madamba	90d763fda5	Apply review changes and suggestions	2018-03-25 10:00:30 -07:00
Joseph Madamba	78a7564acd	Score multiplier edits	2018-03-24 16:00:18 -07:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	b593c47809	Add setting to toggle performance logging	2018-03-24 05:07:48 +09:00
TocoToucan	dd5cc59250	Introduce 'Capture menu cursor' setting	2018-03-23 22:53:06 +03:00
Dan Balasescu	676feb3658	Merge branch 'master' into fix-mod-button-sounds	2018-03-23 21:03:42 +09:00
smoogipoo	52fa837447	Fix volume glow being cut off ... Fixes #2285.	2018-03-23 18:17:23 +09:00