738 Commits

Author	SHA1	Message	Date
Andrei Zavatski	62a91e4aaa	Add the ability to override Highlighted action to the ModIcon	2019-08-12 15:20:21 +03:00
Andrei Zavatski	16b6ed846f	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-08-12 14:46:24 +03:00
Dean Herbert	90b1fe81f3	Update cached usage in line with framework changes	2019-08-09 19:12:29 +09:00
Andrei Zavatski	1d42f0959a	ModIcon improvements	2019-08-07 08:46:27 +03:00
Andrei Zavatski	87974850dd	Initial implementation	2019-08-07 08:42:43 +03:00
smoogipoo	bc80fa11bb	Mode IApplicableToBeatmap application to WorkingBeatmap	2019-08-01 12:41:46 +09:00
smoogipoo	8a64ab0384	Remove generics from IApplicableToBeatmap	2019-08-01 12:39:32 +09:00
Dean Herbert	f1423b8cb5	Add more brackets	2019-07-18 00:03:04 +09:00
smoogipoo	a9286fee07	Recycle slider paths when the parenting slider dies	2019-07-17 16:20:27 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
smoogipoo	3fe61c4a7e	Trim whitespace	2019-05-10 18:48:39 +09:00
Dan Balasescu	425154c264	Merge branch 'master' into progress-bar-show-seek	2019-05-10 18:24:15 +09:00
smoogipoo	ad4b4f3422	Use nullable cancellation tokens	2019-05-10 17:42:45 +09:00
Dean Herbert	a44296a6db	Merge branch 'master' into progress-bar-show-seek	2019-05-10 17:27:49 +09:00
Dean Herbert	21ab628f41	Merge branch 'master' into player-load-cancellations	2019-05-10 16:58:36 +09:00
smoogipoo	d25d39b315	Add cancellation to storyboard/hitobject loading	2019-05-10 16:31:09 +09:00
Dean Herbert	9248e6290c	Use FrameStabilityClock to denote current position on song progress	2019-05-09 18:09:26 +09:00
Dean Herbert	3bcfc86b9c	Allow custom MaxCatchUpFrames to be specified ... Also adjusts the default to allow for smoother seeking.	2019-05-09 16:39:03 +09:00
Dean Herbert	66594b7a1b	Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start	2019-05-09 16:39:03 +09:00
smoogipoo	13b9b04bb8	Apply more cases/fix some existing ones	2019-05-07 13:23:09 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Dean Herbert	60328cf1fb	Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek	2019-04-24 15:25:53 +09:00
Dean Herbert	80e1568e97	Fix FrameStabilityContainer performing frame-stable seeks	2019-04-24 15:25:52 +09:00
smoogipoo	6c568d228f	Add comment	2019-04-23 13:45:51 +09:00
smoogipoo	6add395288	Fix gameplay cursor being hidden in tests/replays	2019-04-23 13:32:44 +09:00
Dean Herbert	908eee9942	Fix pause tests	2019-04-22 18:29:51 +09:00
smoogipoo	ac2eabc9bf	Fix replay rewinding not respecting 60fps playback	2019-04-16 17:47:00 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	7845d542e3	Cache mods as array in DrawableRuleset	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	42eaabe24c	Fix editor blueprints being misplaced ... Regressed with PlayfieldAdjustmentContainer changes.	2019-03-31 01:29:37 +09:00
Dean Herbert	6949c233bf	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 15:02:12 +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	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +09:00
Dean Herbert	ed0bf59e73	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:51:44 +09:00
Dan Balasescu	bab7d78130	Remove redundant cast ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-29 11:36:40 +09:00
Dean Herbert	785433bb74	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:25:54 +09:00
Dan Balasescu	d410054ec8	Merge branch 'master' into key-counter-display	2019-03-29 11:22:59 +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	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	3fcbc2eab3	Fix key counter getting overridden	2019-03-27 10:31:21 +09:00
Dean Herbert	15821c7511	Fix cursor adding	2019-03-26 17:04:14 +09:00
Dean Herbert	dde7788c44	Merge branch 'universal-playfield-adjust' into resume-cursor-2	2019-03-26 13:58:48 +09:00
Dean Herbert	fb302e7ad8	Remove using	2019-03-26 13:58:07 +09:00
Dean Herbert	8658de5108	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 13:52:48 +09:00
Dean Herbert	27cb4ce0d1	Remove poop	2019-03-26 13:48:35 +09:00
Dean Herbert	fbc97edc55	Add base cursor class to retrieve true visibility state	2019-03-26 13:41:30 +09:00
Dean Herbert	b4d785c76c	Don't update gameplay loop while paused	2019-03-26 13:36:17 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	b75ea295db	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 11:28:43 +09:00
Dean Herbert	82140c38fc	Apply CI fixes	2019-03-25 22:00:33 +09:00
Dean Herbert	a642f10131	Remove redundant cast	2019-03-25 21:52:01 +09:00
Dean Herbert	245f463e3f	Don't update gameplay loop while paused	2019-03-25 20:31:55 +09:00
Dean Herbert	a23dfb58ad	Add base cursor class to retrieve true visibility state	2019-03-25 20:31:55 +09:00
Dean Herbert	06d4856e17	Remove unnecessary CursorTargetContainer	2019-03-25 20:31:55 +09:00
Dean Herbert	c79d187a89	Add final osu! resume screen implementation	2019-03-25 20:31:55 +09:00
Dean Herbert	38e481686f	Make PlayfieldAdjustmentContainer universal	2019-03-25 20:31:55 +09:00
Dean Herbert	57b3b7b54b	Add back resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	a694626cc6	Add proper resume request logic	2019-03-25 20:31:55 +09:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
Dean Herbert	f43e7a880c	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 15:27:06 +09:00
Dean Herbert	c186629b8a	Reorder class	2019-03-20 14:55:38 +09:00
Dean Herbert	936c3e1ed9	Add safety type check to DrawableScrollingRuleset	2019-03-20 11:34:06 +09:00
Dean Herbert	45b8bfcfd3	Better protect not-generic DrawableRuleset	2019-03-20 11:31:03 +09:00
Dean Herbert	7b6d882ce6	Remove double-generic type	2019-03-20 11:29:16 +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
Dean Herbert	9433a97747	Add resume requesting support and fix exit scenarios	2019-03-18 20:33:43 +09:00
Dean Herbert	9ca4d9d4d1	Remove regions	2019-03-18 10:48:44 +09:00
Dean Herbert	771d676ba1	Split RulesetInputManager out to FrameStabilityContainer	2019-03-17 13:30:52 +09:00
Dean Herbert	a73e3d9700	Move cursor construction to BDL	2019-03-08 15:01:45 +09:00
Dean Herbert	2c98ba1c0c	Split out consumption and creation into two separate code paths	2019-03-08 14:59:45 +09:00
Dean Herbert	62716851a1	Revert some unnecessary changes	2019-03-06 17:41:54 +09:00
Dean Herbert	7aa30ca3f6	Change method of cursor creation	2019-03-06 17:41:54 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
Dean Herbert	558dbafb71	Use a safer method of setting the clock	2019-03-05 20:14:04 +09:00
Dean Herbert	d5943330b1	Fix potential infinite loop	2019-03-05 20:06:04 +09:00
Dean Herbert	9a9b4efb8d	Fix excess line	2019-03-05 16:41:11 +09:00
Dean Herbert	ec063a13db	Update RulesetInputManager to support new clock structure more accurately	2019-03-05 16:34:50 +09:00
Dean Herbert	01f1018d02	Tidy up clock logic using DI and a GameplayClock	2019-03-05 13:37:51 +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
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
Dean Herbert	90cae0a69c	Simplify RulesetInputManager further	2019-02-23 15:48:34 +09:00
Dean Herbert	6d3c0e3191	Holy sheet	2019-02-23 14:39:55 +09:00
Dean Herbert	0c218eb0d5	Apply new RulesetInputManager logic ... Run UpdateSubTree twice to ensure correctness	2019-02-23 14:14:41 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09: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
Dan Balasescu	c9c8cccd68	Merge branch 'master' into use-lifetime-optimization	2019-02-18 15:22:34 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
ekrctb	8955d5de04	Update hit object result when lifetime is end	2019-01-29 15:25:27 +09:00
ekrctb	504e79b968	Merge branch 'master' into use-lifetime-optimization	2019-01-29 12:15:02 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	c18ce2c23a	Formatting fixes	2019-01-23 14:51:25 +09:00
Dean Herbert	49633b3394	Fix key counter receptor getting overwritten by async load drawables	2019-01-23 14:51:25 +09:00
Dean Herbert	b6dc6c4a74	Merge branch 'master' into do_not_use_local_user_for_autoplay_score	2019-01-04 13:11:17 +09:00
Dean Herbert	ef9d93ff6b	Remove mod multipliers ... We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.	2018-12-20 19:46:39 +09:00
Dean Herbert	d3368df94d	Simplify changes to RulesetContainer	2018-12-20 19:35:32 +09:00
ekrctb	6f8a2e6ff2	Use LifetimeManagementContainer ... This is a significant performance boost for gameplay, especially for long or stroyboard-heavy maps.	2018-12-13 15:23:06 +09:00
Dean Herbert	7d9cdf6f81	Remove unnecessary private field	2018-12-07 20:13:03 +09:00
WebFreak001	3cb91979bd	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2	2018-12-06 12:14:48 +01:00
Roman Kapustin	c6c255718b	Handle ModAutoplay during score construction in the Player	2018-12-03 22:37:26 +03:00
Dean Herbert	271dcded3c	Merge branch 'master' into scoredatabase	2018-11-30 14:59:58 +09:00
smoogipoo	2ee181daf7	Re-namespace replay-related classes	2018-11-28 17:20:37 +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	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	595e2ffbff	Unbind event when column changes	2018-11-19 16:20:21 +09:00
Dean Herbert	2ae139d260	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:54:53 +09:00
smoogipoo	2c277545e0	Merge branch 'add-mania-selection-testcase' into mania-selection-movement	2018-11-13 15:40:51 +09:00
smoogipoo	b9b20607af	Add IScrollAlgorithm.TimeAt()	2018-11-12 17:43:22 +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	33056b8098	Adjust namespaces	2018-11-08 14:04:21 +09:00
smoogipoo	f66a9f4f1e	Rename IScrollChangeVisualiser -> IScrollAlgorithm	2018-11-08 14:04:21 +09:00
smoogipoo	2f87f267a3	Fix height being set instead of width	2018-11-08 14:04:20 +09:00
smoogipoo	195f82fa96	Give visualiser methods range+length params again	2018-11-08 14:04:20 +09:00
smoogipoo	f41bfd14ca	Add some xmldocs	2018-11-08 14:04:20 +09:00
smoogipoo	76ea314c27	Reorder params	2018-11-08 14:04:20 +09:00
smoogipoo	589c3a47e2	Remove state computation + updates from ISpeedChangeVisualiser	2018-11-08 14:04:20 +09:00
smoogipoo	0bdeebbce2	Expose basic values from ISpeedChangeVisualiser	2018-11-08 14:04:20 +09:00
Dean Herbert	b28c0cd128	Merge branch 'master' into editor-mask-placement	2018-10-31 06:46:48 +09:00
Kyle Chang	6d00aff9fd	Add type parameter to IApplicableToBeatmap	2018-10-30 00:13:33 -04:00
Kyle Chang	df6fc4013a	Add interface to adjust Beatmaps	2018-10-28 02:21:25 -04:00
WebFreak001	3b08ad0742	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 ... Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds handles the restrictTo parameter.	2018-10-27 16:34:48 +02:00
smoogipoo	d36ac59ca2	Reduce complexity of creating edit ruleset containers	2018-10-17 18:06:00 +09:00
smoogipoo	70f1d17b7e	Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2018-10-16 17:28:16 +09:00
Dean Herbert	468f7fd1ea	Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework	2018-10-12 19:25:08 +09:00
Dean Herbert	ad42f2244d	Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer	2018-10-12 19:15:11 +09:00
Jan Jurzitza	460c943958	Merge branch 'master' into mod-fl2	2018-10-12 11:44:55 +02:00
Dean Herbert	1de770e093	Merge branch 'master' into fix-sv	2018-10-12 18:13:50 +09:00
Dean Herbert	e0a8157d92	Merge branch 'master' into mod-fl2	2018-10-10 19:48:46 +09:00
Dean Herbert	841b2e8692	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
Dean Herbert	06ea174f34	Merge branch 'master' into fix-sv	2018-10-09 18:00:34 +09:00
smoogipoo	ff559a3a1b	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-10-05 10:40:16 +09:00
ekrctb	b9d0fc927b	Remove duplicated code	2018-10-04 18:03:34 +09:00
Dean Herbert	593dee202c	Fix gameplay mouse button disable setting no longer having any effect ... Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)	2018-10-04 03:07:00 +09:00
smoogipoo	540a010fbb	Implement an intermediary EditRulesetContainer	2018-10-03 15:36:24 +09:00
ekrctb	b7a2ad1aa5	Use UIEvent level getters for modifier keys.	2018-10-02 13:26:36 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
smoogipoo	b68eeae777	Fix scrolling rulesets not accounting for slider multiplier	2018-10-01 18:12:30 +09:00
Hanamuke	6c1b3cf1a5	Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch	2018-09-30 16:09:27 +02:00
Hanamuke	b983e20067	Merge branch 'master' into AR_Catch	2018-09-30 16:01:55 +02:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
smoogipoo	826dc6ceb7	Make Playfield not a ScalableContainer	2018-09-21 14:02:32 +09:00
Dan Balasescu	4b907336c5	Move readonly field above ctor	2018-09-20 13:17:17 +09:00
Hanamuke	309d8c8cb4	CI	2018-09-19 18:43:39 +02:00
Hanamuke	e7d78b94ae	Remove ScrollingVisualisation from settings	2018-09-19 18:30:25 +02:00
ekrctb	a3e6973b41	Replace usage of now removed TriggerKeyPress and similar methods.	2018-09-19 11:36:55 +09:00
ekrctb	c8e9d9375f	Use new InputStateChangeEvent for RulesetInputManager	2018-09-19 11:36:55 +09:00
Hanamuke	6d229716e7	Remove unused using directives	2018-09-18 20:42:55 +02:00
Hanamuke	2afcdb1451	Add the file	2018-09-18 20:23:25 +02:00
Hanamuke	e3cc25a96a	Implement ConstantScrollingSpeedVisualiser	2018-09-18 20:21:10 +02:00
WebFreak001	5f3c0549c9	Sprites in blinds mod & gameplay improvements ... There are now skinnable actual blinds (shoji screen panels) The black overlay is still behind them to avoid cheating with skins The blinds don't open linearly anymore, they are health squared now When easy mod is on, there is always a little gap open	2018-09-15 23:44:22 +02:00
WebFreak001	040a44d42c	Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2	2018-09-15 20:12:06 +02:00
Joehu	f99eff1192	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Dean Herbert	68a79f895a	Fix mania throwing an exception on start of map	2018-08-30 14:58:00 +09:00
smoogipoo	fcf98390f5	Cleanup	2018-08-21 12:10:00 +09:00
Dean Herbert	ff0dfa7acf	Merge branch 'master' into relax	2018-08-16 17:36:24 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
smoogipoo	2a54b5b78d	ResetResult -> RevertResult	2018-08-06 12:29:22 +09:00
smoogipoo	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
Dean Herbert	0c920fe486	Merge branch 'master' into mania-mask-container	2018-08-06 04:22:21 +09:00
WebFreak001	b011edd85d	added Overlays container to RulesetContainer ... this is required for mods such as flashlight which always want to draw objects above hitcircles. If just adding children to a RulesetContainer the hit circles would always be above the added children (no matter the Depth).	2018-08-05 13:12:31 +02:00
tgi74000	07d6a75e23	Rename variables to be human readable	2018-08-04 00:18:09 +02:00
tgi74000	7310c38df9	Add relax mod	2018-08-03 14:03:11 +02:00
smoogipoo	3619290c34	Split out judgement definition from judgement result	2018-08-02 20:35:54 +09:00
Dean Herbert	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Dean Herbert	aead4be134	Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container	2018-07-23 06:36:10 +02:00
Dean Herbert	d868d81b59	Merge branch 'master' into centralise-judgement-display	2018-07-23 02:58:49 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	3fc7f33e90	Merge branch 'master' into centralise-judgement-display	2018-07-20 17:29:15 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
Dean Herbert	c2cdf12986	Better pause logic	2018-07-18 19:59:04 +09:00
smoogipoo	6437fdd9db	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-07-17 16:46:48 +09:00
smoogipoo	3905a9105c	Add a playfield method to retrieve all hitobjects	2018-07-17 15:51:10 +09:00
smoogipoo	48190e3b5a	Make NestedPlayfields non-null	2018-07-17 15:48:51 +09:00
Dean Herbert	569d0f7993	Merge branch 'master' into scrolldirection-cleanup	2018-07-17 15:39:13 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	b967fe714b	Fix lead-in time now being long enough in many cases	2018-07-17 14:29:22 +09:00
Dean Herbert	24054246b8	Fix DI regression	2018-07-11 17:54:01 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
ekrctb	d71b61c122	Rewrite disable mouse buttons logic	2018-07-03 20:04:15 +09:00
Dean Herbert	1e1ff8339e	Merge branch 'master' into non-null-nestedobjects	2018-07-03 19:43:46 +09:00
smoogipoo	f0ec117bcb	Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds ... # Conflicts: # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-07-02 17:21:18 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
Dean Herbert	594cc0d21d	Merge branch 'master' into mania-playfield-inversions	2018-06-25 18:36:23 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dean Herbert	57011ff13b	Merge branch 'master' into mania-playfield-inversions	2018-06-15 18:33:40 +09:00
Dan Balasescu	0e0e64895a	Merge branch 'master' into mania-step-interval	2018-06-13 13:55:27 +09:00
Dean Herbert	bcfb092e53	Change step to 200	2018-06-12 18:03:45 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	563a2667d3	Merge branch 'ruleset-configs' into mania-playfield-inversions	2018-06-11 15:08:48 +09:00
smoogipoo	14b7530994	Use a global ruleset config cache	2018-06-11 15:07:42 +09:00
smoogipoo	be01dbae3a	Move ruleset dependency caching to CreateLocalDependencies ... In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.	2018-06-11 15:07:29 +09:00
smoogipoo	f49b7d6e16	Add mania direction to settings	2018-06-11 14:36:19 +09:00
smoogipoo	93696fb5e5	Merge branch 'ruleset-configs' into mania-playfield-inversions ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-06-11 13:46:39 +09:00
smoogipoo	4fb6a8627e	Merge remote-tracking branch 'origin/master' into mania-playfield-inversions	2018-06-11 13:45:47 +09:00
smoogipoo	eca016ec6c	Move ruleset config managers to Ruleset	2018-06-11 13:17:08 +09:00
smoogipoo	63ec36b3be	Explicitly handle null settings case + add annotations	2018-06-11 12:57:56 +09:00
smoogipoo	b219c17115	Move dependency creation under ctor	2018-06-11 12:57:26 +09:00
Dean Herbert	9bdb3113ce	Revert "Always update children when ruleset input manager is updated" ... This reverts commit 4eb7a34944.	2018-06-08 21:05:28 +09:00
smoogipoo	2a48e0e44a	Fix sequential speed change visualiser not working with 0 control points	2018-06-08 15:11:43 +09:00
smoogipoo	55a5dfa9b6	Add column testcase	2018-06-07 20:24:33 +09:00
Dean Herbert	5e9a1961cb	Greatly increase the playfield scroll speed adjust step ... It was so small previously that I believe many people didn't even realise it was working.	2018-06-07 14:35:33 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
Dean Herbert	d3cd267036	Formatting fixes	2018-06-06 14:20:51 +09:00
Dean Herbert	ee92986494	Merge branch 'master' into osu-hd-setting	2018-06-06 12:09:12 +09:00
smoogipoo	4eb7a34944	Always update children when ruleset input manager is updated	2018-05-31 18:02:10 +09:00
Dean Herbert	7f0cb0bbf6	Add key bindings for scroll speed ... Closes #2689. - [ ] Depends on ppy/osu-framework#1569 being fixed.	2018-05-31 12:10:53 +09:00
Dean Herbert	5ec349de78	Reorder methods and remove useless comments	2018-05-21 15:59:33 +09:00
Dean Herbert	f53164843d	Reduce spacing changes	2018-05-21 15:56:02 +09:00
Vidalee	2492e34d3f	resolving codefactor styling issues	2018-05-17 19:44:09 +02:00
Vidalee	6a1abf4084	Merge branch 'master' into osu-hd-setting	2018-05-17 19:39:17 +02:00
smoogipoo	397d93660a	Don't deep-clone beatmapinfo/control points	2018-05-17 13:17:33 +09:00
Dean Herbert	8a6ef0dabb	Merge branch 'master' into beatmap-conversion-rework	2018-05-10 19:10:07 +08:00
smoogipoo	db3e48c194	Rename GetBeatmap() to GetPlayableBeatmap()	2018-05-07 10:40:30 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	77e661489d	Merge branch 'i-beatmap' into beatmap-conversion-rework	2018-05-07 10:00:24 +09:00
Vidalee	c4e45e30ef	Solving conflict	2018-05-06 13:18:12 +02:00
Vidalee	d36d9643eb	Missed one white space.. I guess my editor wasn't properly configured ... for this file	2018-05-06 13:09:46 +02:00
Vidalee	af85102277	Should be ok now	2018-05-06 13:04:20 +02:00
Vidalee	008daf9a07	White space trimmed	2018-05-06 12:57:52 +02:00
Vidalee	095f6e1530	Code sanity	2018-05-06 12:49:15 +02:00
Vidalee	393c01ba90	Made the changes requested	2018-05-06 12:38:25 +02:00
smoogipoo	2d6b2d10f7	Use bindable transforms	2018-05-02 18:26:23 +09:00
Dean Herbert	76e58a51b9	Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting	2018-04-25 17:28:21 +09:00
smoogipoo	11b943c820	ComputePositions -> UpdatePositions	2018-04-20 14:22:48 +09:00
smoogipoo	52e3ffff30	Add some more commenting to lifetime calculation	2018-04-20 14:20:16 +09:00
smoogipoo	f3fddcc82c	Reorder parameter for consistency	2018-04-20 14:20:04 +09:00
smoogipoo	48b421b4b4	Add comments to SequentialSpeedChangeVisualiser	2018-04-20 14:16:30 +09:00
smoogipoo	1bab601cbc	Comments + xmldocs	2018-04-20 13:51:36 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
smoogipoo	ea0683adb2	Fix hitobject lengths not being calculated for overlapping speed changes ... Fixes #2359	2018-04-16 20:34:59 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	551ba6ac4b	Fix ScalableContainer irrepairably altering content size	2018-04-02 13:06:06 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Vidalee	92b47d87ba	makes more sense but not fixed	2018-03-14 23:14:03 +01:00
Vidalee	6d9e78a3a3	Review changes	2018-03-11 22:40:49 +01:00
Vidalee	802a6870c4	Chesterton's fence	2018-03-11 22:09:16 +01:00
Vidalee	ea6434a7a0	Why this line got deleted 🤔	2018-03-11 21:19:34 +01:00
Vidalee	eed0f3a1de	Added setting to not hide the first object in Hidden mod	2018-03-11 21:02:14 +01:00
Dean Herbert	b62ed004f2	Remove judgements when deciding a new judgement for a HitObject ... Generally happens when rewinding.	2018-03-07 19:14:42 +09:00
smoogipoo	2a9fb2c2c6	Make NestedHitObjects lazily-constructed	2018-03-05 21:40:26 +09:00
Dean Herbert	2003887cc8	Merge branch 'master' into clock-fixes	2018-03-05 17:45:08 +09:00
Dean Herbert	bd510e5356	Merge remote-tracking branch 'upstream/master' into clock-fixes	2018-03-02 21:01:53 +09:00
Dean Herbert	c54c1699bf	Merge branch 'master' into ruleset-replayframes	2018-03-01 22:26:16 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
Dean Herbert	01fcf9c813	Update in line with framework changes	2018-02-28 22:01:48 +09:00
Dean Herbert	cff17f1864	Update in line with inverse ShoudProcessClock default	2018-02-27 17:23:38 +09:00
Dean Herbert	73fb185132	Change the way ShouldProcessClock is specified in line with framework changes	2018-02-27 17:23:38 +09:00
smoogipoo	d72290ee24	Make ScaledContainer private	2018-02-23 15:06:08 +09:00
Dean Herbert	a3336f2577	Merge branch 'master' into fix-editor-osu-scale	2018-02-22 14:14:41 +09:00
smoogipoo	5faec5c2f1	Add a separate property to control playfield area	2018-02-21 20:54:33 +09:00
smoogipoo	6757be2007	Fix incorrect RelativeChildSize in Catch	2018-02-21 20:15:51 +09:00
smoogipoo	7fd7dc1538	Extract playfield scaling into a separate class ... And make it more general.	2018-02-21 11:07:42 +09:00
smoogipoo	b7be162f28	Remove AspectAdjust property (override GetAspectAdjustedSize instead)	2018-02-19 17:05:10 +09:00
smoogipoo	cd2c9a9de6	Adjust xmldoc and rename to GetAspectAdjustedSize	2018-02-19 17:04:18 +09:00
smoogipoo	77149b00ce	Merge branch 'codestyle-fixes' into update-branch	2018-02-08 23:47:31 +09:00
smoogipoo	4699b5ad7c	Fix a few code styling issues ... These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).	2018-02-08 23:47:03 +09:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
smoogipoo	75858bd3de	Update in-line with framework changes	2018-02-02 15:41:54 +09:00
Dean Herbert	9d4ec6f8b5	Merge branch 'master' into ismaskedaway-input-fix	2018-02-01 19:29:10 +09:00
smoogipoo	1b99e54005	Fix IsMaskedAway not being up-to-date when fastfowarding replays	2018-02-01 15:21:23 +09:00
Dean Herbert	cd37be9440	Merge branch 'master' into better-slider-objects	2018-02-01 08:39:39 +09:00
Dean Herbert	888d2362fd	Merge branch 'master' into fix-taiko-fastforwarding	2018-01-31 18:30:15 +09:00
smoogipoo	c97ea3ed60	Post-process beatmap before applying defaults	2018-01-30 15:49:55 +09:00
smoogipoo	ef3fb8c05a	InputManager -> Container where KeyBindings are involved	2018-01-30 14:49:12 +09:00
Dean Herbert	03154dbc63	Fix incorrect initial migration ... Also adds variant to settings	2018-01-25 23:41:03 +09:00
smoogipoo	57cd50c45e	Reorder the way input is handled for replays ... Fixes https://github.com/ppy/osu/issues/1625 .	2018-01-25 17:39:50 +09:00
Dean Herbert	5a00ae36d1	Add database-based configuration for rulesets	2018-01-24 17:45:28 +09:00
Dean Herbert	b197cd56af	Allow DI'd OnScreenDisplay to be null	2018-01-23 16:42:31 +09:00
Dean Herbert	c01f67b0d8	Merge remote-tracking branch 'upstream/master' into ruleset-configs	2018-01-23 16:23:25 +09:00
smoogipoo	c1331cef1b	Disallow DualStages for non-converted beatmaps	2018-01-22 15:52:54 +09:00
smoogipoo	9ac035f3d5	Merge branch 'bdl-cache-changes' into ruleset-configs	2018-01-22 13:11:45 +09:00
為什麼	feb79ff9e7	Merge branch 'master' into mania_stage_fix	2018-01-19 20:08:24 +08:00
smoogipoo	a94ea7025e	Register/Unregister -> BeginTracking/StopTracking and add exceptions	2018-01-18 18:45:48 +09:00
smoogipoo	dee298c395	No more statics + better unregistration	2018-01-18 17:40:05 +09:00