1810 Commits

Author	SHA1	Message	Date
Dean Herbert	aca9289d89	Use SkinnableSprite for approach circle	2019-06-24 15:17:56 +09:00
Shane Woolcock	17d103181c	Merge branch 'master' into android	2019-06-18 20:05:14 +09:30
Dean Herbert	b29b1bf254	Merge branch 'master' into mod-grow-improvement	2019-06-12 13:18:02 +09:00
Dean Herbert	00ee45fe46	Merge remote-tracking branch 'origin/update-visibility-container' into update-framework	2019-06-11 19:36:13 +09:00
Dean Herbert	d2e42b38fc	Merge remote-tracking branch 'smoogipoo/cursortrail-vertexbatch' into update-framework	2019-06-11 19:25:25 +09:00
Dean Herbert	5c2c4f0ada	Merge pull request #4878 from HoLLy-HaCKeR/expose-skills ... Expose skills in DifficultyAttributes	2019-06-11 18:47:56 +09:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
smoogipoo	2b768bef96	Make CursorTrail use VertexBatch	2019-06-10 20:29:01 +09:00
Albert Tang	62639d347f	Merge branch 'master' into android	2019-06-09 21:03:48 -05:00
Dean Herbert	8cdcf251b5	Make local bindable private	2019-06-09 16:30:04 +09:00
Ganendra Afrasya	afc3a08953	Use existing setting instead ... Now it read IncreaseFirstObjectVisibility bindable instead	2019-06-09 13:11:40 +07:00
Ganendra Afrasya	8ac64b5c16	Make first object not applying custom state	2019-06-08 01:46:05 +07:00
Dean Herbert	ff6943e170	Merge branch 'master' into fix-cursor	2019-06-07 10:43:21 +09:00
David Zhao	e2118299e9	update comment	2019-06-07 10:36:36 +09:00
David Zhao	ac9a3e54a6	Fix cursor issue with stopped gameplay clock	2019-06-06 18:12:59 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
smoogipoo	ae438213a5	Remove secondary buffered container from slider body	2019-06-06 16:32:43 +09:00
HoLLy	7e9f5a0939	Add Skills to DifficultyAttributes	2019-05-29 11:22:51 +02:00
tangalbert919	07e550a950	Merge branch 'master' into android	2019-05-28 09:08:44 -05:00
Tav TaOr	7575af6f42	Merged master into autopilot	2019-05-17 14:15:30 +03:00
Tav TaOr	7c50bdd173	Removed redundant parentheses.	2019-05-15 23:48:37 +03:00
smoogipoo	cbf662eb56	Remove redundant else statement	2019-05-15 10:55:02 +09:00
Alten	37ec722a1d	Shorten code	2019-05-14 16:18:46 -04:00
Alten	ad5ad8ccb5	Fix hard crash	2019-05-13 23:29:24 -04:00
Dean Herbert	be6da833f8	Move constant local (and break line)	2019-05-14 11:11:57 +09:00
HoLLy	1809c996bb	Use Interpolation.ValueAt instead of manually interpolating FL position.	2019-05-13 12:09:19 +02:00
HoLLy	f7806bc205	Add smoothing to flashlight movement	2019-05-13 01:33:41 +02:00
Dean Herbert	daa2786dbd	Use a constant for the default value	2019-05-12 23:08:42 +09:00
Dean Herbert	487a56549e	Fix CI issues	2019-05-12 22:53:12 +09:00
Dean Herbert	ce0e4c506e	Merge branch 'master' into dev	2019-05-12 21:45:52 +09:00
Tav TaOr	2051be7453	Minor changes to pass the AppVeyor test	2019-05-12 15:00:59 +03:00
Tav TaOr	d229fed128	Implemented Autopilot	2019-05-12 14:00:43 +03:00
Tav TaOr	9170da46ff	Merge remote-tracking branch 'upstream/master'	2019-05-12 13:08:07 +03:00
Dean Herbert	b8446fb67f	Fix fallbacks for SliderTrackOverride and SliderBall too	2019-05-12 18:51:31 +09:00
Dean Herbert	cbf126db25	Merge branch 'master' into fix-slider-border-color	2019-05-12 17:25:49 +09:00
Tav TaOr	bda0b35d84	Slight formating change.	2019-05-10 19:46:13 +03:00
Tav TaOr	023a5c6e4f	Add the ability to ignore the user's mouse movement.	2019-05-10 19:12:32 +03:00
tangalbert919	6fd1eb5e08	Merge remote-tracking branch 'upstream/master' into android	2019-05-08 08:15:03 -05:00
smoogipoo	117f8bdd01	Merge remote-tracking branch 'Joehuu/master' into flashlight-dim	2019-05-08 13:25:01 +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
David Zhao	732b0b22a3	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-05-07 12:04:58 +09:00
Joehu	8ef6a745f7	Fix slider border not reverting to default color	2019-05-05 22:43:03 -07:00
iiSaLMaN	3b03ca802a	Merge branch 'master' into sh-xh-grading-2	2019-04-30 18:55:35 +03:00
Dean Herbert	db75516e79	Merge branch 'master' into fix-lead-in-issues	2019-04-27 21:01:21 +09:00
Dean Herbert	27c1c368ac	Remove unused using	2019-04-27 20:42:07 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
KingLuigi4932	4e0f21102b	Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2	2019-04-25 14:04:12 +03:00
KingLuigi4932	c6b3197dd0	Add AdjustRank and use it in Hidden Mod	2019-04-25 13:56:57 +03:00
David Zhao	90d5c64cf3	Remove unused usings	2019-04-24 18:47:00 +09:00
David Zhao	8f101e4f60	Remove unnecessary multi-slider tracking logic	2019-04-24 18:25:38 +09:00
Dean Herbert	4f31eee5ad	Merge branch 'master' into flashlight-dim	2019-04-24 17:01:11 +09:00
Dean Herbert	67382724f6	Reword and reoganise logic	2019-04-24 16:58:13 +09:00
Dean Herbert	e69963e60e	Ensure there is enough time before the first object in osu! (roughly following osu-stable specs)	2019-04-24 15:28:14 +09:00
David Zhao	9890884726	Remove fade in, update comment	2019-04-23 14:23:09 +09:00
smoogipoo	aeae759fcd	Rename method + add xmldoc	2019-04-22 18:08:15 +09:00
smoogipoo	4edb17a88a	Make hp work + cleanup	2019-04-22 18:02:49 +09:00
smoogipoo	144e6012dc	Implement hp increase for osu!	2019-04-22 17:24:42 +09:00
David Zhao	3c252d79ea	Use var, rework dim application logic	2019-04-22 15:59:47 +09:00
iiSaLMaN	59da78b0d4	nothing.	2019-04-20 06:44:59 +03:00
iiSaLMaN	8e485f3283	Fix issue	2019-04-20 06:41:09 +03:00
Dean Herbert	879f6152b0	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-04-17 22:17:10 +08:00
David Zhao	d9ed68b189	Add short fade to flashlight dimming	2019-04-12 15:33:31 +09:00
David Zhao	846a4835ca	Invert flashlight dim	2019-04-12 11:23:40 +09:00
David Zhao	664a4ba540	Implement flashlight dimming on slider slide	2019-04-12 10:47:22 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	0603ed9ab7	Fix post-merge errors	2019-04-09 16:27:10 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
Dean Herbert	9802d8ab11	Rename setting	2019-04-04 17:18:53 +09:00
Dean Herbert	d54750aa37	Remove incorrect class	2019-04-04 17:10:29 +09:00
Dean Herbert	109f577b59	Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail	2019-04-04 17:09:38 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
smoogipoo	d8af5e1c5a	Update in-line with drawnode changes	2019-04-02 11:56:22 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	2060bad3bc	Try applying minimal inspection fixes for latest Rider EAP	2019-04-01 13:28:14 +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	7d6a08d6da	Fix a few new inspections in latest Rider EAP	2019-04-01 11:39:02 +09:00
Dean Herbert	79b5c2482b	Merge pull request #4562 from peppy/fix-editor-blueprints ... Fix editor blueprints being misplaced	2019-04-01 11:17:17 +09:00
Dean Herbert	d53e6f7e0e	Remove unused references	2019-03-31 01:34:50 +09:00
Dean Herbert	5d91c3bcfc	Fix replay handler nullref crashes	2019-03-31 01:33:56 +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	3e8952b087	Merge pull request #4521 from peppy/hitobject-drawable-representation ... Fix DrawableRuleset drawable creation method's name	2019-03-29 14:08:23 +09:00
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	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +09:00
Dean Herbert	1e369628a5	Fix incorrect type specification	2019-03-29 11:38:45 +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
Dan Balasescu	772f0cac8a	Merge branch 'master' into gameplay-cursor-last-state	2019-03-29 11:01:13 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	d770dac3bc	Fix interpolation nullrefs	2019-03-29 00:35:26 +09:00
Dean Herbert	6e41506766	Merge remote-tracking branch 'upstream/master' into framed-replay-handler-fixes	2019-03-29 00:32:03 +09:00
Dean Herbert	176b4ecc38	Merge branch 'master' into sprite-icon-compatibility	2019-03-28 23:47:44 +09:00
Dean Herbert	70f99400ad	Fix many behavioural issues and add tests	2019-03-28 19:28:13 +09:00
Dean Herbert	148e26a6d4	Fix FramedReplayInputHandler starting at frame 0 when it shouldn't	2019-03-28 12:42:57 +09:00
Dean Herbert	8f5e769425	Fix slider ball not always receiving position in time	2019-03-28 12:42:28 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	7cfc2f7dcb	Add back adjustment container	2019-03-26 17:11: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	2951d3e0e4	Apply CI fixes	2019-03-26 13:50:30 +09:00
Dean Herbert	fbc97edc55	Add base cursor class to retrieve true visibility state	2019-03-26 13:41:30 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	82140c38fc	Apply CI fixes	2019-03-25 22:00:33 +09:00
Dean Herbert	a23dfb58ad	Add base cursor class to retrieve true visibility state	2019-03-25 20:31:55 +09:00
Dean Herbert	9588944048	Fix multiple cursors appearing	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	650a5c993a	Add test	2019-03-25 20:31:55 +09:00
Dean Herbert	8ad4009c33	osu! resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	bc16a82494	Move osu! cursor to its own class	2019-03-25 14:19:38 +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	7254b765b0	Fix gameplay cursor showing in editor	2019-03-20 19:26:24 +09: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
Santeri Nogelainen	b624ecabde	Max = 8	2019-03-16 12:47:37 +02:00
Santeri Nogelainen	cbb7498a42	Border size to float, add min and max size, other small changes	2019-03-16 12:41:03 +02:00
Santeri Nogelainen	92595e43f6	slider border thickness	2019-03-14 21:57:39 +02:00
Jamie Taylor	5cc670cd19	Prevent ApplyTransformsAt from propogating to SliderBall children	2019-03-14 19:17:28 +09:00
Dean Herbert	1617e2a729	Merge branch 'master' into mania-judgemetns	2019-03-13 18:17:42 +09:00
David Zhao	527b77b07d	Make all inheritors of drawablejudgement use new method	2019-03-12 19:52:44 +09:00
Dean Herbert	63fea65c0c	Clarify repeat index	2019-03-11 14:53:21 +09:00
Dean Herbert	489153579a	Add xmldoc and clarify struct variables	2019-03-11 14:36:29 +09:00
Albert Tang	7f30fce3fe	Merge branch 'master' into android	2019-03-08 10:39:24 -06:00
Dean Herbert	c6194d5487	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:40:03 +09:00
Dean Herbert	48e54c84c1	Merge branch 'master' into mod-wind	2019-03-08 20:23:02 +09:00
Dean Herbert	28a1baa07e	Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation	2019-03-08 20:13:58 +09:00
Dean Herbert	93a999396e	LegacyFinalTick -> LegacyLastTick to match existing variable	2019-03-08 20:13:11 +09:00
Dean Herbert	165a353a83	Add extensive commenting about LegacyLastTick usage	2019-03-08 20:12:48 +09:00
Dean Herbert	f59b9e933e	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:00:12 +09:00
Dean Herbert	355705f0a5	Fix legacy tick handling	2019-03-08 19:57:30 +09:00
Dean Herbert	973f29b765	Apply review	2019-03-08 15:14:57 +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	3ccc76e18f	Merge remote-tracking branch 'upstream/master' into cursor-in-playfield	2019-03-08 14:50:46 +09:00
Dean Herbert	551380dd42	Extract slider tick creation so it can be shared with osu!catch	2019-03-08 14:46:26 +09:00
Dan Balasescu	d1c18c52ab	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-08 12:43:57 +09:00
Dan Balasescu	101009c92e	Merge branch 'master' into fix-autoplay-tests	2019-03-08 12:14:40 +09:00
Dean Herbert	340997f505	Rename remaining usage of PathWidth naming convention	2019-03-07 20:21:59 +09:00
Dean Herbert	5ab9f45a8f	Merge branch 'drawnode-changes'	2019-03-07 20:10:42 +09:00
Dean Herbert	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
smoogipoo	e430b8a640	Merge remote-tracking branch 'nekodex/master' into drawnode-changes	2019-03-07 18:15:12 +09:00
David Zhao	b3e046c4d1	Rename PathWidth to PathRadius	2019-03-07 17:39:19 +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	18826b3a59	Adjust cursor scale for its new surroundings	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	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
Dean Herbert	fc0b297232	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-05 18:06:24 +09:00
smoogipoo	0322bd8812	Make config nullable, removing testcase code	2019-03-05 14:40:27 +09: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	bf8360636a	Adjust drawnodes to use the new shared data structure	2019-03-01 17:25:15 +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
smoogipoo	c13a5184f3	Add more explanation	2019-02-27 16:35:11 +09:00
smoogipoo	32bf940aa5	Adjust comment for readability	2019-02-27 15:43:20 +09:00
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
smoogipoo	d06f38b3f3	Cleanup	2019-02-25 15:57:07 +09:00
Dean Herbert	7f5780c615	Simplify SliderBall and fix incorrect key up handling ... Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.	2019-02-23 14:38:53 +09:00
Dan Balasescu	5fdd7f9bff	Fix typo in comment ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-23 14:14:34 +09:00
Dean Herbert	3a57ff40cd	Add comment about other cases, rewind handling	2019-02-23 14:14:34 +09:00
Dean Herbert	8e52e2330e	Add extensive commenting	2019-02-23 14:14:34 +09:00
Dean Herbert	1c75ee4e82	Add fixes	2019-02-23 14:14:34 +09:00
Dean Herbert	7566fcf536	Slider press fix	2019-02-23 14:14:34 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
smoogipoo	d61dfe888e	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +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
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
Dean Herbert	c96a2ac853	Fix non-conforming filename	2019-02-20 21:08:52 +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
smoogipoo	0380293098	Add beatmap argument	2019-02-19 17:58:02 +09:00
smoogipoo	21f9c813b2	Fix mods not being populated	2019-02-19 17:46:18 +09:00
smoogipoo	8459cf6ed0	Missed argument	2019-02-19 17:43:12 +09:00
smoogipoo	f19a52b960	Rename argument	2019-02-19 17:40:35 +09:00
smoogipoo	37f9ac6eca	Populate mods too	2019-02-19 17:39:30 +09:00
smoogipoo	847f7d8658	Adjust with PopulateAttributes() removal	2019-02-19 17:38:33 +09:00
Dean Herbert	9a60f3b0de	Merge branch 'master' into new-diffcalc-osu	2019-02-19 15:56:12 +09:00
Dean Herbert	151388dfad	Merge branch 'master' into diffcalc-merging-2	2019-02-19 15:42:15 +09:00
smoogipoo	ade5763160	Fix post-merge errors	2019-02-19 14:34:02 +09:00
smoogipoo	93b7b51d0a	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
Dan Balasescu	b1bdab8c36	Merge branch 'master' into mod-grow	2019-02-18 16:47:16 +09:00
Dan Balasescu	c9c8cccd68	Merge branch 'master' into use-lifetime-optimization	2019-02-18 15:22:34 +09:00
smoogipoo	659ec267b6	Fix spinners increasing strain	2019-02-18 14:58:33 +09:00
smoogipoo	c930cc5fb5	Fix incorrect OsuDifficultyHitObject instantiation	2019-02-18 14:58:13 +09:00
smoogipoo	fd70269021	Implement new difficulty calculator for Rulesets.Osu	2019-02-18 14:58:03 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
Dean Herbert	42dc7644f2	Merge branch 'master' into diffcalc-testcases	2019-02-17 21:06:42 +09:00
smoogipoo	8becd7ff92	Add a slider-spinner test case	2019-02-15 12:49:48 +09:00
Dean Herbert	810175235d	Fix incorrect application of scaling in some cases ... Isolates different usages of hitcircle scale so they can't ever cause regressions.	2019-02-14 18:47:05 +09:00
Dean Herbert	1b61ec4ef4	First pass clean-up	2019-02-14 18:05:23 +09:00
Dean Herbert	d366370113	Merge branch 'master' into mod-grow	2019-02-14 17:44:45 +09:00
smoogipoo	f50a0be29d	Add osu! difficulty calculator test	2019-02-14 16:22:14 +09:00
tangalbert919	7349a6c527	Merge remote-tracking branch 'upstream/master' into android	2019-02-12 20:41:54 -06:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
Dean Herbert	5b1f111922	Rollback other fallthrough regressions	2019-02-05 18:14:43 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
Dan Balasescu	40e4a3f725	Merge branch 'master' into fix-replay-import-statistics	2019-02-04 15:32:29 +09:00
Kyle Chang	cf91b882c8	Fix slider tail evaluation in osu difficulty calculator ... The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position.	2019-02-03 23:49:05 -05:00
Dean Herbert	2d7c23dd9f	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-02-04 12:15:53 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
tangalbert919	52110e5dc0	Merge remote-tracking branch 'upstream/master' into android	2019-01-31 11:19:03 -06:00
Dean Herbert	cea82708ee	Merge branch 'master' into use-lifetime-optimization	2019-01-31 20:20:40 +09:00
LeNitrous	7e2f4af00d	remove whitespaces	2019-01-31 17:58:09 +08:00
LeNitrous	a8d30f6aee	remove unused using	2019-01-31 17:05:50 +08:00
LeNitrous	902be0d059	add grow mod	2019-01-31 17:03:43 +08:00
smoogipoo	581544e1d6	Fix TD mod not being ranked	2019-01-31 11:59:36 +09:00
smoogipoo	e9ddf232f0	Add touchdevice mod to performance calculation	2019-01-31 11:51:40 +09:00
tangalbert919	80006109a2	Merge remote-tracking branch 'upstream/master' into android	2019-01-29 18:13:43 -06:00
Dean Herbert	8d4232af45	Formatting and minor optimisations	2019-01-29 16:35:20 +09:00
Dean Herbert	18512458e8	Merge branch 'master' into xexxar-angles	2019-01-29 15:59:04 +09:00
ekrctb	504e79b968	Merge branch 'master' into use-lifetime-optimization	2019-01-29 12:15:02 +09:00
Nitrous	ea4e79751e	Merge branch 'master' into mod-wind	2019-01-28 17:48:57 +08:00
Dean Herbert	354a99f5e1	Merge branch 'master' into samah-ios	2019-01-28 15:34:46 +09:00
ProgrammaticNajel	2058604ef3	Typo fix	2019-01-26 23:10:13 +08:00
ProgrammaticNajel	0797f5d644	Update SliderPlacementBlueprint.cs	2019-01-26 22:56:31 +08:00
ProgrammaticNajel	e71b13683a	Add null check	2019-01-26 22:55:33 +08:00
LeNitrous	03e57d0423	fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp	2019-01-26 20:15:19 +08:00
ProgrammaticNajel	e939f75f4b	Transform screen mouse coordinates to local space coordinates.	2019-01-26 18:19:01 +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	77763fde8b	revert accidentally renamed variables	2019-01-25 11:22:05 +01:00
Unknown	4a916b2dee	replace license headers with new ones	2019-01-25 11:17:48 +01:00
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Unknown	5446c99f22	Merge branch 'master' into move-osu-settings	2019-01-25 10:57:04 +01:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09: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
Unknown	481f33d17b	add setting to toggle the gameplay cursor trail	2019-01-23 14:27:39 +01:00
Unknown	33b46dc4e8	adjust year in license header to match CFS's expectations	2019-01-23 13:17:29 +01:00
Unknown	cf147083cd	move osu! settings into its ruleset	2019-01-23 13:17:29 +01:00
Unknown	4a9bcf4937	rename OsuConfigManager to GameConfigManager ... also OsuSetting to GameSetting	2019-01-23 13:17:29 +01:00
Shane Woolcock	728c744e4d	Merge branch 'master' into samah-ios	2019-01-23 22:19:49 +10:30
Dean Herbert	8160162cde	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-01-21 20:58:17 +09:00
smoogipoo	baae53d784	Merge branch 'diffcalc-fixes' into xexxar-angles	2019-01-20 22:19:50 +09:00
smoogipoo	3db23898df	Merge remote-tracking branch 'origin/master' into diffcalc-fixes	2019-01-20 13:27:42 +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
smoogipoo	a8e9adafdb	Fix final section not being saved	2019-01-17 12:51:49 +09:00
smoogipoo	e44bc57a3d	Fix minDistanceFromEnd using seconds rather than milliseconds ... Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.	2019-01-15 19:18:56 +09:00
smoogipoo	117c514479	Fix lazy slider calculation inaccuracy ... What were we doing... On /b/1221540 stable's repeat points happen 90% through the length of each span! We should use lazer's more accurate calculations.	2019-01-15 19:07:25 +09: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
Dean Herbert	17bc933db2	Revert unnecessary changes	2019-01-10 19:01:41 +09:00
Dean Herbert	8cd058ed9a	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-10 18:38:20 +09:00
VINXIS	a09615144e	Kill White Space	2019-01-09 01:47:39 -07:00
VINXIS	dfe35f850c	Add rebalances to lazer performance calc	2019-01-09 01:42:48 -07:00
tangalbert919	5835ccc04c	Merge changes up to 2019.108.0	2019-01-08 17:53:57 -06:00
Shane Woolcock	a267a1a085	Merge branch 'master' into samah-ios	2019-01-08 17:09:26 +10:30
Dean Herbert	8edec10e5f	Merge branch 'master' into fix-replay-import-statistics	2019-01-08 11:26:12 +09:00
Dean Herbert	881b10a18f	Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini	2019-01-08 11:01:04 +09:00
Dean Herbert	7eed3ffe75	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 10:02:06 +09:00
Dean Herbert	4cee21f356	Make skinning better	2019-01-07 20:12:39 +09:00
Dean Herbert	ca98caf84b	Merge pull request #4001 from UselessToucan/linq_temp ... Use Find instead of FirstOrDefault	2019-01-07 18:50:59 +09:00
Dean Herbert	8914585021	Fix implementation of conditional cursor expanding	2019-01-07 18:28:26 +09:00
smoogipoo	b57c1af084	Only update stacking if there are hitobjects	2019-01-07 18:15:44 +09:00
smoogipoo	c6c22b352f	More verbose exceptions	2019-01-07 18:13:40 +09:00
Dean Herbert	13b077c83b	Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini	2019-01-07 18:11:17 +09:00
smoogipoo	351ab6e9bd	Shortcut O(n^2) calculation	2019-01-07 18:01:44 +09:00
smoogipoo	1c5ab6a906	Implement stacking by index	2019-01-07 18:00:59 +09:00
Dean Herbert	e73845172c	Merge branch 'master' into fix-replay-import-statistics	2019-01-07 13:44:01 +09:00
tangalbert919	4da5ca02eb	Merge branch 'master' into android	2019-01-06 00:06:56 -06:00
tangalbert919	47268898be	Expose internals for Android test projects	2019-01-06 00:04:25 -06:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
smoogipoo	722210d8bb	Merge remote-tracking branch 'origin/master' into xexxar-angles	2019-01-04 23:52:23 +09:00
smoogipoo	3fa5a33fb1	Inline const	2019-01-03 18:58:07 +09:00
smoogipoo	273b14b19c	Add a maximum length for slider ticks to be generated	2019-01-03 18:51:47 +09:00
smoogipoo	c56d8b75c1	Cache slider's endposition	2019-01-03 17:43:10 +09: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	5c1280c092	Fix missing hitwindows	2018-12-28 00:14:00 +09:00
Dean Herbert	fb10d15870	Populate statistics for all rulesets' scores	2018-12-27 21:52:09 +09:00
smoogipoo	77e6f4ab92	Rebalance	2018-12-27 18:41:42 +09:00
VINXIS	227c63dd1c	numtotalhits -> totalHits	2018-12-23 22:23:43 -07:00
VINXIS	8020ac26fb	MBMasher's FL change	2018-12-23 22:14:28 -07:00
smoogipoo	5f0ab0ed7f	Update with vinxis' latest code	2018-12-24 12:41:04 +09:00
smoogipoo	c43c15a557	Multiply previous travel distance by 8	2018-12-23 16:28:19 +09:00
smoogipoo	9fcc727e0d	Fix TravelDistance not being calculated	2018-12-23 16:26:23 +09:00
smoogipoo	d9b8df1595	Merge remote-tracking branch 'origin/master' into user-registration	2018-12-22 17:19:28 +09:00
smoogipoo	c848c83d0d	Refactor for readability + performance	2018-12-22 09:56:33 +09:00
Dean Herbert	f0dfc75bb2	Change osu! default keys back to Z/X ... A/S was no better as far as keyboard layout agnostic-ness. And people are confused if we change the defaults. Need to take a step back and reassess.	2018-12-22 09:49:09 +09:00
smoogipoo	8546fedd4f	Implement vinxis/xexxar's adjustments	2018-12-22 09:31:30 +09:00
Poyo	08d7c2df70	Fix extra hard-rock flipping for sliders	2018-12-21 16:08:08 -08:00
smoogipoo	be476c58d7	Adjust with latest rebalancings	2018-12-21 22:52:27 +09:00
smoogipoo	5bd16f9a7c	Add scaling factor	2018-12-21 15:16:00 +09:00
smoogipoo	38441759a7	Use angle projections	2018-12-21 14:52:43 +09:00
smoogipoo	3acbf75beb	Adjust threshold	2018-12-21 13:48:10 +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
Dean Herbert	bb850da200	Remove skinnability for now ... Not sure if we want this going forward.	2018-12-20 15:48:45 +09:00
smoogipoo	1c44e19066	Adjust scaling factor	2018-12-19 13:53:47 +09:00
smoogipoo	0fee76c95c	Fix merge error	2018-12-19 13:45:33 +09:00
smoogipoo	1972f1f279	Fix incorrect angle being used (at object vs into object)	2018-12-19 13:45:33 +09:00
smoogipoo	162774ce27	Make angles unsigned	2018-12-19 13:45:33 +09:00
smoogipoo	434d7d1809	Replace piecewise linear function + rebalance	2018-12-19 13:45:33 +09:00
smoogipoo	9ad7970167	Adjust computations to return sane values	2018-12-19 13:45:33 +09:00
smoogipoo	f4eabacd15	Implement angle assessment	2018-12-19 13:45:33 +09:00
smoogipoo	e7da5b0400	Add the [200 .. 300] bpm speed bonus	2018-12-19 13:45:33 +09:00
smoogipoo	00a4d60e89	Make sure distance is clamped to sane values	2018-12-19 13:45:33 +09:00
smoogipoo	47721f7a07	Adjust base value	2018-12-19 13:45:33 +09:00
smoogipoo	d74652a4f7	Replace piecewise linear function	2018-12-19 13:45:33 +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
Dragicafit	c6c4bcccc3	relocate SkinnableCursor	2018-12-12 11:17:09 +01:00
Dragicafit	4b073aed83	remove spaces	2018-12-11 21:02:12 +01:00
Dragicafit	bfe3b03945	using SkinReloadableDrawable	2018-12-11 18:06:41 +01:00
Dragicafit	fb7d767909	adjust if position	2018-12-11 00:38:03 +01:00
Dragicafit	506f27a92e	cursorExpand is now a bool	2018-12-07 23:52:57 +01:00
Dragicafit	ec3c87dbea	Make Slider's CustumColors skinnable	2018-12-07 22:24:24 +01:00
Dragicafit	0816eaacb8	Make CursorExpand skinnable	2018-12-07 22:22:40 +01:00
Dean Herbert	4f34d42b33	Major code refactors	2018-12-07 21:11:35 +09:00
Dean Herbert	d379d02761	Remove unnecessary base class	2018-12-07 20:12:56 +09:00
WebFreak001	6eff7d9acc	Style fixes	2018-12-06 14:34:10 +01:00
WebFreak001	a14de5bd1b	Remove blinds random NPC	2018-12-06 12:52:39 +01:00
WebFreak001	46b98702e1	make target animation call more obvious	2018-12-06 12:48:11 +01:00
WebFreak001	3cb91979bd	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2	2018-12-06 12:14:48 +01:00
Dean Herbert	1a974f64de	Initial design for user registration dialog	2018-12-05 12:57:26 +09: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	5254b07680	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
smoogipoo	aea84f737b	Fix taiko hitobjects potentially disappearing before being judged	2018-11-29 12:12:29 +09:00
smoogipoo	52bc47499f	Fix spinners not having proper lifetimes	2018-11-29 12:11:45 +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
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
MaxOhn	8a3425948d	Merge branch 'master' of https://github.com/ppy/osu into deflate-branch	2018-11-26 03:45:35 +01:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
Dean Herbert	dd21daa635	Merge branch 'master' into fix-mask-disposal	2018-11-18 21:18:00 +09:00
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +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	1501e05c04	Merge branch 'master' into fix-mask-disposal	2018-11-14 21:27:37 +09:00
Dean Herbert	84d16ee71b	Merge branch 'master' into placement-hiding	2018-11-14 16:59:41 +09:00
smoogipoo	050af88be9	Fix post-merge issues	2018-11-14 14:29:22 +09:00
smoogipoo	29422345f7	Merge remote-tracking branch 'origin/master' into fix-mask-disposal ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs # osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs # osu.Game.Rulesets.Osu/Objects/Slider.cs	2018-11-14 14:03:25 +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
smoogipoo	f3ba429701	Make sure control points is internally initialised	2018-11-12 17:14:06 +09:00
smoogipoo	d594ce3530	Revert "Make SliderPath.ControlPoints read-only" ... This reverts commit 3b88d94793. # Conflicts: # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 16:20:38 +09:00
smoogipoo	3aba462e52	Make Path.Distance a property again	2018-11-12 14:07:48 +09:00
smoogipoo	3b88d94793	Make SliderPath.ControlPoints read-only	2018-11-12 14:03:54 +09:00
smoogipoo	51e4feeda7	Adjust to new path structure	2018-11-12 13:55:14 +09:00
smoogipoo	54ab256c8e	Instantiate a new path rather than setting properties on it ... # Conflicts: # osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs # osu.Game.Rulesets.Catch/Objects/JuiceStream.cs # osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 13:50:19 +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
smoogipoo	13279f707b	Cleanups	2018-11-09 14:19:50 +09:00
smoogipoo	cc8531790a	Use bindables for hitobject events	2018-11-09 13:58:46 +09:00
smoogipoo	c6350c6efd	Remove IHasEditablePosition	2018-11-08 13:03:11 +09:00
jorolf	5c09662c14	Allow flashlight size to be variant	2018-11-07 23:40:33 +01:00
smoogipoo	5d51719572	Make selection blueprints handle position adjustments	2018-11-07 16:21:32 +09:00
smoogipoo	2612fd3099	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00
jorolf	2cffce805a	add flashlight mod	2018-11-07 00:48:54 +01:00
smoogipoo	85f96ad62f	Fix a few missed renames	2018-11-06 18:07:53 +09:00
smoogipoo	bd775af274	PlacementMask -> PlacementBlueprint	2018-11-06 18:04:03 +09:00
smoogipoo	11be820efe	CreateMaskFor -> CreateBlueprintFor	2018-11-06 18:03:21 +09:00
smoogipoo	f2a5f28ea2	SelectionMask -> SelectionBlueprint	2018-11-06 17:56:04 +09:00
smoogipoo	a4caaf56ef	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2018-11-05 16:38:28 +09:00
Dean Herbert	63cbc8e0e8	Merge branch 'master' into slider-placement	2018-11-02 19:45:34 +09:00
Dean Herbert	ad49dca86e	Merge branch 'master' into spinner-placement-2	2018-11-02 19:32:52 +09:00
Dean Herbert	e6ee3dc73e	Use framework helper functions for path approximation	2018-11-02 19:26:29 +09:00
Dean Herbert	7f1ee3bcb4	Disallow spinner movement for now	2018-11-02 12:06:53 +09:00
smoogipoo	2ac4f2b6af	Lock spinners to centre of screen	2018-11-01 19:24:58 +09:00
smoogipoo	d78348f178	Reduce duplicate code	2018-11-01 19:23:37 +09:00
smoogipoo	1aae123ff5	Make approximators share an interface	2018-11-01 19:16:44 +09:00
Dean Herbert	1265d5ac0b	Merge branch 'master' into spinner-placement-2	2018-11-01 18:05:44 +09:00
Dean Herbert	c1304eca1b	Merge remote-tracking branch 'upstream/master' into slider-placement	2018-11-01 17:59:37 +09:00
Dean Herbert	5fd21d35dc	Merge branch 'master' into spinner-selection	2018-11-01 17:47:59 +09:00
Dean Herbert	bb2f8deb18	ControlPoint -> PathControlPoint ... Also Curve -> Path.	2018-11-01 03:56:51 +09:00
smoogipoo	ffec532079	Fix segment control points not changing in unison	2018-10-31 19:02:47 +09:00
smoogipoo	d2fbf05137	Reduce size of control point	2018-10-31 18:01:53 +09:00
WebFreak001	cbd14d5b0e	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2	2018-10-29 19:28:21 +01:00
smoogipoo	aec1d95f04	Implement spinner placement	2018-10-29 18:37:28 +09:00
smoogipoo	e04ad8357d	Make spinner piece respond to scale changes	2018-10-29 18:37:12 +09:00
smoogipoo	af1de01ed6	Add a spinner selection mask	2018-10-29 18:23:23 +09:00
smoogipoo	2ae7b42244	Fix control points disappearing if moved offscreen	2018-10-29 16:15:15 +09:00
smoogipoo	5998d6454b	Use ControlPointVisualiser instead of custom implementation	2018-10-29 15:56:17 +09:00
smoogipoo	08b16be3b8	Merge branch 'slider-controlpoint-masks' into slider-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs	2018-10-29 15:55:38 +09:00
smoogipoo	c1fffde10d	Fix broken conditional	2018-10-29 15:52:28 +09:00
smoogipoo	acd703c27b	Make sliders respond to control point changes	2018-10-29 15:36:43 +09:00
smoogipoo	b0f5ace0e8	Implement slider control point visualisation	2018-10-29 15:29:34 +09:00
smoogipoo	660cd24750	Make sliders respond to scale changes	2018-10-29 15:26:28 +09:00
smoogipoo	a9f1484e8b	Fix some post-rebase issues	2018-10-29 15:26:28 +09:00
smoogipoo	4fa511043e	Use common body piece	2018-10-29 15:26:28 +09:00
smoogipoo	b28f44087d	Bring up to date with further placement changes	2018-10-29 15:26:28 +09:00
smoogipoo	6310c183fa	Modify slider position directly	2018-10-29 15:26:07 +09:00
smoogipoo	8fa783b4c5	Use begin/end placement methods	2018-10-29 15:26:07 +09:00
smoogipoo	a491fb42df	Set slider start time when head is placed	2018-10-29 15:26:07 +09:00
smoogipoo	9540e53e32	Initial controlpoint implementation	2018-10-29 15:26:07 +09:00
smoogipoo	2c4616dbb1	Adjust visual display of the placement curve	2018-10-29 15:26:07 +09:00
smoogipoo	402950b132	Implement path drawing	2018-10-29 15:26:07 +09:00
smoogipoo	bd915e8dca	Implement initial slider placement (linear)	2018-10-29 15:26:06 +09:00
smoogipoo	38ce8f8af1	Refactor SliderSelectionMask	2018-10-29 15:26:06 +09:00
smoogipoo	9b19050faf	Update with slider body changes	2018-10-29 15:25:20 +09:00
smoogipoo	619a0dfd59	Merge branch 'separate-slider-body' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs	2018-10-29 15:24:15 +09:00
smoogipoo	dd5a3ad59c	Fix SliderMask not working	2018-10-29 15:17:45 +09:00
smoogipoo	86e09a68f7	Separate slider body to bypass snaking logic ... The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.	2018-10-29 15:15:29 +09:00
Dean Herbert	4f65d67e2b	Merge branch 'master' into skinnable-spritetext	2018-10-28 08:35:25 -07:00
WebFreak001	72e82b660d	Adjust blinds animations based on player feedback	2018-10-28 01:14:16 +02: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	22c545ea8c	Make circle piece respond to hitobject scale	2018-10-26 15:26:19 +09:00
smoogipoo	4a507c66ee	Cleanup	2018-10-26 15:26:08 +09:00
smoogipoo	f674fcf2c8	Merge branch 'mask-separation' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs # osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs # osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs	2018-10-26 14:05:30 +09:00
smoogipoo	ea3c960b5b	Mask -> Piece for components	2018-10-26 13:51:03 +09:00
smoogipoo	9656186b64	Make the hitobject masks move within their placement/selection ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs # osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs # osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs # osu.Game/Rulesets/Edit/PlacementMask.cs	2018-10-26 13:45:31 +09:00
smoogipoo	4051864bb4	Re-namespace	2018-10-26 13:39:19 +09:00
smoogipoo	e1db2bbc25	Split visuals of HitCircleSelectionMask into HitCircleMask	2018-10-26 13:31:44 +09:00
smoogipoo	677d0d4a19	Renamespace ruleset masks	2018-10-26 13:31:38 +09:00
smoogipoo	8703db5cc1	Rename HitObjectMask -> SelectionMask	2018-10-26 13:31:23 +09:00
smoogipoo	e14719e440	Mask -> Piece for non-mask components	2018-10-25 18:28:10 +09:00
smoogipoo	d19f80835b	Adjust namespaces	2018-10-25 18:26:28 +09:00
smoogipoo	ea6db8b793	Make the hitobject masks move within their placement/selection	2018-10-25 18:16:25 +09:00
Dean Herbert	a9e5a4351e	Merge branch 'master' into fix-diffcalc-slider-distance	2018-10-21 20:33:50 +09:00
Dean Herbert	f19cc98e6a	Add slightly more explanation	2018-10-20 23:10:33 +09:00
Dean Herbert	0952c20c84	Adjust comment slightly	2018-10-20 23:06:48 +09:00
Dan Balasescu	d284f29637	Add comment describing the speed multiplier	2018-10-18 14:16:46 +09:00
Dean Herbert	cd718812b2	Merge branch 'master' into tighten-diffcalc-tolerances	2018-10-18 14:01:47 +09:00
smoogipoo	1cf6cd10bb	Fix slider travel distances sometimes not being considered	2018-10-18 11:29:50 +09:00
smoogipoo	f42f9cffe3	Make HitCirclePlacementMask directly modify hitcircle position	2018-10-17 18:16:34 +09:00
smoogipoo	d36ac59ca2	Reduce complexity of creating edit ruleset containers	2018-10-17 18:06:00 +09:00
smoogipoo	08e3fe1def	Add PlacementStarted event, rename placement methods	2018-10-17 14:37:45 +09:00
smoogipoo	e8ce5a7e6c	Fix crashes when manually creating sliders	2018-10-16 18:27:09 +09:00
smoogipoo	f384c7228e	Fix post-merge issues	2018-10-16 17:28:23 +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