2133 Commits

Author	SHA1	Message	Date
jorolf	ddd59382e2	Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges	2018-04-16 19:37:52 +02:00
jorolf	de9f15f620	add new test case and fix rotation not working	2018-04-16 19:22:11 +02:00
jorolf	046412f962	make hover lost transition instant (similar to hover transition)	2018-04-16 18:52:09 +02:00
jorolf	2a18b4c3f8	add a DRAWABLE_BADGE_SIZE const and center badges	2018-04-16 18:51:35 +02:00
jorolf	af0c49cca8	badge_size is the actual badge size now ... also fixes rotateBadges bug when hover is lost	2018-04-16 18:27:18 +02:00
jorolf	af755b4a90	Merge branch 'master' into profile-badges	2018-04-15 23:50:52 +02:00
jorolf	6ca714d93b	add badges to ProfileHeader	2018-04-15 23:49:45 +02:00
Dean Herbert	c9615f837a	Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot	2018-04-16 00:20:06 +09:00
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	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09: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
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03: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
UselessToucan	9225c06872	Merge branch 'master' into hide_menu_cursor	2018-04-09 21:41:54 +03: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
Dan Balasescu	6dfca4b2fa	Merge branch 'master' into osu-tab-strip	2018-04-04 14:20:06 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
DrabWeb	3d05798d80	Change SearchableListOverlay to use OsuTabControl strip.	2018-03-29 15:34:53 -03:00
DrabWeb	19bc6b9168	Merge https://github.com/ppy/osu into beatmap-set-status	2018-03-27 18:13:58 -03: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
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
Dean Herbert	fd124d2ee6	Merge branch 'master' into fix-mod-button-sounds	2018-03-22 21:55:15 +09:00
Dean Herbert	e7cb579ec4	Merge branch 'master' into take_screenshot	2018-03-22 21:34:53 +09:00
Dean Herbert	14a653aa28	Restore old auto-popout notification overlay behaviour	2018-03-22 20:55:00 +09:00
Dean Herbert	74191e1b73	Merge remote-tracking branch 'upstream/master' into take_screenshot	2018-03-22 20:49:17 +09:00
Dean Herbert	65b6a2faad	Fix mod button sounds playing when mod overlay is not visible ... Resolves #2240.	2018-03-21 18:41:21 +09:00
Dean Herbert	f944c29505	Merge remote-tracking branch 'upstream/master' into take_screenshot	2018-03-21 12:32:27 +09:00
Dean Herbert	ec851648da	Add better ToString output from SkinInfo	2018-03-19 20:06:44 +09:00
TocoToucan	604e725f3f	Remove redundant code	2018-03-16 20:42:05 +03:00
Dean Herbert	4411758ff7	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-16 17:31:14 +09:00
Dean Herbert	46f5c0fc19	Merge branch 'master' into mod-fixes	2018-03-16 15:38:41 +09:00
TocoToucan	34dc8e7375	Resolve merge conflict	2018-03-14 23:22:19 +03:00
Dean Herbert	551b67ac16	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-14 21:46:19 +09:00
FreezyLemon	070decf890	small code cleanups	2018-03-14 12:38:22 +01:00