1945 Commits

Author	SHA1	Message	Date
smoogipoo	fa1468325e	Refactor hitobjects to remove default control point	2019-12-09 17:48:27 +09:00
smoogipoo	53f7c753fb	General cleanups	2019-12-09 16:44:19 +09:00
smoogipoo	c18f2e6436	Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3	2019-12-09 15:34:49 +09:00
smoogipoo	aff1b93a07	Move config retrieval into LegacySliderBall	2019-12-09 14:43:23 +09:00
smoogipoo	4905709ea4	Remove unused usings	2019-12-09 13:19:21 +09:00
mcendu	76aabdd297	rename field rotate to spin	2019-12-09 12:11:04 +08:00
mcendu	eb065286ae	fix ci	2019-12-09 08:49:44 +08:00
mcendu	1cf81c4906	rm unnecessary curlies	2019-12-09 08:37:32 +08:00
mcendu	b2b252a1cc	Allow skin to disable spin	2019-12-09 08:36:07 +08:00
mcendu	4cd0dd7856	Move transformation to LoadComplete	2019-12-08 20:47:28 +08:00
mcendu	13b891f3f4	Crude legacy cursor rotation support	2019-12-08 20:05:02 +08:00
smoogipoo	b9d12e5fe4	Fix nested hitobjects not updating	2019-12-06 20:53:40 +09:00
smoogipoo	41437242a2	Add initial path type progression support	2019-12-06 19:39:25 +09:00
Dean Herbert	f958485be1	Add comment about size change	2019-12-06 18:54:54 +09:00
Dean Herbert	af2305bb77	Add null check	2019-12-06 18:53:30 +09:00
smoogipoo	52dd7bf716	Fix deleting the first control point not working	2019-12-06 18:49:14 +09:00
smoogipoo	16f8341a02	Handle control point positional updates within SliderPath	2019-12-06 18:49:01 +09:00
smoogipoo	2b5f9515de	Fix multiple control point deletions	2019-12-06 17:03:54 +09:00
smoogipoo	d29ccdc25e	Fix selection blueprint not re-snapping the path	2019-12-06 16:36:08 +09:00
smoogipoo	b4e1b5fa98	Explose + use the full calculated length of the path	2019-12-06 15:53:19 +09:00
Dean Herbert	21ceb7f85d	Always display skins at native sizes for now	2019-12-06 14:40:45 +09:00
smoogipoo	a89a23fe08	Use linq to simplify some expressions	2019-12-06 13:08:35 +09:00
smoogipoo	247609388f	Clean up unused/unnecessary properties	2019-12-06 12:31:22 +09:00
smoogipoo	3ebbf62b2a	Initial game-wide update with the new SliderPath	2019-12-05 19:53:36 +09:00
Huo Yaoyuan	9ddfdab27a	Remove meaningless Convert calls.	2019-12-03 20:47:00 +08:00
Dean Herbert	f181ee1843	Hide the menu cursor while inside the playfield by default	2019-11-29 17:35:11 +09:00
Albie	7864899249	Merge branch 'master' into cinema-mod	2019-11-28 16:42:01 +00:00
Dan Balasescu	c6a85a11bd	Merge branch 'master' into sharpen	2019-11-27 17:09:11 +09:00
Huo Yaoyuan	9425e80a5d	Unify to use double in performance calculators.	2019-11-26 18:34:23 +08:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Albie	09158b6b08	Merge branch 'master' into cinema-mod	2019-11-26 06:57:47 +00:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Albie	0a70ec0b11	Merge branch 'master' into cinema-mod	2019-11-25 07:25:30 +00:00
Berkan Diler	fccdbffa93	Use MathF instead of Math- functions when possible ... MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.	2019-11-25 00:45:42 +01:00
Albie Spriddell	3b9f59cb33	add cinema mod support	2019-11-23 17:34:53 +00:00
Albie Spriddell	20edaf4ba6	add cinema mod support	2019-11-23 17:32:16 +00:00
Dean Herbert	c2e85a2057	Apply CornerExponent fixes	2019-11-22 19:49:20 +09:00
Huo Yaoyuan	4cd7d67fe4	Use early return for if-pattern-matching.	2019-11-22 00:02:40 +08:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	201f32859a	Merge branch 'master' into slider-control-point-removal	2019-11-21 22:10:52 +09:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Huo Yaoyuan	608785b99a	Update .Net Standard projects to 2.1	2019-11-18 18:35:58 +08:00
smoogipoo	031b686ee9	Only accept input while hovered	2019-11-13 17:38:34 +09:00
smoogipoo	d835def4ab	Add point count to the menu item text	2019-11-13 17:36:46 +09:00
smoogipoo	c56503ee88	Select single control point on right click	2019-11-13 17:29:00 +09:00
smoogipoo	9c52d239b4	Return null to allow passthrough	2019-11-13 16:56:48 +09:00
smoogipoo	4c0bca5c07	Add ability to delete control points via right-click option	2019-11-13 16:38:15 +09:00
Huo Yaoyuan	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	dcfa98414f	Use ??=.	2019-11-12 19:56:51 +08:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
smoogipoo	a0884fe9d4	Fix being able to add while not selected	2019-11-12 15:07:54 +09:00
smoogipoo	93d8cd38ca	Implement addition via ctrl+click	2019-11-12 15:02:27 +09:00
smoogipoo	407ca41ba4	Simplify using existing tools	2019-11-12 15:02:27 +09:00
smoogipoo	316dcae614	Use squared distance	2019-11-12 15:02:27 +09:00
smoogipoo	13b11996e0	Improve closest segment algorithm	2019-11-12 15:02:27 +09:00
smoogipoo	10fd5ef5a7	Merge context menus	2019-11-12 15:02:27 +09:00
smoogipoo	461f76926f	Add right-click menu to support control point addition	2019-11-12 15:02:01 +09:00
Dean Herbert	a43b0ee01b	Apply naming and styling changes	2019-11-12 10:45:46 +09:00
Dean Herbert	b37bf4ea01	Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition	2019-11-12 10:44:53 +09:00
Dean Herbert	5da4db6889	Merge pull request #6802 from smoogipoo/edit-fadeout-time ... Increase fade-out time of hitobjects in the editor	2019-11-12 10:30:50 +09:00
Dean Herbert	8402fb1490	Move to const and add some xmldoc for future visitors	2019-11-12 10:02:42 +09:00
Dean Herbert	662318a635	Merge remote-tracking branch 'upstream/master' into edit-fadeout-time	2019-11-12 09:53:16 +09:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
smoogipoo	3b13ad480a	Increase fade-out time of hitobjects in the editor	2019-11-11 13:06:41 +09:00
Dan Balasescu	1c1a49011b	Merge branch 'master' into infrastructure	2019-11-08 19:10:49 +09:00
smoogipoo	df31acb294	Fix slider nested hitobject samples not getting updated	2019-11-08 15:43:34 +09:00
smoogipoo	6fc1be64c2	Make hitobject samples a bindable list	2019-11-08 14:04:57 +09:00
smoogipoo	b1da81571f	Implement slider head control point snapping	2019-11-07 14:00:12 +09:00
Dean Herbert	0df0260dd9	Disallow selections to be moved outside of the playfield (#6742) ... Disallow selections to be moved outside of the playfield	2019-11-06 18:29:06 +09:00
Dean Herbert	41a8954b81	Refactor follow points to support dynamic updates (#6721) ... Refactor follow points to support dynamic updates Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-06 17:43:58 +09:00
smoogipoo	2c1bfd62ef	Disallow selections to be moved outside of the playfield	2019-11-06 17:28:04 +09:00
Dean Herbert	7b5b3ff15c	Remove unused returns	2019-11-06 16:36:12 +09:00
Dean Herbert	7ebd5daf7d	Merge remote-tracking branch 'upstream/master' into dynamic-followpoints	2019-11-06 16:33:47 +09:00
Dean Herbert	ee544e174a	Group -> Connection	2019-11-06 16:33:42 +09:00
smoogipoo	2588534eda	Skin entire selection, add xmldocs	2019-11-06 16:04:20 +09:00
smoogipoo	020b08b450	Initial implementation of limited distance snap	2019-11-06 15:27:48 +09:00
smoogipoo	68ca5cb26a	Adjust comments	2019-11-05 23:20:46 +09:00
smoogipoo	aff275ea21	Revert "Fix follow point lifetime not being updated correctly" ... This reverts commit 1ef2b81041.	2019-11-05 23:03:05 +09:00
smoogipoo	0a2af2b0fe	Apply transform override at a higher level	2019-11-05 23:02:39 +09:00
smoogipoo	d762ec959c	Schedule group refresh when loaded	2019-11-05 22:50:38 +09:00
smoogipoo	68a81e0eb0	Fix follow point transforms not working after rewind	2019-11-05 22:50:21 +09:00
smoogipoo	f2118b0eba	Add automated test cases	2019-11-05 19:31:58 +09:00
smoogipoo	6c58faf30c	Fix group ends potentially not being updated correctly	2019-11-05 19:31:48 +09:00
Dean Herbert	52dba69a64	Implement slider control point deletion (#6679) ... Implement slider control point deletion Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-05 19:15:15 +09:00
smoogipoo	1ef2b81041	Fix follow point lifetime not being updated correctly	2019-11-05 17:33:02 +09:00
smoogipoo	3b6064336b	Implement group re-ordering based on start time	2019-11-05 17:33:02 +09:00
smoogipoo	a19e26f8aa	Improve performance of refreshes	2019-11-05 17:33:02 +09:00
smoogipoo	712253ff50	Replace follow point renderer with new implementation	2019-11-05 17:33:02 +09:00
smoogipoo	ddfcda9e02	Remove abstract ConnectionRenderer class	2019-11-05 17:33:02 +09:00
smoogipoo	d77882c21b	Fix slider selection input handled outside path	2019-11-05 17:31:52 +09:00
smoogipoo	7c20a589f2	Remove unused usings	2019-11-05 13:56:21 +09:00
smoogipoo	c8beb5296f	Use PlatformAction.Delete instead of Delete key	2019-11-05 13:26:44 +09:00
smoogipoo	08bd811326	Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs	2019-11-05 13:07:06 +09:00
Dean Herbert	66253a0bd4	Handle selection on mouse down instead of click ... This is how other elements work, and feels better with drag preselection	2019-11-05 02:21:50 +09:00
Dean Herbert	bcf8a6d514	Fix slider creation regressing with path selection changes	2019-11-03 19:59:37 +09:00
Dean Herbert	f69a641d35	Merge branch 'master' into slider-controlpoint-deletion	2019-11-03 19:32:10 +09:00
Dean Herbert	1155aacd90	Update sliders when control points change (#6680) ... Update sliders when control points change	2019-11-03 19:05:48 +09:00
Dean Herbert	f849926049	Merge branch 'master' into slider-controlpoint-deletion	2019-11-03 19:05:17 +09:00
Dean Herbert	4dbdfcdd3c	Change control to toggle rather than always select	2019-11-03 18:41:29 +09:00
Dean Herbert	6bc62385b6	Merge branch 'master' into slider-controlpoint-selection	2019-11-03 15:28:50 +09:00
Dean Herbert	e23ea94383	Add one more level of null check	2019-11-01 15:33:38 +09:00
Dean Herbert	05002ea3e8	Move Show/Hide code to PopIn/PopOut	2019-11-01 14:50:38 +09:00
smoogipoo	41ae66d517	Update slider when control points change	2019-10-31 18:24:38 +09:00
smoogipoo	18f374eec6	Deselect deleted control points	2019-10-31 17:58:33 +09:00
smoogipoo	78194cfa6e	Implement slider control point deletions	2019-10-31 17:54:09 +09:00
smoogipoo	43b2cbb865	Implement slider control point deletion	2019-10-31 17:39:57 +09:00
smoogipoo	20aeb7aaff	Implement multiple selection	2019-10-31 17:25:30 +09:00
smoogipoo	8d50b155e8	Make selection happen on click only	2019-10-31 17:13:10 +09:00
smoogipoo	cfdf710676	Add test	2019-10-31 16:51:58 +09:00
smoogipoo	e23a75c64a	Implement control point selection	2019-10-31 16:23:54 +09:00
smoogipoo	7a3ebcd0b1	Fix path changes not updating tail circle	2019-10-31 15:52:38 +09:00
Huo Yaoyuan	bcf8e3a9d4	Remove redundant properties from desktop projects. ... While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.	2019-10-30 22:56:33 +08:00
Huo Yaoyuan	31595159be	Normalize .props	2019-10-30 21:54:14 +08:00
Dean Herbert	e9cb3337b3	Fix 1x1 white pixel appearing in the centre of hitcircles on default skin	2019-10-29 22:31:27 +09:00
Dean Herbert	194e501f86	Merge branch 'master' into snapping-refactor	2019-10-26 14:20:08 +09:00
smoogipoo	da6ee05dd6	Fix not being able to drag non-snaked sliders	2019-10-25 18:37:44 +09:00
smoogipoo	607b4d874a	Refactor flow of snapping through HitObjectComposer	2019-10-25 16:40:30 +09:00
smoogipoo	a6458fdeab	Re-use slider type	2019-10-24 19:04:24 +09:00
smoogipoo	b7af4acdbf	Allow not having a composer	2019-10-24 19:04:00 +09:00
smoogipoo	0af5706db6	Snap path during control point movement	2019-10-24 19:02:59 +09:00
smoogipoo	f45f17339c	Implement slider path distance snapping	2019-10-24 18:17:30 +09:00
Dean Herbert	ef4dd3e028	Merge pull request #6580 from smoogipoo/remove-controlpoint-snap ... Don't snap slider control point placement	2019-10-24 10:27:16 +09:00
smoogipoo	436941cda3	Add comment	2019-10-23 17:58:44 +09:00
Dean Herbert	02efd0e943	Merge pull request #6556 from smoogipoo/fix-slider-stack-change ... Fix sliders not moving with stacking changes	2019-10-23 17:48:06 +09:00
smoogipoo	b903edca45	Don't snap slider control point placement	2019-10-23 16:03:16 +09:00
smoogipoo	54f23cbd0d	Update stacking test case values	2019-10-23 15:49:36 +09:00
Dean Herbert	e3fa5f1da3	Merge branch 'master' into beatsnap-grid-integration	2019-10-21 18:44:34 +09:00
smoogipoo	c34d3362df	Fix hit circles selection area being too large	2019-10-21 17:14:08 +09:00
Dean Herbert	b157aaead1	Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration	2019-10-21 17:09:43 +09:00
smoogipoo	38c2c328ff	Rename HitObject -> DrawableObject in selection blueprints	2019-10-21 17:04:56 +09:00
smoogipoo	5f8d46f666	Fix sliders not moving with stacking change	2019-10-21 16:24:06 +09:00
Dean Herbert	11e5e0decc	Merge branch 'master' into dho-apply	2019-10-21 16:05:11 +09:00
smoogipoo	96649e0a6a	Fix selection blueprints not respecting stacking	2019-10-21 15:03:49 +09:00
smoogipoo	6afc27b1bd	Merge remote-tracking branch 'origin/master' into dho-apply	2019-10-21 13:47:44 +09:00
Dan Balasescu	c1c803caf4	Merge branch 'master' into cursor-size-trail	2019-10-21 13:26:13 +09:00
HoLLy	68837d47df	Use local bindable instead of using BindValueChanged of external one	2019-10-19 12:15:31 +02:00
HoLLy	ca957f0994	Hide gameplay cursor when resume overlay is shown	2019-10-19 11:52:07 +02:00
Dean Herbert	d0eaf629af	Merge branch 'master' into dho-apply	2019-10-18 19:45:10 +09:00
smoogipoo	5dd5a070e0	Show placement grid from hitobjects at the current time	2019-10-18 19:03:19 +09:00
Dean Herbert	99ea45da41	Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid ... Implement osu!'s beat snapping grid	2019-10-18 16:27:03 +09:00
smoogipoo	f1d7e7e7f6	Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration	2019-10-18 13:49:09 +09:00
smoogipoo	c4704f6a29	Add beat snap grid to the composer	2019-10-18 12:47:52 +09:00
smoogipoo	5ccdd2b203	Mask the osu! beatsnap grid	2019-10-18 12:38:43 +09:00
smoogipoo	c5ee533524	Merge branch 'dho-apply' into beatsnap-grid-integration	2019-10-18 12:38:29 +09:00
Dean Herbert	f3ed71d336	Move scoring distance constant to a central/shared location	2019-10-17 16:36:47 +09:00
Dean Herbert	f92331531c	Rename grid to DistanceSnap to be more in line with its purpose	2019-10-17 15:32:02 +09:00
smoogipoo	bc41eb176e	Clean up head/tail setting in various DHOs	2019-10-17 14:02:23 +09:00
smoogipoo	f429a8f7c2	Add back/obsolete old AddNested() method	2019-10-17 14:02:08 +09:00
smoogipoo	d8f3678c3c	Rename parameter	2019-10-17 12:53:54 +09:00
smoogipoo	3a1acf7b0a	Fix slider approach circle proxies	2019-10-17 12:50:26 +09:00
smoogipoo	8d7453c251	Rework construction of nested hitobjects	2019-10-16 22:10:50 +09:00
smoogipoo	4ac2e1c58e	Move load() to below ctor()	2019-10-16 21:41:18 +09:00
smoogipoo	79b2c7b480	Make BeginPlacement() set the hitobject start time	2019-10-16 20:04:15 +09:00
HoLLy	13e1199229	Move click to resume cursor scaling responsibility to container	2019-10-15 22:44:04 +02:00
HoLLy	8c671d7fde	Rename cursorScale and calculatedCursorScale	2019-10-15 20:12:08 +02:00
Dean Herbert	ae2fe62fd9	Use BindValueChanged	2019-10-14 17:13:36 +09:00
Dean Herbert	64a6ca28e6	Merge branch 'master' into cursor-size-trail	2019-10-14 16:35:37 +09:00
Dean Herbert	f3c38ae089	Merge branch 'master' into osu-beatsnapping-grid	2019-10-13 18:38:57 +09:00
HoLLy-HaCKeR	7931510d7b	Ensure OsuResumeCursor can change scale when it is being shown	2019-10-12 11:59:22 +02:00
HoLLy-HaCKeR	fdc17d2adb	Scale OsuResumeCursor with gameplay cursor	2019-10-12 11:51:14 +02:00
HoLLy-HaCKeR	13924174c4	Fix PopIn and PopOut resetting cursor scale	2019-10-12 10:04:14 +02:00
Dean Herbert	00d4d976b7	Move editor selections relative to hitobject start positions (#6431) ... Move editor selections relative to hitobject start positions	2019-10-11 19:35:11 +09:00
smoogipoo	45835f97a1	Split out grids into separate files	2019-10-11 18:41:17 +09:00
smoogipoo	2e2768870f	Merge remote-tracking branch 'origin/master' into editor-selection-movement-params	2019-10-10 16:38:41 +09:00
Dean Herbert	51bf600ea7	Use empty hitwindows instead of null	2019-10-09 19:08:31 +09:00
HoLLy-HaCKeR	1c22fb485f	Scale cursortrail along with cursor	2019-10-08 19:40:46 +02:00
HoLLy-HaCKeR	b6047e4613	Move OsuCursor resize logic to OsuCursorContainer	2019-10-08 19:39:54 +02:00
smoogipoo	8b661e624d	Remove drag from class/method namings + refactor	2019-10-08 19:08:31 +09:00
smoogipoo	08d043f447	Move selection relative to the hitobject start positions	2019-10-08 18:57:03 +09:00
Dean Herbert	b09d9b7e1f	Add todo in slider tail to avoid confusion	2019-10-08 17:56:56 +09:00
smoogipoo	a59e07948c	Merge remote-tracking branch 'GSculerlor/master' into rework-selection-updates	2019-10-07 18:50:07 +09:00
smoogipoo	e265beb289	Fix merge error	2019-10-07 18:49:59 +09:00
Dean Herbert	0ebc5d0ffb	Fix cursor trail appearing regardless of the setting in replays (#6288) ... Fix cursor trail appearing regardless of the setting in replays	2019-10-07 12:32:22 +08:00
Dean Herbert	179cde917b	Merge branch 'master' into rework-selection-updates	2019-10-06 15:00:56 +08:00
smoogipoo	652acac87f	Move placement movement event to BlueprintContainer	2019-10-03 16:14:42 +09:00
smoogipoo	c5540048ab	Fix tail circle not moving with slider position changes	2019-10-01 19:39:06 +09:00
smoogipoo	90ad1c5166	Add more tests for slider selection blueprint	2019-10-01 19:33:27 +09:00
smoogipoo	ba5c9547e1	Add more tests for hitcircle selection blueprint	2019-10-01 19:33:15 +09:00
smoogipoo	bddaead72e	Make hitobject pieces able to update dynamically	2019-09-27 18:45:22 +09:00
smoogipoo	4fc37d1137	Remove SliderPiece + HitObjectPiece	2019-09-27 18:01:55 +09:00
smoogipoo	f64fe22f36	Remove bindables from osu! selection blueprints	2019-09-27 18:00:24 +09:00
iiSaLMaN	67bed57cbd	Bind value changed event of cursor trail appearence outside BDL ... https://github.com/ppy/osu/pull/6270#discussion_r328899728	2019-09-27 08:46:49 +03:00
smoogipoo	45f2bcc440	Fix combo bindings not being bound to nested hitobjects	2019-09-26 17:39:19 +09:00
smoogipoo	3155a90501	Use bindables for displayed circle piece numbers	2019-09-26 16:58:20 +09:00
smoogipoo	bbf0544a8d	Add bindables for IHasComboInformation properties	2019-09-26 16:55:08 +09:00
Salman Ahmed	0b2a025cb9	Merge branch 'master' into decrease-disc-rotation-on-rewind	2019-09-26 04:52:11 +03:00
smoogipoo	74b2e99247	Fix invalid cursor trail parts being drawn	2019-09-25 16:25:15 +09:00
Dan Balasescu	13f922211f	Merge branch 'master' into decrease-disc-rotation-on-rewind	2019-09-24 12:58:27 +09:00
iiSaLMaN	57310c86c7	Remove unnecessary fields	2019-09-20 15:09:51 +03:00
iiSaLMaN	093ed8421e	Remove "allow slider ball tinting" ruleset setting	2019-09-20 15:08:00 +03:00
iiSaLMaN	1b45014ff6	Use logical-OR	2019-09-20 00:25:16 +03:00
iiSaLMaN	f6291170b1	Implement tinting slider ball with combo colour	2019-09-20 00:11:37 +03:00
iiSaLMaN	8fcfd82316	Add AllowSliderBallTint to skin configuration	2019-09-20 00:10:55 +03:00
iiSaLMaN	033ed2e1f5	Add setting to always tint slider ball	2019-09-20 00:10:28 +03:00
Dean Herbert	0640b2eb35	Fix judgement sizes not matching legacy skins (#6145) ... Fix judgement sizes not matching legacy skins	2019-09-19 18:49:35 +09:00
Dean Herbert	3abcd898a6	Add hit lighting (#6144) ... Add hit lighting Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-09-19 18:49:22 +09:00
Dan Balasescu	027d6194f2	Merge branch 'master' into add-hit-lighting	2019-09-19 18:07:29 +09:00
smoogipoo	db24cfbead	Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect ... # Conflicts: # osu.Game/Screens/Play/Player.cs	2019-09-19 17:57:04 +09:00