1139 Commits

Author	SHA1	Message	Date
miterosan	957a026c08	Merge branch 'ArrangeMod' of https://github.com/miterosan/osu into ArrangeMod	2018-08-22 21:20:49 +02:00
miterosan	5c5191b9c3	Rename the mod class to transform.	2018-08-22 21:19:28 +02:00
miterosan	173d12c1ec	rename arrange to transform	2018-08-22 21:17:18 +02:00
miterosan	c374755cc8	only affect spinner, hitcircle and slider and nothing else.	2018-08-22 21:16:45 +02:00
miterosan	d070a3e2d8	Only affect hitcicles, slider and spinner	2018-08-22 20:46:03 +02:00
smoogipoo	d14dad64e8	Fix hitobject stacking being applied too early	2018-08-21 16:01:28 +09:00
Dean Herbert	1984ae6d0b	Merge pull request #3266 from smoogipoo/remove-override ... Remove sliderball's ReceiveMouseInput override	2018-08-21 13:04:04 +09:00
smoogipoo	34b1abeca3	Remove sliderball's input override	2018-08-21 12:24:48 +09:00
Dan Balasescu	c4264794e0	Merge branch 'master' into relax	2018-08-21 12:11:10 +09:00
Dean Herbert	e628e78f24	Update uniform usage	2018-08-20 13:39:22 +09:00
Dean Herbert	6a4ff19c90	Merge branch 'master' into relax	2018-08-17 23:17:07 +09:00
Dean Herbert	41f8609e0f	Also handle OnScroll	2018-08-17 20:13:14 +09:00
Dean Herbert	442f6795bc	Block user input	2018-08-17 19:33:14 +09:00
smoogipoo	557a2ee39d	Add more comprehensive tests	2018-08-17 10:04:00 +09:00
smoogipoo	eb6f1ae72c	Fix spinners providing one extra combo	2018-08-17 09:16:28 +09:00
Dean Herbert	bc22a28fef	Clean up logic and variables	2018-08-16 18:18:15 +09:00
Dean Herbert	870f6bea47	Only process alive objects	2018-08-16 18:18:08 +09:00
Dean Herbert	ff0dfa7acf	Merge branch 'master' into relax	2018-08-16 17:36:24 +09:00
smoogipoo	31f324945e	Implement combo offsets	2018-08-15 11:47:31 +09:00
smoogipoo	da3e2cfee2	Catch/osu! spinners should have combo	2018-08-15 11:13:23 +09:00
miterosan	82054cde38	Merge branch 'master' into ArrangeMod	2018-08-14 21:57:10 +02:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
smoogipoo	3a7488767c	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
smoogipoo	741ec0021e	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
smoogipoo	ab642b563f	CreateJudgementResult -> CreateResult	2018-08-06 11:07:41 +09:00
smoogipoo	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
miterosan	89a18e4aac	remove nl and add comment for -1 and +1	2018-08-05 15:39:12 +02:00
miterosan	d1ffb7c2d7	Use timepreempt and put appeartime and move duration into their own vars.	2018-08-05 15:38:27 +02:00
miterosan	8ad8c2b6d0	Reset the ScoreMultiplier to 1	2018-08-05 15:16:25 +02:00
miterosan	7653ce80cd	add a period after EVERYTHING	2018-08-05 15:16:10 +02:00
miterosan	d32ffc1ebc	Swtich order of the moveto and the movetooffset.	2018-08-05 15:14:52 +02:00
miterosan	876d410fa1	Add missing ;	2018-08-05 15:13:04 +02:00
miterosan	f02d1f9013	move the 250 appear disance to a const var.	2018-08-05 15:10:42 +02:00
WebFreak001	b33954d9db	Implement blinds mod	2018-08-05 14:20:56 +02:00
tgi74000	924bf9174c	Fix overclick in certain situations	2018-08-05 09:58:15 +02:00
tgi74000	b1d1a2400b	Remove IUpdatableByHitObject completely	2018-08-05 09:52:19 +02:00
miterosan	546bdf0618	remove default value init .-.	2018-08-04 00:36:59 +02:00
miterosan	25791b6317	remove space.	2018-08-04 00:30:46 +02:00
miterosan	159ce8e93e	Add license header	2018-08-04 00:29:32 +02:00
miterosan	67c64ac459	Put the arrange mod into the fun section.	2018-08-04 00:26:26 +02:00
miterosan	5bb12b574b	The arrange mod is not ranked I think.	2018-08-04 00:26:06 +02:00
miterosan	3457bc08e5	Merge branch 'master' of https://github.com/ppy/osu into ArrangeMod	2018-08-04 00:21:48 +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	2a4994e5ce	Make hitobjects only have one judgement + result	2018-08-03 15:38:48 +09:00
smoogipoo	8d81e66f88	Fix osu score processor crashing	2018-08-02 21:07:11 +09:00
smoogipoo	4548d2c87f	Make Rulesets.Osu use the new judgement result structure	2018-08-02 20:36:38 +09:00
smoogipoo	462f1033c0	Migrate Rulesets.Osu to the new judgement system	2018-08-02 15:21:23 +09:00
Dean Herbert	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Dean Herbert	51506efd1a	Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation	2018-07-31 16:49:31 +09:00
Dean Herbert	ea6cab498e	Add comment	2018-07-31 16:47:13 +09:00
Dan Balasescu	04252293a7	Merge branch 'master' into fix-repeat-arrow-interpolation	2018-07-31 16:21:15 +09:00
Dean Herbert	874b5636e4	Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning	2018-07-31 16:15:27 +09:00
Dean Herbert	976653fdf9	Minor formatting fixes	2018-07-31 16:13:52 +09:00
Dean Herbert	132241424d	Apply FollowPoint alpha to inner container (should not affect legacy skins)	2018-07-31 15:59:06 +09:00
Dan Balasescu	0a7a2c83a8	Merge branch 'master' into fix-follow-circle-size	2018-07-31 15:41:15 +09:00
Dean Herbert	a98bb057e2	Fix follow circle being scaled far larger than it should be	2018-07-31 15:27:21 +09:00
tgi74000	36afae5a24	Remove the inner followcircle fade, Fade the entire followcircle instead	2018-07-30 13:43:02 +02:00
Dean Herbert	21f3ff6e77	Fix slider repeat points appearing far too late	2018-07-30 18:51:25 +09:00
Dean Herbert	f4cda695e6	Improve rotation handling in edge cases	2018-07-30 18:50:59 +09:00
miterosan	4d306ef837	Add comments and clean up code.	2018-07-30 11:39:21 +02:00
miterosan	23a37d06cf	Implement the arrange mod.	2018-07-30 11:34:20 +02:00
tgi74000	c6aabc6d2d	Move the FollowCircle border to its own container	2018-07-30 10:52:37 +02:00
Dean Herbert	a39188f762	Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation	2018-07-30 17:29:21 +09:00
tgi74000	84135c49ca	Fix small FollowPoint rotation bug	2018-07-29 23:21:05 +02:00
tgi74000	18096490b6	Add support for followpoint skinning	2018-07-29 23:20:37 +02:00
tgi74000	4322475ad2	Add support for sliderb skinning (single frame only)	2018-07-29 22:29:07 +02:00
tgi74000	257c035f30	Add support for sliderfollowcircle skinning	2018-07-29 21:28:13 +02:00
tgi74000	52d9461f03	Add support for reversearrow skinning	2018-07-29 20:51:06 +02:00
tgi74000	2a9818a128	Add support for sliderscorepoint skinning	2018-07-29 20:42:05 +02:00
smoogipoo	ff2a3a6e92	Fix hitobjects not properly expiring if scrolling in the editor	2018-07-26 20:07:16 +09:00
Dean Herbert	10656be954	Add interpolation to repeat point during sliding	2018-07-23 16:55:38 +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	ffd3040fe2	Fix GameplayCursor state not restoring correctly after Show/Hide	2018-07-18 19:59:04 +09:00
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +09:00
Dean Herbert	825941aff1	Use switch with type matching in place of if-else where possible	2018-07-17 14:35:09 +09:00
Dean Herbert	b967fe714b	Fix lead-in time now being long enough in many cases	2018-07-17 14:29:22 +09:00
smoogipoo	2d8e2dc5f7	Merge remote-tracking branch 'origin/master' into osu-default-bindings	2018-07-13 19:32:40 +09:00
Ethan Yang	157ca8b2a4	Change osu key bindings	2018-07-08 11:47:39 -07:00
Dean Herbert	79af5cb0a0	Limit shake duration to ensure it doesn't overlap miss window	2018-07-06 17:24:30 +09:00
Dean Herbert	e041352690	Add comment regarding add/clear/remove overrides	2018-07-06 13:19:43 +09:00
Dean Herbert	48d90a67ae	xmldoc and formatting	2018-07-06 12:13:23 +09:00
Dean Herbert	aa96d91762	Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake	2018-07-06 11:57:32 +09:00
Dean Herbert	d453414070	Forward shakes from slider head objects to sliders	2018-07-06 11:52:58 +09:00
tgi74000	558b2622a7	Move the Shake logic to a new ShakeContainer	2018-07-05 15:48:54 +02:00
Dean Herbert	1d6609d9f3	Add common custom words to dotsettings dictionary ... Also fixes some typos and reduces spelling suggestions to hints.	2018-07-05 15:54:41 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
Dean Herbert	831b11ff97	Remove unnecessary null checks	2018-07-02 14:28:56 +09:00
Dean Herbert	c04bfb96e1	Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix	2018-07-02 14:26:41 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
Dan Balasescu	f35ea18755	Merge branch 'master' into hit-shake	2018-06-29 17:38:02 +09:00
tgi74000	3d50050089	Move shake duration to a constant	2018-06-29 10:36:00 +02:00
Dan Balasescu	e3317b5145	Make method protected	2018-06-29 17:31:13 +09:00
Dean Herbert	098aeabc9e	Merge branch 'master' into catch-scoring	2018-06-29 17:16:14 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	cacabeb67e	Remove unused field	2018-06-29 17:00:41 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +09:00
Dean Herbert	9d4bc7b630	Fix combo index being wrong	2018-06-29 01:34:47 +09:00
Dean Herbert	0a945e4709	Check whether initialised first	2018-06-28 22:44:40 +09:00
tgi74000	59e03fa528	Move Shake to DrawableOsuHitObject, Clean up Shake()	2018-06-28 15:33:59 +02:00
tgi74000	61c416dc16	Trigger Shake if HitCircles are hit too early	2018-06-28 13:41:23 +02:00
Dean Herbert	e197ebe4c5	Fix slider heads displaying in incorrect colour	2018-06-28 01:55:09 +09:00
Dean Herbert	10220a61a5	Use playfield size constants where possible	2018-06-27 12:18:00 +09:00
smoogipoo	0e6cc78d9a	Add slider ticks conversion test	2018-06-27 12:09:40 +09:00
smoogipoo	6f65ad33f0	Output one value per slider nested hitobject	2018-06-27 12:09:40 +09:00
smoogipoo	0366b0f081	The tail circle will always be the last hitobject	2018-06-27 12:09:40 +09:00
smoogipoo	80501de4b9	Add legacy slider offsets	2018-06-27 12:09:21 +09:00
Roman Kapustin	2a72062c33	Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part.	2018-06-26 00:53:31 +03:00
Dean Herbert	22138d39ca	Merge branch 'master' into more-diffcalc-attributes	2018-06-25 19:53:22 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
smoogipoo	48989df6eb	Make sure that 0 SR is returned when there are no hitobjects	2018-06-21 12:04:14 +09:00
Dan Balasescu	bf11a61d52	Merge branch 'master' into more-diffcalc-attributes	2018-06-21 09:26:50 +09:00
Dan Balasescu	77e03a59a9	Merge branch 'master' into ruleset-container	2018-06-19 21:47:10 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dan Balasescu	0b1b3319aa	Merge branch 'master' into update-framework	2018-06-19 20:57:19 +09:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Tom Arrow	4aa89de2d7	Fix reverse arrow displayed with incorrect angle	2018-06-18 17:22:01 +02:00
smoogipoo	41abd5990c	Move osu! difficulty attributes to OsuDifficultyCalculator	2018-06-14 16:27:05 +09:00
smoogipoo	af218b3d8d	No need to use properties	2018-06-14 16:13:21 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
smoogipoo	47fc18d7c4	Adjust OsuDifficultyCalculator in-line with changes	2018-06-14 15:45:16 +09:00
Dean Herbert	f4cb0d7d8d	Fix memory leak due to incorrect binding	2018-06-13 14:16:58 +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	f4fbf27d42	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
Crusensis	fbc0cd6f5f	Split AffectsCombo into IsBonus	2018-06-09 18:14:33 -07:00
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
smoogipoo	ff60f69f47	Explicitly construct local beatmaps rather than using GetBoundCopy	2018-06-06 20:19:30 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
smoogipoo	83ff47ec80	Rewrite difficulty mod combinations	2018-06-06 16:20:17 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
smoogipoo	8274623ad6	Cleanup multi mod constructions	2018-06-06 14:07:50 +09:00
Dean Herbert	f253828d49	Fix regressions	2018-06-06 13:51:51 +09:00
Dean Herbert	ee92986494	Merge branch 'master' into osu-hd-setting	2018-06-06 12:09:12 +09:00
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
smoogipoo	2ccffb9ac4	Add difficulty calculation mod types	2018-06-03 10:59:56 +09:00
Dean Herbert	2f21b9c4ea	Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits	2018-05-31 12:36:37 +09:00
smoogipoo	a3470f9ec3	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs	2018-05-28 18:01:15 +09:00
smoogipoo	d850e34003	Actually cast to int	2018-05-26 09:25:16 +09:00
smoogipoo	215cc9fba7	Change all performance calculators to use int hitwindows ... Has a pretty large (>6) effect on pp for some maps.	2018-05-25 20:07:14 +09:00
smoogipoo	765a50d007	Remove 0.5 offsets ... Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.	2018-05-25 20:05:53 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Dean Herbert	cea935ea40	Merge branch 'master' into osu-hd-setting	2018-05-21 15:21:09 +09:00
smoogipoo	1f37dca7b7	Fix HR / EZ being applied twice to AR	2018-05-19 14:47:06 +09:00
Dean Herbert	8e784d9104	Merge branch 'master' into fix-conversion-hitwindows	2018-05-18 11:59:16 +09:00
Vidalee	6a1abf4084	Merge branch 'master' into osu-hd-setting	2018-05-17 19:39:17 +02:00
smoogipoo	eba1d309b6	Fix incorrect namespace of OsuPerformanceCalculator	2018-05-17 16:58:22 +09:00
smoogipoo	f67d263596	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
smoogipoo	c1d9fcc140	Make OsuPerformanceCalculator use the new hitresult namings	2018-05-16 12:46:31 +09:00
smoogipoo	cf08293be1	Remove extra newline	2018-05-15 21:49:44 +09:00
smoogipoo	4101b8ddde	Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements	2018-05-15 21:31:58 +09:00
smoogipoo	22f3bee55a	Fix incorrect iteration over difficulty sections	2018-05-15 21:26:06 +09:00
smoogipoo	bc197a88e1	Fix slider length calculation including slider head	2018-05-15 21:25:33 +09:00
smoogipoo	1b5c151e0e	Fix DeltaTime being capped incorrectly	2018-05-15 21:25:02 +09:00
smoogipoo	49c36787d7	Remove triangle pattern and remove not-implemented reading strain	2018-05-15 21:24:41 +09:00
Dean Herbert	0e0cc8bb69	Merge branch 'master' into namespace-cleanup	2018-05-15 18:10:48 +09:00
smoogipoo	995fda9b6f	Move base classes to osu.Game.Rulesets.Difficulty namespace	2018-05-15 17:38:08 +09:00
smoogipoo	9fd972e0a3	Rename OsuDifficulty -> Difficulty	2018-05-15 17:36:29 +09:00
Dean Herbert	e39af1c906	Merge branch 'master' into convert-object-hitwindows	2018-05-15 17:33:27 +09:00
smoogipoo	10e2f74538	Port osu-performance HD AR fix	2018-05-15 11:53:11 +09:00
smoogipoo	a81921118d	Strip whitespaces	2018-05-14 11:54:11 +09:00
smoogipoo	6e1d651087	Merge remote-tracking branch 'origin/master' into convert-object-hitwindows	2018-05-14 11:17:39 +09:00
smoogipoo	ce6b4cc2d3	Add more attributes to OsuPerformanceCalculator's output	2018-05-14 11:15:37 +09:00
smoogipoo	e1b8a1589b	Fix TimeRate not being considered for performance calculation	2018-05-14 11:15:14 +09:00
Dean Herbert	f6df704deb	Merge branch 'master' into diffcalc-fixes	2018-05-12 22:16:20 +09:00
smoogipoo	416ed72597	Port osu-performance changes into OsuPerformanceCalculator	2018-05-12 15:46:25 +09:00
smoogipoo	a337248999	Fix incorrect count	2018-05-11 22:06:16 +09:00
smoogipoo	224f1a0810	Fix incorrect osu! difficulty calculator combo count	2018-05-11 21:49:16 +09:00
smoogipoo	faa82f17cc	Pass original hitobject HitWindows during conversion	2018-05-11 15:30:50 +09:00
Vidalee	16bcd6c3ed	Appvtests (#1) ... * Resolving AppVeyor's errors	2018-05-08 14:33:26 +02:00
smoogipoo	251bdfdee8	Simplify statistics in osu ruleset	2018-05-07 15:51:08 +09:00
smoogipoo	5f74dc2c17	Simplify osu-ruleset statistics	2018-05-07 15:51:08 +09:00
smoogipoo	5489976c20	Implement ruleset-specific beatmap statistics	2018-05-07 15:51:08 +09:00
smoogipoo	268c14813b	Fix resharper warnings	2018-05-07 11:38:41 +09:00
smoogipoo	9128e64c9a	Rename OriginalBeatmap back to Beatmap	2018-05-07 10:29:38 +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
smoogipoo	1aefd71b65	Merge remote-tracking branch 'origin/master' into i-beatmap	2018-05-07 09:58:53 +09:00
Vidalee	393c01ba90	Made the changes requested	2018-05-06 12:38:25 +02:00
Dean Herbert	76e58a51b9	Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting	2018-04-25 17:28:21 +09:00
smoogipoo	0dce7a5b61	Update framework + fix CI errors	2018-04-20 18:19:17 +09:00
smoogipoo	c9e4a07e12	Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs # osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs	2018-04-20 18:04:43 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
smoogipoo	66b3b295e7	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
tgi74000	9b36cf2066	Review changes	2018-04-16 14:14:40 +02:00
tgi74000	b23b0a445b	Add support for replay mods	2018-04-13 15:41:35 +02:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	cea3e1c7f5	Remove now unnecessary approachcircle proxy disables ... Prereqs: - [ ] ppy/osu-framework#1505	2018-04-09 18:44:50 +09:00
Dan Balasescu	1895111c75	Merge branch 'master' into dynamic-assembly-update	2018-04-06 20:16:13 +09:00
Dean Herbert	acbdbcc3df	Update AssemblyInfo in line with framework changes	2018-04-06 13:17:26 +09:00
Dean Herbert	6c125683d4	Merge branch 'master' into selectionlayer-rewrite	2018-04-04 20:47:36 +09:00
Dean Herbert	b7325d73e8	Don't inherit VisbilityContainer	2018-04-04 20:44:11 +09:00
smoogipoo	d4cb00e08f	Don't display judgements in OsuEditPlayfield	2018-04-04 17:12:41 +09:00
Dean Herbert	788bfde002	Merge branch 'master' into selectionlayer-rewrite	2018-04-04 15:38:27 +09:00
Dean Herbert	ddba7254ca	Merge remote-tracking branch 'upstream/master' into linq	2018-04-03 13:05:08 +09:00
Dean Herbert	d40ccbd70a	Merge branch 'master' into selectionlayer-rewrite	2018-04-03 12:03:11 +09:00
Dean Herbert	77189073b2	Merge branch 'master' into scalablecontainer-size-fix	2018-04-03 11:29:36 +09:00
Dean Herbert	57b4cdaf85	Merge branch 'master' into selectionlayer-rewrite	2018-04-03 03:05:42 +09:00
Dan Balasescu	d7b61b3c09	Merge branch 'master' into Small-Clean-Up	2018-04-02 14:13:15 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
smoogipoo	551ba6ac4b	Fix ScalableContainer irrepairably altering content size	2018-04-02 13:06:06 +09:00
Joseph Madamba	ee14ca7cc5	Merge branch 'master' into score-multiplier-edits	2018-03-31 10:43:58 -07:00
Dan Balasescu	824201336a	Merge branch 'master' into hr-on-mania-is-unranked	2018-03-30 16:35:00 +09:00
smoogipoo	4ad776bfde	Make slider circle masks not handle mouse input at all	2018-03-30 14:15:46 +09:00
Joseph Madamba	0887dafa2c	Revert changes on hard rock mod	2018-03-29 20:36:52 -07:00
Dean Herbert	e1123c5a95	Merge branch 'master' into selectionlayer-rewrite	2018-03-30 12:29:58 +09:00
smoogipoo	3129c2cc75	Fix slider circle masks blocking input for now	2018-03-29 22:41:49 +09:00
smoogipoo	d9c5a0c6d1	Fix position editing not working	2018-03-29 22:38:44 +09:00
smoogipoo	6d4f94756e	Rewrite the way drag + click selections happen ... The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately). I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways. 1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`. 2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally. 3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario. 4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to. 5. `SelectionBox` handles the display of itself locally. 6. `SelectionBox` handles movement of groups of masks locally. 7. `HitObjectMasks` handles movement of itself locally.	2018-03-29 22:07:23 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Joseph Madamba	af9e3a849f	Merge branch 'master' into score-multiplier-edits	2018-03-28 20:42:35 -07:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	9667d54ecb	Add missing licence headers	2018-03-28 14:48:08 +09:00
Dean Herbert	0026b94cd3	Consolidate and move ruleset test projects	2018-03-28 14:41:25 +09:00
Dean Herbert	1a8aa87469	Make everything better	2018-03-27 18:56:54 +09:00
Dean Herbert	b290d2d039	Move NUnit includes to individual projects	2018-03-27 15:07:09 +09:00
smoogipoo	dd5bbbbd9f	Define testable projects	2018-03-26 19:11:23 +09:00
smoogipoo	5159127bce	Fix SQLite failing to initialize on test projects	2018-03-26 18:07:09 +09:00
smoogipoo	35ef9d99c6	Only compile with net461 in visual studio	2018-03-26 15:44:55 +09:00
smoogipoo	3f9b14704e	Fix extra semicolon	2018-03-26 13:30:58 +09:00
smoogipoo	96901b6498	Add msbuild/dotnet build + launch targets	2018-03-26 10:52:54 +09:00
Joseph Madamba	90d763fda5	Apply review changes and suggestions	2018-03-25 10:00:30 -07:00
Joseph Madamba	78a7564acd	Score multiplier edits	2018-03-24 16:00:18 -07:00
smoogipoo	31920f1866	Fix ruleset resources not getting included in build	2018-03-25 02:12:01 +09:00
smoogipoo	d28de89e50	Add net461 target to test projects for nunit discovery ... Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).	2018-03-25 01:35:50 +09:00
John Neijzen	7b39447213	Update OsuAutoGenerator.cs	2018-03-24 18:34:56 +08:00
John Neijzen	bee9af8500	Update OsuAutoGenerator.cs	2018-03-24 18:30:36 +08:00
John Neijzen	9d96aeb347	Update OsuAutoGenerator.cs	2018-03-24 17:53:50 +08:00
John Neijzen	12f785bf40	Change duplicate condition to HitResult.Good instead of HitResult.Meh	2018-03-24 17:48:43 +08:00
John Neijzen	97be022e22	Remove duplicate condition	2018-03-24 16:55:39 +08:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	9d3529ce7b	Merge branch 'master' into cursor-skinning	2018-03-22 21:07:16 +09:00
Dean Herbert	af65f2dd48	Move AccentColour changes local to rulesets which rely on it	2018-03-22 18:53:16 +09:00
Dan Balasescu	ab9505652b	Merge branch 'master' into skin--completion	2018-03-22 16:44:00 +09:00
smoogipoo	4ccaf143b5	Give sliders a default accent colour	2018-03-22 15:50:19 +09:00
Dean Herbert	78a8f60b39	IHasComboIndex -> IHasComboInformation	2018-03-22 12:35:17 +09:00
Vidalee	505a7c14fc	was persuaded I changed the if statement...	2018-03-21 21:14:17 +01:00
Dean Herbert	d909cce8d6	Add the ability to skin the gameplay cursor	2018-03-21 20:06:10 +09:00
Vidalee	8159e219fd	increaseFirstObjectVisibility now cannot be null	2018-03-20 22:23:27 +01:00
Vidalee	cdbe6bf22d	cleared comment	2018-03-20 21:55:35 +01:00
Vidalee	4068be1293	cleared comment	2018-03-20 21:54:44 +01:00
Vidalee	9252203916	build fix	2018-03-20 18:23:41 +01:00
Dean Herbert	fb3d319d0e	Make fallback bool into a function ... Allows correct handling now that beatmap skins are also a thing.	2018-03-20 16:40:11 +09:00
Dean Herbert	c38c26eacb	Move combo index processing to BeatmapProcessor	2018-03-20 15:57:43 +09:00
Dean Herbert	cb3d0db555	Move combo colours completely out of HitObjects	2018-03-20 15:50:12 +09:00
Vidalee	fea8f868d7	Fixing hidden test bug	2018-03-17 13:22:58 +01:00
Dean Herbert	7e7f8ed7a2	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:53:16 +09:00
Dean Herbert	23ffee3d38	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:38:52 +09:00
Dean Herbert	46f5c0fc19	Merge branch 'master' into mod-fixes	2018-03-16 15:38:41 +09:00
Dan Balasescu	cdc61d5f0d	Merge branch 'master' into fix-combo-colours	2018-03-16 14:59:45 +09:00
Dean Herbert	7ed84465fb	Merge branch 'master' into mod-fixes	2018-03-16 11:27:39 +09:00
Dean Herbert	a42035f494	Make DrawableHitObject a CompositeDrawable ... No reason for it to be a container.	2018-03-15 13:41:06 +09:00
Dean Herbert	8d433cb4bf	Merge branch 'master' into cursor-trail	2018-03-15 11:14:21 +09:00
Dean Herbert	a0691168cb	Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement	2018-03-14 15:35:24 +09:00
Dean Herbert	81f82d98a1	Rework a lot of naming and structure	2018-03-14 15:18:21 +09:00
Joseph Madamba	d122aa80e4	Edit mods description, multiplier, and code	2018-03-13 20:07:03 -07:00
Dean Herbert	13f64a1d12	Merge branch 'master' into cursor-trail	2018-03-14 11:42:40 +09:00
Vidalee	8a86766324	Changes requests	2018-03-13 23:21:47 +01:00
Dean Herbert	c55d70ec13	Merge branch 'master' into fix-combo-colours	2018-03-13 19:19:45 +09:00
Dean Herbert	e43de68ad3	Move colour parsing to LegacyDecoder	2018-03-13 19:13:50 +09:00
smoogipoo	0c705b0397	Rename to EditorTestCase	2018-03-13 15:57:05 +09:00
Dean Herbert	b93e83e3d2	Merge branch 'master' into base-editor-testcase	2018-03-13 15:53:33 +09:00
Dean Herbert	107ad8cfff	Merge remote-tracking branch 'FreezyLemon/master' into more-skinning	2018-03-12 22:01:59 +09:00
smoogipoo	d2859d779d	Create a base TestCaseEditor for rulests to derive	2018-03-12 19:43:52 +09:00
smoogipoo	8c4bcb4a04	Only accept drag movement on the overlays	2018-03-12 17:33:10 +09:00
smoogipoo	212142429f	Derive from IHasPosition	2018-03-12 17:25:34 +09:00
smoogipoo	2d9fcdcbd0	Fix slider circle overlays moving with the endpoints	2018-03-12 17:18:50 +09:00
Dean Herbert	eb643b690a	Merge branch 'master' into more-skinning	2018-03-12 11:55:50 +09:00
Dean Herbert	d27cf16bf9	Merge remote-tracking branch 'ppy/master' into more-skinning	2018-03-12 10:46:37 +09:00
Dan Balasescu	8ba87dfdbd	Merge branch 'master' into fix-duplicate-judgements	2018-03-12 10:29:50 +09:00
Vidalee	6d9e78a3a3	Review changes	2018-03-11 22:40:49 +01:00
Vidalee	9516bec13d	Fix naming rule	2018-03-11 21:45:15 +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	ccc3c573ab	Fix resharper not fixing	2018-03-11 02:20:00 +09:00
Dean Herbert	5092fe5596	Adjust cursor trail display length ... In line with shader change at ad5ddec7b2	2018-03-11 02:11:56 +09:00
Dean Herbert	df2815f19e	Add TestCase for GameplayCursor	2018-03-11 02:11:25 +09:00
Dean Herbert	487a03d0d7	Merge branch 'master' into cursor-trail	2018-03-11 02:07:05 +09:00
smoogipoo	92b302971f	Trim whitespace	2018-03-10 01:23:53 +09:00
smoogipoo	24501c37dd	Merge branch 'drawableslider-cleanup' into editor-hitobject-movement	2018-03-10 01:15:24 +09:00
smoogipoo	8ed5fce43a	Split out the slider head into a separate drawable hitobject	2018-03-10 01:13:59 +09:00
smoogipoo	376f6eec58	SetPosition -> OffsetPosition	2018-03-10 00:02:13 +09:00
smoogipoo	4a48136e4f	Make hitobject positions adjustable	2018-03-09 23:12:34 +09:00
Dean Herbert	81b778fdcf	Merge branch 'master' into cursor-trail	2018-03-08 09:31:42 +09:00
Dean Herbert	04f5563238	Match HP drain harshness closer to stable ... Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.	2018-03-07 19:37:26 +09: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
Dean Herbert	f2d7621df3	Add skin support for explode/flash layers ... Basically to hide them for legacy skins, though.	2018-03-07 18:21:05 +09:00
Dean Herbert	05eb678654	Add skin support for judgements	2018-03-07 18:21:05 +09:00
Dan Balasescu	1375ee8408	Merge branch 'master' into slider-tick-transform-cleanup	2018-03-07 16:59:04 +09:00
Dean Herbert	4dfd3a61cc	Remove alpha setting	2018-03-06 18:40:39 +09:00
Dean Herbert	7cf1d4450a	SliderTick transform improvements	2018-03-06 18:28:36 +09:00
Dean Herbert	e82cadc811	Make LegacyID nullable ... The -1 default was getting stored to the database.	2018-03-06 17:40:14 +09:00
Dean Herbert	d1a115f4ec	Merge remote-tracking branch 'upstream/master' into cursor-trail	2018-03-05 23:34:04 +09:00
Dean Herbert	3ddaf1879d	CursorTrail always present, just to be safe	2018-03-05 20:20:06 +09:00
Dean Herbert	f4965ee7d6	Use high precision updating on CursorTrail ... Avoids bloackage	2018-03-05 20:20:06 +09:00
Dean Herbert	69c0e95d9d	Use a better fade effect for the gameplay cursor	2018-03-05 20:20:06 +09:00
Dean Herbert	60f851df3e	Add support for DrawInfo alpha when drawing CursorTrail	2018-03-05 20:15:07 +09:00
Dean Herbert	ea6e3938c0	Fix hard crash due to spinner spin requirement being zero ... Resolves #2133.	2018-03-04 03:01:47 +09:00
Dean Herbert	0e928429d4	Merge branch 'master' into ruleset-replayframes	2018-03-04 01:57:43 +09:00
Dean Herbert	06cf9cbd63	Merge branch 'master' into fix-perfectcurve	2018-03-02 21:49:33 +09:00
Dean Herbert	bd9d26921a	Less BeaIBeatmapConvertereatmapConverters	2018-03-02 20:39:43 +09:00
Dean Herbert	22cbbcc639	Merge branch 'master' into beatmap-conversion-testcases	2018-03-02 20:21:41 +09:00
smoogipoo	a2c239d5e3	Rename to IBeatmapConverter, move to separate file	2018-03-02 20:19:47 +09:00
smoogipoo	9fef8a3977	Prettify json	2018-03-02 20:13:48 +09:00
smoogipoo	71755f5363	Prettyfy some JSON	2018-03-02 20:12:29 +09:00
Dean Herbert	ca8e52289b	Merge branch 'master' into fix-hr	2018-03-02 19:37:48 +09:00
smoogipoo	401d3fff7b	Add colinear perfect curve test case	2018-03-02 18:38:57 +09:00
smoogipoo	820a852caf	Remove unnecessary .osu properties	2018-03-02 18:37:38 +09:00
smoogipoo	cdca7371a3	Replace testcases with a basic test suite	2018-03-02 18:20:33 +09:00
Dan Balasescu	4aff659272	Merge branch 'master' into beatmap-conversion-testcases	2018-03-02 16:04:32 +09:00
smoogipoo	3d5fefae8c	Add TestFixtureAttribute to all tests	2018-03-02 15:34:31 +09:00
smoogipoo	6fff6da751	Ignore broken testcases	2018-03-02 14:01:34 +09:00
smoogipoo	2e3ee00c19	Remove unnecessary changes	2018-03-02 13:13:01 +09:00
smoogipoo	573d6d1b5f	Allow multiple mappings to be generated for a single hitobject	2018-03-02 13:13:01 +09:00
smoogipoo	4e363664fd	Add beatmap parameter to beatmapconverter creation	2018-03-02 13:13:01 +09:00
smoogipoo	6f5acaa8f9	Remove unnecessary explicit JsonProperties	2018-03-02 13:13:01 +09:00
smoogipoo	e87be213d5	Adjust lenience a little bit	2018-03-02 13:13:01 +09:00
smoogipoo	797d03a65f	Implement basic structure for beatmap conversion testing	2018-03-02 13:13:00 +09:00
smoogipoo	cb39a88c51	Fix HR not affecting slider repeats and ticks	2018-03-02 00:25:14 +09:00
smoogipoo	49b24c2bbf	Fix HR not properly applying to sliders	2018-03-02 00:19:09 +09:00
Dean Herbert	c54c1699bf	Merge branch 'master' into ruleset-replayframes	2018-03-01 22:26:16 +09:00
Dean Herbert	0704d823a9	Fix slider selection point not being set to new origin	2018-03-01 22:03:00 +09:00
smoogipoo	e62fab6cc2	Fix overlay positions/sizes due to sliders now being fixed	2018-03-01 14:34:31 +09:00
smoogipoo	d5d4bcb558	Merge branch 'master' into editor-hitobject-overlays	2018-03-01 14:04:38 +09:00
smoogipoo	195b6642e6	Reimplement important frames	2018-03-01 02:28:15 +09:00
smoogipoo	cf42d5bbd5	Remove mostly-unused Score parameter	2018-03-01 02:28:14 +09:00
smoogipoo	c9c65cab53	CreateReplayFrame -> CreateConvertibleReplayFrame	2018-03-01 02:28:14 +09:00
smoogipoo	222ae70062	Populate rulesets with their replay frames	2018-03-01 02:28:14 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
Dean Herbert	e2f57ae346	Merge branch 'master' into parser-sanity-checks	2018-03-01 00:38:44 +09:00
Dean Herbert	3609c685d1	Fix approach circle fading	2018-02-28 20:35:15 +09:00
Dean Herbert	065630487a	Fix slider heads fading out too late	2018-02-28 20:12:16 +09:00
Dean Herbert	5b4fef0180	Add bare minimum sanity checking of beatmap input values to make broken maps load ... Resolves ppy/osu#1988.	2018-02-28 18:12:24 +09:00
Dean Herbert	bdd88303b3	Merge branch 'master' into editor-hitobject-overlays	2018-02-26 17:53:50 +09:00
Dean Herbert	1218a75b7f	Improve vector conditional	2018-02-26 16:11:26 +09:00
Dean Herbert	9cbed461c4	Merge branch 'master' into sliderbody-rework	2018-02-26 15:00:18 +09:00
Dean Herbert	f1ddfa0581	Fix sliders never getting a correct lifetime set	2018-02-25 16:25:56 +09:00
smoogipoo	50d1183ec2	Division-by-zero safety + reference our own size	2018-02-24 02:53:02 +09:00
smoogipoo	066abfbdbc	Rename PositionAt -> CurvePositionAt to represent its new meaning	2018-02-24 02:43:36 +09:00
smoogipoo	996e605e61	Remove temporary testcase	2018-02-24 02:39:44 +09:00
smoogipoo	1e1df2aaff	Fix up testcases	2018-02-23 21:04:19 +09:00
smoogipoo	8c90abe0dc	Make slider control points relative to start position	2018-02-23 20:59:27 +09:00
smoogipoo	08bb25347c	Make DrawableSlider contain the slider body	2018-02-23 20:27:05 +09:00
Dean Herbert	84b707f4f8	Add basic hitcircle skinning	2018-02-23 13:38:12 +09:00
Dan Balasescu	6cc54a464c	Merge branch 'master' into editor-hitobject-overlays	2018-02-22 14:25:27 +09:00
smoogipoo	844e87aafe	Use the true head position rather than capturing current position	2018-02-22 14:25:10 +09:00