15603 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	059f1d9bcb	Merge pull request #3671 from gotopie/hide-seekbar-with-no-song ... Hide seekbar when no song is playing	2018-11-14 12:16:42 +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
Jack Scotson	0bced171e7	Merge branch 'master' into keypad-enter	2018-11-13 17:11:21 +00:00
Scotsoo	4dab5db2e5	Allowing keypad enter to be used along with normal enter	2018-11-13 17:09:28 +00:00
Dean Herbert	3caf0cb0d9	Merge branch 'master' into no-drawable-speedchangevis	2018-11-13 19:42:04 +09:00
Dean Herbert	da3c4bc050	Merge branch 'master' into fix-mania-selections	2018-11-13 18:33:53 +09:00
Dean Herbert	7a918b06d9	Merge pull request #3704 from smoogipoo/immutable-sliderpath ... Make SliderPath immutable	2018-11-13 18:27:36 +09:00
Dean Herbert	e7d984415b	Merge branch 'master' into immutable-sliderpath	2018-11-13 18:06:14 +09:00
Dean Herbert	72ae22b0c4	Add support for creating new PM conversations	2018-11-13 17:24:11 +09:00
smoogipoo	a9a33b1fcb	Implement mania selection movements	2018-11-13 16:42:40 +09:00
smoogipoo	fc0030a391	Use common positional adjustment for note blueprints	2018-11-13 15:45:06 +09:00
smoogipoo	0f755c814c	Fix post-merge issue	2018-11-13 15:44:37 +09:00
smoogipoo	2c277545e0	Merge branch 'add-mania-selection-testcase' into mania-selection-movement	2018-11-13 15:40:51 +09:00
Dean Herbert	82ebc74eee	Fix testcase	2018-11-13 15:36:36 +09:00
Dean Herbert	f241fcdba1	Add back support for new API and private messages	2018-11-13 15:20:59 +09:00
smoogipoo	25101ecd2c	Snap placement blueprint to columns	2018-11-13 14:13:29 +09:00
smoogipoo	6d43baf4bf	Make show/hide only invoked once each	2018-11-13 13:12:11 +09:00
smoogipoo	819cba31ce	Fix spinners not starting placement with the first click	2018-11-13 12:52:44 +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
Dean Herbert	302196e985	Merge pull request #3705 from peppy/update-framework ... Update framework and resources	2018-11-12 19:58:03 +09:00
smoogipoo	3d8ef97e81	Add testcase	2018-11-12 19:41:06 +09:00
smoogipoo	1403fa26cf	Fix placement not working correctly for downwards scroll	2018-11-12 19:40:57 +09:00
smoogipoo	1d40a042f6	Extract common methods into ManiaPlacementBlueprint	2018-11-12 18:32:44 +09:00
smoogipoo	3a1fee59fb	Implement note placement	2018-11-12 18:24:18 +09:00
smoogipoo	a0c75a0597	Merge branch 'notepieces' into note-placement	2018-11-12 17:59:54 +09:00
smoogipoo	e302d5d005	Separate NoteSelectionBlueprint into a note piece	2018-11-12 17:59:39 +09:00
smoogipoo	9e1b54f1ef	Merge branch 'more-global-scrollalgo' into note-placement	2018-11-12 17:47:02 +09:00
Dan Balasescu	e885c03cfa	Merge branch 'master' into update-framework	2018-11-12 17:45:16 +09:00
smoogipoo	b9b20607af	Add IScrollAlgorithm.TimeAt()	2018-11-12 17:43:22 +09:00
Dean Herbert	27a794f1d5	Merge pull request #3684 from peppy/better-rider-ignore ... Change .idea ignore rules to not ignore run configurations	2018-11-12 17:41:31 +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
Dan Balasescu	5051263106	Merge branch 'master' into better-rider-ignore	2018-11-12 17:19:39 +09:00
smoogipoo	e3c60c2f96	Cleanups	2018-11-12 17:18:58 +09:00
smoogipoo	f3ba429701	Make sure control points is internally initialised	2018-11-12 17:14:06 +09:00