16436 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankhjwx	28ad5398cc	Remove the changes in convert spinner	2018-05-23 13:46:12 +08:00
smoogipoo	f894d73501	Fix possible MusicController nullref	2018-05-23 14:36:09 +09:00
smoogipoo	a30f72b477	Add helper methods for seeking/scrolling	2018-05-23 14:32:00 +09:00
smoogipoo	6b0eeb3436	Rework seeking interactions to support smooth scrolling	2018-05-23 14:14:32 +09:00
smoogipoo	f18677382c	Update framework	2018-05-23 12:00:23 +09:00
smoogipoo	49f893d5e4	Couple the timeline to the audio	2018-05-23 12:00:11 +09:00
Dean Herbert	194710eae4	Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications ... Fix disclaimer allowing notifications	2018-05-23 11:22:49 +09:00
frankhjwx	6ee96c758f	Merge branch 'master' into catch_spinner	2018-05-23 10:02:11 +08:00
HoutarouOreki	8e9dde97ce	Better match join and last seen texts and tooltips with osu-web	2018-05-23 03:24:37 +02:00
HoutarouOreki	6cf227a7af	Allow formatting for DrawableDate class	2018-05-23 03:24:18 +02:00
Vidalee	d73c3d0da6	resolving the lost code problem	2018-05-22 23:40:23 +02:00
Vidalee	7a31986812	resolving the lost code problem	2018-05-22 22:39:55 +02:00
Vidalee	08e423ac5b	code sanity	2018-05-22 21:35:17 +02:00
Vidalee	50e2871c89	why this line was ommited	2018-05-22 21:29:41 +02:00
Aergwyn	76fbc656a1	fix disclaimer allowing notifications	2018-05-22 17:53:36 +02:00
Jacob	b328957557	Merge branch 'master' into ParallaxContainerImprovement	2018-05-22 16:32:05 +02:00
jorolf	8fbda5bc59	add license header	2018-05-22 15:41:10 +02:00
jorolf	b324337fa1	Add icon next to beatmap title/username to open in browser	2018-05-22 15:29:52 +02:00
frankhjwx	be0fc24ad4	Fixed banana generation on catch specific maps	2018-05-22 20:51:37 +08:00
jorolf	a7bdaf75b0	Ensure badges are ordered correctly	2018-05-22 13:05:15 +02:00
Dean Herbert	088deee70a	Merge pull request #2601 from Aergwyn/respect-showoverlay-bindable ... FIx overlays from not hiding when returning to initial main menu state	2018-05-22 19:19:00 +09:00
Jacob	caad47b569	Merge branch 'master' into ParallaxContainerImprovement	2018-05-22 12:10:50 +02:00
Dean Herbert	ef40ca8805	Merge branch 'master' into respect-showoverlay-bindable	2018-05-22 19:00:42 +09:00
Dean Herbert	52230d6279	Merge pull request #2600 from peppy/fix-main-menu-escape ... Fix escape not working to go backwards in menus before finally exiting the game	2018-05-22 18:58:48 +09:00
smoogipoo	1dfa3ff995	Merge remote-tracking branch 'origin/master' into editor-timeline-rework	2018-05-22 18:30:29 +09:00
Dan Balasescu	99163ca8ba	Merge branch 'master' into fix-main-menu-escape	2018-05-22 18:17:51 +09:00
Dan Balasescu	c0802b5646	Merge pull request #2430 from UselessToucan/exit_replay_button ... Add hold-to-quit button for gameplay/replays	2018-05-22 18:17:40 +09:00
smoogipoo	0e122468db	Fix progress easing to 0 if aborting after confirmation	2018-05-22 18:06:40 +09:00
Dean Herbert	39de807445	Update framework	2018-05-22 16:46:55 +09:00
Dean Herbert	d43e4af8ea	Fix overlap between quit button at key input overlay	2018-05-22 16:45:42 +09:00
Dean Herbert	436067c01f	Handle scale back in a nicer way	2018-05-22 16:44:37 +09:00
Dean Herbert	7b770d03c5	Use OnMouseMove instead of Update logic	2018-05-22 16:26:59 +09:00
Dean Herbert	babb7d5158	Fix white ring flash when holding button post-confirmation	2018-05-22 16:23:05 +09:00
Dean Herbert	5f8eb6d823	Fix class name	2018-05-22 16:04:36 +09:00
Dean Herbert	8fbda9d57e	Improve comment	2018-05-22 16:04:07 +09:00
Dean Herbert	58ae545747	innerCircle -> overlayCircle	2018-05-22 15:59:53 +09:00
Dean Herbert	ef55c3c197	Fix icon scale not resetting due to no implicit triggering	2018-05-22 15:58:17 +09:00
Dean Herbert	2ce2bd9788	Add comment for pendingAnimation	2018-05-22 15:58:00 +09:00
AlFasGD	c7dfe88ad2	Complete PR's independence	2018-05-22 09:18:02 +03:00
AlFasGD	a178c44b60	Remove snap line dependencies	2018-05-22 09:12:51 +03:00
AlFasGD	8aac1f50ee	Remove more dependencies	2018-05-22 09:12:22 +03:00
AlFasGD	2769f6c47b	Fix issues	2018-05-22 09:09:25 +03:00
AlFasGD	bbe7765a95	Add files to not require dependencies from #2534	2018-05-22 09:03:47 +03:00
AlFasGD	44cf2aa7a3	Sync changes on composition tools	2018-05-22 09:00:11 +03:00
DrabWeb	0b19b7d9e5	Fix test case.	2018-05-22 02:08:50 -03:00
DrabWeb	349b0a3322	Remove empty ctor.	2018-05-22 01:46:08 -03:00
DrabWeb	3cc5bb516e	Remove unused Match ctor param.	2018-05-22 01:39:25 -03:00
DrabWeb	fba79a4de6	Test typo.	2018-05-22 01:31:01 -03:00
DrabWeb	662559d3c9	More test steps.	2018-05-22 01:22:23 -03:00
DrabWeb	6aac4269e6	Add filtering.	2018-05-22 00:33:41 -03:00