9577 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	c002d4e1d2	Merge branch 'master' into result-page-sorting	2017-12-31 04:34:48 +09:00
Dean Herbert	d18b6aada9	Merge pull request #1788 from peppy/fix-push-disabled-crash ... Fix crash from being able to perform selection after entering play mode	2017-12-31 03:07:38 +09:00
Aergwyn	1ef4ff6776	order statistics before adding to resultpage	2017-12-30 18:07:53 +01:00
Aergwyn	138d78309f	add HitCount enum and replace string usage with enum	2017-12-30 18:07:30 +01:00
Dean Herbert	c8bab7d983	Merge branch 'master' into fix-push-disabled-crash	2017-12-31 01:27:41 +09:00
Dean Herbert	d5698374f0	Merge pull request #1808 from Aergwyn/tooltips-for-flags ... Add tooltip to country flags	2017-12-30 23:12:00 +09:00
Aergwyn	f7fe083018	add tooltip to country flags	2017-12-30 14:59:35 +01:00
Dan Balasescu	44bc6749e3	Merge branch 'master' into fix-push-disabled-crash	2017-12-30 20:08:51 +09:00
Dan Balasescu	be8c3d2e97	Merge pull request #1806 from smoogipoo/update-framework ... Update framework with breaking flow changes reverted	2017-12-30 20:08:41 +09:00
smoogipoo	86a00411d7	Update framework ... Reverts fillflow changes.	2017-12-30 19:58:01 +09:00
Dean Herbert	ef683a60f5	Merge branch 'master' into fix-push-disabled-crash	2017-12-30 18:59:59 +09:00
Dean Herbert	dbfc00ab83	Merge pull request #1804 from Techno-coder/patch-2 ... Add Getting Started section to Readme and MonoDevelop IDE for Linux	2017-12-30 18:35:19 +09:00
Dean Herbert	8efd552387	Merge branch 'master' into patch-2	2017-12-30 18:21:49 +09:00
Dean Herbert	06b9267112	Merge pull request #1795 from Aergwyn/scaling-repeat-points ... Fix repeat points not scaling properly	2017-12-30 18:21:40 +09:00
Dean Herbert	e28f91a602	Improve wording and fix macOS requirement	2017-12-30 18:20:51 +09:00
Dean Herbert	233904ddef	Merge branch 'master' into scaling-repeat-points	2017-12-30 18:09:32 +09:00
Techno-coder	03e9b05c3f	Add Getting Started section to Readme and MonoDevelop IDE for Linux	2017-12-30 21:38:33 +13:00
Dan Balasescu	d8e6ff79f7	Merge pull request #1669 from ninjaprawn/master ... Display the correct mod tooltips in mod selection	2017-12-30 17:06:00 +09:00
Aergwyn	1f71bd3425	scale the correct part of the repeat point	2017-12-30 09:05:40 +01:00
smoogipoo	616ad5b723	Cleanups	2017-12-30 16:55:01 +09:00
smoogipoo	1ab2c0e21b	Update framework	2017-12-30 16:45:59 +09:00
smoogipoo	714d93dd92	Merge remote-tracking branch 'origin/master'	2017-12-30 16:17:14 +09:00
Dean Herbert	e6d79fbc66	Merge pull request #1801 from smoogipoo/hitobject-constructor-safety ... Fix DrawableHitCircle accepting a base OsuHitObject parameter	2017-12-30 15:47:12 +09:00
Dean Herbert	0bd1b75d0b	Fix test case	2017-12-30 15:38:10 +09:00
Dean Herbert	7f54778fed	Merge branch 'master' into hitobject-constructor-safety	2017-12-30 15:32:36 +09:00
Dean Herbert	845c1946db	Merge pull request #1782 from Aergwyn/standard-hd-support ... Implement osu! hidden	2017-12-30 15:31:05 +09:00
Dean Herbert	a2840d2519	Fix FadeInDuration not being passed down to sliders' InitialCircle	2017-12-30 15:21:25 +09:00
Dean Herbert	f73f43fdad	Merge remote-tracking branch 'upstream/master' into standard-hd-support	2017-12-30 14:48:19 +09:00
Dean Herbert	a0966305d4	Remove unnecessary new event	2017-12-30 14:46:44 +09:00
smoogipoo	b99e0a0439	Fix DrawableHitCircle accepting a base OsuHitObject parameter ... Fixes #1778.	2017-12-30 14:15:42 +09:00
Dan Balasescu	db46683ba8	Merge pull request #1784 from kiroma/comguide ... Create a compilation guide	2017-12-30 14:04:42 +09:00
Dan Balasescu	a9f8eb2815	Merge branch 'master' into comguide	2017-12-30 13:56:31 +09:00
Dan Balasescu	7b5f3e70af	Merge pull request #1797 from jai-sharma/supporter-tooltip ... Add tooltip text to supporter icon	2017-12-30 13:55:48 +09:00
Dan Balasescu	2c4b4d19e0	Merge branch 'master' into supporter-tooltip	2017-12-30 13:44:59 +09:00
Dan Balasescu	982d2fe7d6	Merge pull request #1789 from peppy/fix-import-dialog-icon ... Use a more suiting (?) icon for import dialog	2017-12-30 13:23:26 +09:00
Dan Balasescu	a7135e2688	Merge branch 'master' into fix-import-dialog-icon	2017-12-30 13:15:33 +09:00
jai_	9660e0885b	correctly name tooltip interface	2017-12-29 19:20:37 +00:00
jai_	6de41ba172	Trim whitespace	2017-12-29 19:16:43 +00:00
jai_	b1dd64983d	Add tooltip text to supporter icon	2017-12-29 19:05:50 +00:00
Aergwyn	52dd5ddba6	fix repeat points not scaling properly	2017-12-29 20:03:43 +01:00
Aergwyn	0a2e41884e	add more required types for test slider	2017-12-29 20:01:26 +01:00
Aergwyn	5e887240ae	actually use option to override values...	2017-12-29 18:04:40 +01:00
Aergwyn	6c6fa08a06	added some colour to testsliders ... gray just wasn't sticking out well	2017-12-29 17:56:48 +01:00
Aergwyn	07040f9fd1	rename field	2017-12-29 17:52:28 +01:00
Aergwyn	5c3b67bcef	remove unnecessary values	2017-12-29 17:51:59 +01:00
Aergwyn	f547c7986d	created option to override values before UpdateState is called	2017-12-29 17:50:55 +01:00
Aergwyn	a58b5ff5f2	simplify sequence	2017-12-29 17:46:22 +01:00
Aergwyn	ca9f014714	add required types to testclasses	2017-12-29 17:44:38 +01:00
Aergwyn	b200134a18	fix spinner easing with hidden	2017-12-29 17:44:10 +01:00
Dean Herbert	db8228f69d	Don't think we need this expire call	2017-12-29 18:57:38 +09:00