1406 Commits

Author	SHA1	Message	Date
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