7557 Commits

Author	SHA1	Message	Date
Dean Herbert	64f47daff4	Merge branch 'master' into fix-leaderboard-nullref	2018-04-18 12:05:13 +09:00
Dean Herbert	188c8ce1e7	Remove unnecessary score nulling (already happens in PlaceholderState_Set)	2018-04-18 11:58:55 +09:00
Dean Herbert	a27f39a555	Add documentation explaining intertwining logic	2018-04-18 11:57:06 +09:00
Dean Herbert	a827fb51bc	Simplify child definition	2018-04-18 11:42:55 +09:00
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
smoogipoo	9af6ef1864	Remove extra unneded safety	2018-04-16 17:48:49 +09:00
smoogipoo	b9220a1e29	Fix leaderboard placeholder sometimes disappearing indefinitely	2018-04-16 17:39:55 +09:00
smoogipoo	1b9d54a6ad	Fix various data races causing crashes or incorrect leaderboard states	2018-04-16 17:39:03 +09: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	9eb04a5fc8	Merge branch 'master' into fix-button-kb-input	2018-04-16 02:48:51 +09:00
Dean Herbert	2eefe722f3	Move cache to a slightly more familiar place and add comment	2018-04-16 00:38:32 +09:00
Dean Herbert	96ef564f44	Remove unused field	2018-04-16 00:25:09 +09: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
FreezyLemon	3ece54e1c3	make buttons only accept input when expanded ... both other states are "inactive"/invisible so should never accept keyboard input	2018-04-14 00:08:54 +02:00
smoogipoo	fe77417e03	Merge remote-tracking branch 'origin/master' into ignored_input_handler	2018-04-13 22:23:33 +09:00
Dan Balasescu	258e17566c	Merge branch 'master' into update-nunit-3.10.1	2018-04-13 22:05:26 +09:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
smoogipoo	cf65833572	Reword xmldoc	2018-04-13 21:15:08 +09:00
smoogipoo	733f70cbd5	Merge remote-tracking branch 'origin/master' into instant-hide-screenshot	2018-04-13 21:13:09 +09:00
smoogipoo	34adb2527c	A lot more protection from outsiders	2018-04-13 21:12:33 +09:00
smoogipoo	cd594ce12b	BDL cache screenshot manager	2018-04-13 20:46:01 +09:00
FreezyLemon	4b3a129738	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02: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
Endrik Tombak	d9f587edff	Merge remote-tracking branch 'upstream/master' into alt-eagerselect	2018-04-13 11:55:35 +03:00
smoogipoo	0235eba9de	Make TakeScreenshotAsync await on the internal task	2018-04-13 17:51:09 +09:00
smoogipoo	2e5bbe7074	Don't expose CursorOverrideContainer via DI + internalise access	2018-04-13 17:36:38 +09:00
smoogipoo	826a8552e5	Reword options item to include "screenshot"	2018-04-13 17:30:02 +09:00
smoogipoo	ebe36f0612	Instantly hide cursor for required frames while taking screenshot	2018-04-13 17:27:10 +09:00
Dean Herbert	f7c50dee65	Merge branch 'master' into beatmap_set_overlay_difficulties_ordering	2018-04-13 16:48:43 +09:00
Dan Balasescu	2699ad8c89	Merge branch 'master' into lowercase-back-button	2018-04-13 14:14:18 +09:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07:00
TocoToucan	9acea6eab0	Order beatmap difficulty icons correctly	2018-04-12 19:33:30 +03:00
Joehu	61d6f52a53	Lowercase back button	2018-04-12 08:26:25 -07:00
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03:00
Dean Herbert	127f0d7b01	Fix smoogipoo's comments	2018-04-12 21:17:17 +09:00
Dean Herbert	0ca703beaa	Add some missing xmldoc	2018-04-12 21:04:45 +09:00
Dean Herbert	b50bad0072	Merge branch 'master' into editor-clock	2018-04-12 19:29:58 +09:00
Dean Herbert	3ddf00ee74	Merge branch 'master' into high-level-xmldoc	2018-04-12 19:05:10 +09:00
smoogipoo	baae4427ff	Move string-token property to OAuth	2018-04-12 14:30:28 +09:00