9536 Commits

Author	SHA1	Message	Date
Dean Herbert	1ab4713ef6	Add tournament chat display	2018-11-16 15:30:19 +09:00
Dean Herbert	b574a07f23	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-15 13:31:34 +09:00
Dean Herbert	caaa5645e3	Correct framework version	2018-11-14 21:16:08 +09:00
Dean Herbert	30547ac064	Merge remote-tracking branch 'upstream/master' into dropdown-updates	2018-11-14 20:03:45 +09:00
smoogipoo	f1f2fc133a	Use SkinInfo directly	2018-11-14 19:29:20 +09:00
Dan Balasescu	81a3170e3b	Merge branch 'master' into hold-for-menu-back	2018-11-14 19:13:07 +09:00
Dan Balasescu	61a62a4eae	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:35:08 +09:00
smoogipoo	4b86c29f7b	Merge remote-tracking branch 'origin/master' into placement-hiding	2018-11-14 18:34:45 +09:00
smoogipoo	c963fc7cd2	Reduce chaining	2018-11-14 18:34:13 +09:00
Dan Balasescu	e9b47c6233	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:22:34 +09:00
Dean Herbert	a83efe225e	Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase	2018-11-14 18:11:53 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
Dean Herbert	a1dd1057ce	Merge branch 'master' into more-global-scrollalgo	2018-11-14 17:15:24 +09:00
Dean Herbert	84d16ee71b	Merge branch 'master' into placement-hiding	2018-11-14 16:59:41 +09:00
smoogipoo	7274908059	Implement interface	2018-11-14 15:33:09 +09:00
Dean Herbert	fb22fc11f6	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-14 13:59:17 +09:00
Dean Herbert	9a9d5e60af	More refactors	2018-11-14 13:59:02 +09:00
Dean Herbert	2ae139d260	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:54:53 +09:00
Dean Herbert	34973a3e9f	Merge branch 'master' into scrollalgorithm-timeat	2018-11-14 13:32:16 +09:00
Dean Herbert	8b190edde0	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:32:14 +09:00
Dean Herbert	8d59b7299f	Merge branch 'master' into no-drawable-speedchangevis	2018-11-14 13:22:01 +09:00
Dean Herbert	c4769f6802	Refactors	2018-11-14 13:19:51 +09:00
Dean Herbert	396a5b3cd0	Merge branch 'master' into Private_Messages	2018-11-14 12:49:54 +09:00
Dean Herbert	b9278b3488	Fix brackets	2018-11-14 12:05:07 +09:00
Dean Herbert	161d476091	Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song	2018-11-14 11:53:43 +09:00
Dean Herbert	c77412992e	Merge conditionals	2018-11-14 11:53:34 +09:00
Dean Herbert	3caf0cb0d9	Merge branch 'master' into no-drawable-speedchangevis	2018-11-13 19:42:04 +09:00
Dean Herbert	e7d984415b	Merge branch 'master' into immutable-sliderpath	2018-11-13 18:06:14 +09:00
Dean Herbert	93fe3ae333	Merge branch 'master' into tournament-tools	2018-11-13 17:49:12 +09:00
Dean Herbert	72ae22b0c4	Add support for creating new PM conversations	2018-11-13 17:24:11 +09:00
Dean Herbert	f241fcdba1	Add back support for new API and private messages	2018-11-13 15:20:59 +09:00
smoogipoo	6d43baf4bf	Make show/hide only invoked once each	2018-11-13 13:12:11 +09:00
smoogipoo	fbc20d2d4d	Hide placement when cursor is not in the playfield	2018-11-13 12:52:04 +09:00
Dean Herbert	8b9f7f6691	Merge branch 'master' into Private_Messages	2018-11-12 20:43:10 +09:00
Dean Herbert	4b1282235a	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-12 20:41:10 +09:00
smoogipoo	b9b20607af	Add IScrollAlgorithm.TimeAt()	2018-11-12 17:43:22 +09:00
smoogipoo	2e0e1befe9	Add selection mask testcases ... # Conflicts: # osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs	2018-11-12 17:40:09 +09:00
smoogipoo	8be6e351f5	Merge branch 'fix-mania-selections' into add-mania-selection-testcase	2018-11-12 17:39:58 +09:00
smoogipoo	d8e7ad8241	Fix post-rebase issues	2018-11-12 17:36:19 +09:00
smoogipoo	10543cf1b6	Move rest of ScrollingPlayfield into ScrollingRulesetContainer	2018-11-12 17:34:35 +09:00
smoogipoo	e7969ecec7	Move ScrollAlgorithm inside IScrollingInfo	2018-11-12 17:34:35 +09:00
smoogipoo	54668a0dec	Simplify construction of ScrollingInfo	2018-11-12 17:34:35 +09:00
smoogipoo	ad45bc7666	Move scroll direction to scrollinginfo	2018-11-12 17:34:35 +09:00
smoogipoo	48486895ba	Remove unused code	2018-11-12 17:34:35 +09:00
smoogipoo	9fde7f7f44	Move scrolling info to osu.Game	2018-11-12 17:34:35 +09:00
smoogipoo	7f0f143a1b	Move IScrollAlgorithm to ScrollingRulesetContainer + use DI	2018-11-12 17:34:35 +09:00
smoogipoo	aee7a80e71	ScrollAlgorithm -> ScrollVisualisationMethod	2018-11-12 17:26:37 +09:00
smoogipoo	f3ba429701	Make sure control points is internally initialised	2018-11-12 17:14:06 +09:00
Dean Herbert	1101e161d9	Update framework and resources	2018-11-12 17:02:46 +09:00
smoogipoo	f4fd6189f8	Implement IEquatable	2018-11-12 16:53:30 +09:00