1124 Commits

Author	SHA1	Message	Date
Dean Herbert	c72705217a	Merge branch 'master' into framed-replay-handler-fixes	2019-03-29 12:59:51 +09:00
Dean Herbert	14cef94a53	Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation	2019-03-29 12:59:26 +09:00
Dean Herbert	785433bb74	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:25:54 +09:00
Dean Herbert	7715606188	Merge branch 'master' into sprite-icon-compatibility	2019-03-29 11:15:34 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	09a7950a3b	Fix handlers for other rulesets	2019-03-28 15:09:06 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	39df8cce19	Fix incorrect usage of InternalChildren ... Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)	2019-03-25 13:48:55 +09:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
tangalbert919	00c659a5ca	Merge all changes from 2019.321.0 to android	2019-03-20 11:00:27 -05:00
Dean Herbert	7b6d882ce6	Remove double-generic type	2019-03-20 11:29:16 +09:00
Dean Herbert	3b7a76aa4e	Fix typo	2019-03-20 11:22:34 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
tangalbert919	e865ac2086	Merge remote-tracking branch 'origin/master' into android	2019-03-17 09:39:34 -05:00
Dean Herbert	1617e2a729	Merge branch 'master' into mania-judgemetns	2019-03-13 18:17:42 +09:00
David Zhao	3b3b1e51ee	Move hit animation logic into virtual method	2019-03-12 19:41:33 +09:00
David Zhao	12f334035f	Create properties for use in DrawableManiaJudgement	2019-03-12 19:23:24 +09:00
Albert Tang	7f30fce3fe	Merge branch 'master' into android	2019-03-08 10:39:24 -06:00
Dean Herbert	48e54c84c1	Merge branch 'master' into mod-wind	2019-03-08 20:23:02 +09:00
Dean Herbert	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
Dean Herbert	d70b373af9	Merge branch 'master' into mod-wind	2019-03-06 14:04:04 +09:00
tangalbert919	1e6cb3e7d8	Merge remote-tracking branch 'upstream/master' into android	2019-03-05 17:56:13 -06:00
smoogipoo	78596dfe80	Merge remote-tracking branch 'origin/master' into move-osu-settings ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs	2019-03-05 13:25:03 +09:00
LeNitrous	c271a3a781	remove ruleset specific mods	2019-03-04 17:36:44 +08:00
LeNitrous	ecc2c28a62	mod rule changes	2019-03-03 16:22:00 +08:00
smoogipoo	c722ea0299	Add space	2019-03-01 14:30:58 +09:00
andy840119	e634475bf4	IsDuel -> Dual	2019-02-28 23:40:03 +09:00
andy840119	4b2be4612f	support duel mode in mania beatmap	2019-02-28 19:07:43 +09:00
Dean Herbert	2dbf7d122c	Merge branch 'master' into use-pattern-matching	2019-02-28 14:53:07 +09:00
Dean Herbert	e2c6a8bc07	Use pattern matching wherever possible	2019-02-28 14:35:00 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	c8793911a8	Enable more stringent inspectcode style inspections	2019-02-27 21:25:40 +09:00
Dean Herbert	cd3f3be79d	Merge branch 'master' into master	2019-02-25 09:59:18 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
Ignacio Conde	a62f150962	Fixed Issue #4159	2019-02-22 02:28:38 -03:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dean Herbert	d6a2fe6891	Remove excess newline	2019-02-20 10:29:08 +09:00
smoogipoo	4efc03cdf0	Add beatmap argument + fix crashes	2019-02-19 17:56:38 +09:00
smoogipoo	5457097342	Update with PopulateAttributes() removal	2019-02-19 17:48:00 +09:00
smoogipoo	bf17826363	Fix post-merge errors	2019-02-19 16:30:29 +09:00
smoogipoo	9cce9ce97c	Consider aggregate peaks	2019-02-18 15:00:32 +09:00
smoogipoo	68725dc005	Implement new difficulty calculator for Rulesets.Mania	2019-02-18 15:00:20 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
smoogipoo	e319a760b8	Add mania difficulty calculator test	2019-02-15 16:25:44 +09:00
tangalbert919	7349a6c527	Merge remote-tracking branch 'upstream/master' into android	2019-02-12 20:41:54 -06:00
HoLLy	ae9d5f999c	Use correct DifficultyAttributes where possible	2019-02-06 21:28:42 +01:00
Dean Herbert	2d7c23dd9f	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-02-04 12:15:53 +09:00
tangalbert919	80006109a2	Merge remote-tracking branch 'upstream/master' into android	2019-01-29 18:13:43 -06:00
LeNitrous	03e57d0423	fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp	2019-01-26 20:15:19 +08:00
LeNitrous	73dbf5712d	add license headers	2019-01-26 13:43:27 +08:00
LeNitrous	1427c9f576	trim whitespaces	2019-01-26 13:11:08 +08:00
LeNitrous	c6e26a92ec	add wind up and wind down mods	2019-01-26 12:15:45 +08:00
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Dean Herbert	f4729d41f3	Merge branch 'master' into samah-ios	2019-01-25 18:49:08 +09:00
Dean Herbert	67331039ef	Don't use TransferValueOnCommit	2019-01-25 12:53:30 +09:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09:00
Unknown	01ab371c87	add "Scroll speed" to ManiaSettingsSubsection	2019-01-24 17:39:23 +01:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
tangalbert919	e3ce203c68	Merge remote-tracking branch 'upstream/master' into android	2019-01-23 17:45:46 -06:00
Dean Herbert	8160162cde	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-01-21 20:58:17 +09:00
Shane Woolcock	10b91e18bd	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2019-01-19 18:03:58 +10:30
Kyle Chang	bd6c845fc8	Use IApplicableToBeatmap for mirror and random mania mods	2019-01-15 22:51:52 -05:00
Shane Woolcock	a6c54a9675	Merge branch 'master' into samah-ios	2019-01-12 00:16:09 +10:30
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
tangalbert919	47268898be	Expose internals for Android test projects	2019-01-06 00:04:25 -06:00
Dean Herbert	aec3753863	Fix imported replays having excess statistics	2019-01-03 14:01:20 +09:00
Shane Woolcock	32ffcb9865	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-29 20:09:00 +10:30
Shane Woolcock	a83bee9461	Add ruleset visual tests	2018-12-29 20:05:37 +10:30
smoogipoo	b64932f6db	Implement hit windows	2018-12-27 22:39:15 +09:00
Ivan Pavluk	cb2444e01c	Remove Meh from TaikoHitWindows	2018-12-06 19:04:54 +07:00
smoogipoo	8eff49bccd	Remove User from Replay	2018-11-30 18:25:14 +09:00
Dean Herbert	d97a15a504	Add IMod and change ShortenedName to Acronym	2018-11-30 17:16:00 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
Dean Herbert	271dcded3c	Merge branch 'master' into scoredatabase	2018-11-30 14:59:58 +09:00
Dean Herbert	a1666fb7fa	MouseDownPosition -> DragPosition	2018-11-30 14:21:20 +09:00
Dean Herbert	5254b07680	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
Dean Herbert	085acf29a0	Fix blueprints behaving incorrectly	2018-11-29 19:29:36 +09:00
Dean Herbert	ab0ce46362	Make hold note placement blueprints look a bit more blueprint-y	2018-11-29 18:13:15 +09:00
Dean Herbert	132d334e15	Merge branch 'master' into hold-note-placement	2018-11-29 17:02:55 +09:00
Dean Herbert	d1c976880c	Fix incorrect margin/spacing handling	2018-11-29 14:15:28 +09:00
Dean Herbert	8fd04cb47b	Fix mania placement blueprints appearing outside valid stage placement area	2018-11-29 13:20:37 +09:00
smoogipoo	b8e60afa69	Move replays to an wrapping Score class	2018-11-28 18:45:17 +09:00
smoogipoo	219929eb47	Score -> ScoreInfo	2018-11-28 18:33:01 +09:00
smoogipoo	2ee181daf7	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
smoogipoo	09b79d736b	Remove unused usings	2018-11-28 16:33:42 +09:00
smoogipoo	5fd6e6ca77	Re-namespacing	2018-11-28 16:12:57 +09:00
smoogipoo	f9f300b215	Fix drag breaking if scrolling while dragging	2018-11-26 16:08:56 +09:00
Dean Herbert	4cfeb1b9a1	Merge branch 'master' into note-placement	2018-11-26 14:35:31 +09:00
Dean Herbert	c944e8bb29	Merge branch 'master' into fix-deletion-crash	2018-11-26 14:20:02 +09:00
Dean Herbert	bfebed053d	Merge branch 'master' into note-placement	2018-11-26 14:19:46 +09:00
smoogipoo	60ffad169f	Fix post-merge errors	2018-11-26 11:47:48 +09:00
smoogipoo	c0fcbc283e	Merge branch 'note-placement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs	2018-11-26 11:47:22 +09:00
smoogipoo	56032a4522	Merge branch 'mania-selection-movement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs # osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs	2018-11-26 11:45:48 +09:00
smoogipoo	5d6a438f98	Make selected mania hitobjects always alive	2018-11-26 11:34:25 +09:00
smoogipoo	91aa00b0e9	Add helper method to get column by position	2018-11-26 10:54:54 +09:00
smoogipoo	4ba3fa4ab6	osuTK	2018-11-26 10:44:48 +09:00
Dean Herbert	1da2006dea	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
Dean Herbert	7de85659ba	Merge branch 'master' into mania-selection-movement	2018-11-21 20:00:46 +09:00
smoogipoo	dc8cd51e15	Implement mania note deletion	2018-11-20 17:26:00 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dan Balasescu	8cee4141e8	Merge branch 'master' into note-placement	2018-11-19 19:08:53 +09:00
smoogipoo	2ee56e4a78	Add a body piece	2018-11-19 18:59:05 +09:00
smoogipoo	ad950cfc90	Implement hold note placement	2018-11-19 18:40:43 +09:00
smoogipoo	8071244d97	Make sizing happen per-blueprint	2018-11-19 18:40:27 +09:00
Dan Balasescu	d9b8d2d15c	Trim whitespace	2018-11-19 18:05:21 +09:00
Dan Balasescu	079230d9ed	Merge branch 'master' into mania-selection-movement	2018-11-19 18:03:12 +09:00
smoogipoo	d1cbaa9612	Use the column width	2018-11-19 18:02:01 +09:00
smoogipoo	52309465eb	Apply some simple fixes	2018-11-19 17:59:52 +09:00
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
smoogipoo	595e2ffbff	Unbind event when column changes	2018-11-19 16:20:21 +09:00
smoogipoo	ce956d7fd4	Fix exception when order of objects changes	2018-11-19 16:19:56 +09:00
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
jorolf	80bd98bb9d	apply suggestions	2018-11-15 17:38:38 +01:00
smoogipoo	f7fc2ca569	Basic inter-column selection movement	2018-11-15 21:37:22 +09:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
smoogipoo	eddba44d0f	Merge branch 'note-placement' into inter-column-movements	2018-11-15 20:53:57 +09:00
smoogipoo	63642586c4	Merge remote-tracking branch 'origin/master' into mania-selection-movement	2018-11-15 20:47:53 +09:00
jorolf	41a0f9896e	Merge branch 'master' into flashlight-mod	2018-11-15 00:35:42 +01:00
jorolf	7d2958b7b0	split shader, remove unnecessary clutter and fix some bugs	2018-11-15 00:33:13 +01:00
Dean Herbert	3fbabdfed2	Merge branch 'master' into notepieces	2018-11-14 17:30:39 +09:00
Dean Herbert	a1dd1057ce	Merge branch 'master' into more-global-scrollalgo	2018-11-14 17:15:24 +09:00
Dean Herbert	8b190edde0	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:32:14 +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	25101ecd2c	Snap placement blueprint to columns	2018-11-13 14:13:29 +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	8be6e351f5	Merge branch 'fix-mania-selections' into add-mania-selection-testcase	2018-11-12 17:39:58 +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	9fde7f7f44	Move scrolling info to osu.Game	2018-11-12 17:34:35 +09:00
smoogipoo	e3c60c2f96	Cleanups	2018-11-12 17:18:58 +09:00
jorolf	023924396d	Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time	2018-11-11 18:38:12 +01:00