365 Commits

Author	SHA1	Message	Date
smoogipoo	efa39f38ca	CI fixes	2017-11-30 18:49:08 +09:00
smoogipoo	456bbe25f3	Implement toolbox into HitObjectComposer	2017-11-30 16:58:14 +09:00
smoogipoo	fd3049fd65	Merge remote-tracking branch 'origin/master' into editor-composer	2017-11-30 13:47:47 +09:00
smoogipoo	36be171c29	Fix up/clean up csprojs for C#7 support	2017-11-30 02:06:03 +09:00
smoogipoo	a0c3349935	Add LangVer.props and osu.Game.props for common csproj properties	2017-11-30 00:45:37 +09:00
smoogipoo	309eb4edd7	Integrate HitObjectComposer into Compose ... Also removes the other rulesets' HitObjectComposers for now.	2017-11-29 17:46:21 +09:00
smoogipoo	8c30fd490c	Add HitObjectComposer class	2017-11-29 16:22:11 +09:00
smoogipoo	f807d26cae	Use ranked property of mods rather than checking for individual mods	2017-11-28 21:46:13 +09:00
smoogipoo	7db7fb91dd	Ignore ruleset testcases from CI	2017-11-28 21:45:24 +09:00
smoogipoo	f9ad4b6acb	Make categoryDifficulties return doubles to improve decimal accuracy	2017-11-21 19:55:09 +09:00
smoogipoo	decee415dd	Calculate real AR based on PreEmpt time	2017-11-21 19:54:08 +09:00
smoogipoo	0f8d4a455a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-21 19:18:06 +09:00
Dean Herbert	a2fc5b67ec	Formatting fix	2017-11-21 12:42:28 +09:00
smoogipoo	eb03b0db30	Consider slider lengths as part of Distance	2017-11-17 21:28:59 +09:00
smoogipoo	9260f5b64e	Rework to avoid access to modified closures	2017-11-17 20:57:45 +09:00
smoogipoo	c221cfd30c	Fix slider cursor positions not being taken into account	2017-11-17 20:28:41 +09:00
smoogipoo	c7ffe6fe58	Fix timeRate dividing incorrectly	2017-11-17 20:28:15 +09:00
smoogipoo	5d753427f6	Fix up DT not affecting hitobject densities	2017-11-17 17:28:22 +09:00
smoogipoo	bf44b3d0ef	Cleanups	2017-11-17 16:54:50 +09:00
smoogipoo	825aa6570e	Fix rebase issues	2017-11-17 14:37:19 +09:00
smoogipoo	1e023f0419	Implement PerformanceCalculator testcase	2017-11-17 14:37:19 +09:00
smoogipoo	38fe95d94a	Add basic display for pp in TestCasePerformancePoints	2017-11-17 14:37:19 +09:00
smoogipoo	95fd323c6b	Fix ManiaDifficultyCalculator possibly failing due to nullref	2017-11-17 14:37:06 +09:00
smoogipoo	ac6213d1fa	CI fixes	2017-11-17 14:26:33 +09:00
smoogipoo	7892eefd68	Fix up mod application + beatmap/hitobject references	2017-11-17 14:23:52 +09:00
smoogipoo	18f2e92a48	Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator	2017-11-17 12:36:13 +09:00
smoogipoo	62155e6dd5	Make DifficultyCalculator support mod applications ... Fixes https://github.com/ppy/osu/issues/476.	2017-11-17 12:36:07 +09:00
smoogipoo	66ee9d1631	Update in-line with framework changes	2017-11-09 17:04:04 +09:00
smoogipoo	348083f589	Update with framework state transformation ... Removes explicit initial state setting in DrawableOsuHitObjects.	2017-11-09 14:05:05 +09:00
smoogipoo	c7426ebed8	Fix spinners showing very weird numbers after rewinding ... Fixes #1462	2017-11-06 17:22:22 +09:00
smoogipoo	4854302aaa	Fix follow points not showing up again after rewinding ... Fixes #1463.	2017-11-04 01:02:33 +09:00
smoogipoo	5fd3115142	Fix slider ball not animating fade/scale after rewinding ... Fixes #1455	2017-11-03 15:58:12 +09:00
smoogipoo	60048e6cd1	Fix slider ticks not showing up again once replayed ... Fixes #1456	2017-11-03 15:33:24 +09:00
smoogipoo	06a62edeb6	Make DrawableRepeatPoints show up when replayed ... Fixes #1458	2017-11-03 15:30:46 +09:00
smoogipoo	70ea3e5025	Fix up initial scale of DrawableRepeatPoint	2017-11-03 15:29:16 +09:00
smoogipoo	240997e4fb	Remove duplicate property	2017-11-02 21:56:18 +09:00
smoogipoo	fe00ac7e41	Make DrawableHitObject/ScoreProcessor support rewinding	2017-11-02 21:21:07 +09:00
smoogipoo	6883b3742f	Make initial DrawableOsuHitObject initial states not use transforms	2017-11-02 20:23:28 +09:00
Dean Herbert	bbc5c05055	Disable ruleset-level tests for now	2017-10-23 21:25:54 +09:00
Dean Herbert	ad685bd919	Merge branch 'master' into sliderbouncers	2017-10-22 14:12:03 +09:00
Dean Herbert	36af0dc809	Update app config for rulesets	2017-10-19 14:59:11 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	179542daf1	Standardise AssemblyInfos	2017-10-14 15:02:20 +09:00
Dean Herbert	c5046f6b3c	Add back osu.Desktop project ... While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day. This allows for the project to build again with default visual studio settings.	2017-10-14 14:33:05 +09:00
Shawdooow	a0cb624c9d	start at 1	2017-10-12 10:28:55 -04:00
Dean Herbert	1b031ca328	Fix potential read from empty queue in SPM counter	2017-10-12 18:28:26 +09:00
Dean Herbert	2b309be3c2	Merge remote-tracking branch 'upstream/master' into spm-counter	2017-10-11 11:23:09 +09:00
Dean Herbert	e76961a932	Remove unnecessary bool	2017-10-11 11:23:02 +09:00
Dean Herbert	1fc16693d6	Formatting	2017-10-11 11:20:44 +09:00
Dean Herbert	d5892cf54e	Add a bool to specify whether judgements should be visible for certain DrawableHitObjects	2017-10-09 20:17:05 +09:00
Huo Yaoyuan	09093013a7	Move spm calculation into counter.	2017-10-07 15:58:53 +08:00
Huo Yaoyuan	a876ab9b90	Move spm counter to a seperated control.	2017-10-07 15:31:42 +08:00
Huo Yaoyuan	404c4917dc	Use single queue for spinning record.	2017-10-06 20:42:24 +08:00
Huo Yaoyuan	29f9c8143d	Use RotationAbsolute to calculate spm.	2017-10-05 20:08:45 +08:00
Huo Yaoyuan	ee8746b848	Fade in spm texts.	2017-10-05 20:07:33 +08:00
Huo Yaoyuan	24187cc53a	Move spm text out of scaled parts.	2017-10-05 19:55:20 +08:00
Huo Yaoyuan	134e1299bb	Update spm value when spinner not active.	2017-10-05 19:23:58 +08:00
Huo Yaoyuan	3de42ee405	Smooth spm values into a time range.	2017-09-30 15:23:10 +08:00
Huo Yaoyuan	e2e26c91af	Show SPM value basically.	2017-09-29 22:30:41 +08:00
Huo Yaoyuan	40a27c810a	Calculate SPM in spinner disc.	2017-09-29 19:24:14 +08:00
Shawdooow	cfb1804aa1	address review	2017-09-27 11:28:44 -04:00
Shawdooow	4e8944de04	fix maps ending early	2017-09-26 22:54:33 -04:00
Shawdooow	801fa39145	remove old SliderBouncer	2017-09-26 12:23:13 -04:00
Shawdooow	b5ad6ae735	appveyor fixes	2017-09-26 12:21:39 -04:00
Shawdooow	adebe166d4	slider bouncers	2017-09-26 12:13:34 -04:00
Dean Herbert	e0911f014e	Fix ruleset target path for release builds	2017-09-19 22:50:36 +09:00
Dean Herbert	d192c2d83b	Merge remote-tracking branch 'upstream/master' into ctb-improvements	2017-09-19 20:54:39 +09:00
Dean Herbert	99b512cce5	Output ruleset assemblies to the game folder rather than adding special logic	2017-09-19 19:27:14 +09:00
Dean Herbert	1f20c5eb69	Optimise project references	2017-09-19 16:07:00 +09:00
Dean Herbert	8fa76557db	Avoid unnecessary dll copies	2017-09-19 16:06:59 +09:00
Dean Herbert	6db705a3a8	Update relative paths	2017-09-19 16:06:58 +09:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
Dean Herbert	8ccbc07dec	Remove unnecessary constructor	2017-09-15 20:54:46 +09:00
Dean Herbert	b78c516b74	Merge branch 'master' into scoring-revamp	2017-09-13 20:47:14 +09:00
Dean Herbert	25f2a102f4	Fix CI issue	2017-09-13 20:35:44 +09:00
Dean Herbert	fb7740a3ab	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
smoogipooo	5e32d95ad2	Remove Ruleset's CreateScoreProcessor method	2017-09-13 16:37:05 +09:00
smoogipooo	093d82ac45	Set depths from playfield add methods instead of DrawableHitObject	2017-09-13 16:17:01 +09:00
smoogipooo	e146bcacf1	Make BasePortion and ComboPortion constants	2017-09-13 16:13:27 +09:00
smoogipooo	ba3e44cd71	Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)	2017-09-13 15:17:32 +09:00
smoogipooo	7b30fc8a09	Fix osu! slider initial circles being placed at the wrong depth.	2017-09-13 00:43:30 +09:00
smoogipooo	3386dbb243	Fix incorrect HitResult for slider ticks.	2017-09-13 00:37:18 +09:00
smoogipooo	7b44ad300f	Remove accurateHits, make Accuracy once again tied to comboScore	2017-09-13 00:33:01 +09:00
smoogipooo	b5f48c2368	Add storeResults as a parameter to Reset ... Whether to store the current state of the ScoreProcessor for future use.	2017-09-12 22:27:27 +09:00
smoogipooo	2e0218f388	Move AllObjectsJudged into ScoreProcessor as AllJudged ... Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.	2017-09-12 22:01:08 +09:00
smoogipooo	cc6bb81a73	Reimplement Exponential scoring with a simpler and more intuitive calculation ... Default for all rulesets for now.	2017-09-12 21:47:09 +09:00
smoogipooo	d0774c7bc6	ComputeTargets -> SimulateAutoplay + improve xmldoc	2017-09-12 21:16:47 +09:00
smoogipooo	abab2a4878	Revamp score processing to once more unify scoring methods	2017-09-12 21:05:50 +09:00
smoogipooo	0b94939474	Make Accuracy = 1, Health = 1 the default for ScoreProcessor	2017-09-12 20:53:26 +09:00
smoogipooo	d070fb8063	Actually make DrawableSliderTick return an OsuJudgement now	2017-09-12 19:48:35 +09:00
smoogipooo	c7677d896a	Remove SliderTickJudgement	2017-09-12 19:47:44 +09:00
Dean Herbert	86de4fa2e2	Apply CI fixes	2017-09-12 18:36:19 +09:00
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +09:00
Dean Herbert	d7ac02d090	Ensure judgements aren't updated when ArmedState is not idle	2017-09-12 18:00:41 +09:00
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
smoogipooo	58c875bdca	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 15:02:12 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	3cacee300a	Fix a false resharper positive	2017-09-11 11:41:29 +09:00
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	29941019a5	Hacky way to make osu! and taiko work again.	2017-09-06 17:44:51 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
Dean Herbert	081b98ef39	"Use" the hitobject ... Obviously temporary.	2017-09-05 21:41:20 +09:00
Dean Herbert	0fc2e49ce6	Remove second calculateScore call	2017-09-05 19:33:20 +09:00
Dean Herbert	d69b8d7784	Add basic combo score factor to osu! ruleset	2017-09-05 17:09:58 +09:00
Dean Herbert	ed0f2a654b	Rename variable	2017-09-04 18:51:50 +09:00
Akash Mozumdar	c6b226b017	refactor	2017-09-01 15:32:03 -04:00
Akash Mozumdar	080bdf808c	Merge branch 'master' of https://github.com/Artikash/osu	2017-08-31 21:35:59 -04:00
Akash Mozumdar	472710e5db	trim whitespace	2017-08-31 21:35:30 -04:00
Akash Mozumdar	04596fee61	Update OsuScoreProcessor.cs	2017-08-31 08:26:06 -04:00
Akash Mozumdar	af2f45a980	slight edits	2017-08-31 04:44:00 -04:00
Akash Mozumdar	cbc35e0cf3	implemented hp	2017-08-31 04:31:48 -04:00
Akash Mozumdar	d252af8ab4	basic implementation of hp	2017-08-31 02:36:25 -04:00
Dean Herbert	1b0a1dd410	Add missing licence header	2017-08-24 20:37:03 +09:00
Dean Herbert	a7a7e0323f	Update autoplay and replay handling to result in actions, not keys	2017-08-24 15:36:42 +09:00
smoogipooo	56292bd7f0	Use constant definition.	2017-08-23 16:54:06 +09:00
smoogipooo	42e6865493	Flip hit objects.	2017-08-23 16:35:30 +09:00
Dean Herbert	ea450fecf5	Merge branch 'master' into action-key-counter	2017-08-21 16:25:44 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
Dean Herbert	09b5eef26e	Fix incorrect osu! defaults	2017-08-20 21:56:28 +09:00
Dean Herbert	aebda8b032	Merge branch 'master' into fix-slider-tracking-outside-follow-circle	2017-08-20 18:27:38 +09:00
Shane Woolcock	71ddbd22a1	Convert ReceiveMouseInputAt override to lambda syntax, and make Tracking property private set	2017-08-20 14:00:53 +09:30
Shane Woolcock	51af233d66	Fix sliders not checking the correct cursor position once it moves out of the follow circle	2017-08-19 12:19:37 +09:30
Dean Herbert	f829caf197	Fix custom logic still existing in OsuInputManager	2017-08-19 07:24:29 +09:00
MrTheMake	6d401b5f21	Merge branch 'master' into leaderboard-scores	2017-08-19 00:00:40 +02:00
Dean Herbert	a8996b8b5f	Merge branch 'master' into fix-sliders-ignoring-actions	2017-08-19 00:30:40 +09:00
Dean Herbert	d6249e7a63	Add support for binding mouse buttons to actions	2017-08-18 20:01:41 +09:00
Shane Woolcock	7e0fe6cbcb	Fix slider tracking to use pressed actions rather than directly querying the mouse buttons	2017-08-18 20:19:23 +09:30
Shane Woolcock	9558d2a161	Remove unnecessary using	2017-08-18 19:39:28 +09:30
Shane Woolcock	44feef78f1	Simplify OsuActionInputManager property	2017-08-18 19:32:08 +09:30
Shane Woolcock	529732ea47	More CI fixes	2017-08-18 16:58:01 +09:30
Shane Woolcock	90dacd9861	Trim whitespace	2017-08-18 16:49:10 +09:30
Shane Woolcock	9628c0b6d6	Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler	2017-08-18 16:46:00 +09:30
Shane Woolcock	9c6ca2d159	Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists	2017-08-18 16:34:01 +09:30
Shane Woolcock	f951120775	Merge branch 'master' into fix-spinner-ignoring-actions	2017-08-18 16:25:26 +09:30
Dean Herbert	a44ff5a2c2	Fix regression causing global hotkeys to no longer work	2017-08-17 17:47:44 +09:00
Dan Balasescu	f7ccc81875	Merge branch 'master' into fix-spinner-ignoring-actions	2017-08-17 12:33:18 +09:00
Shane Woolcock	b1abf83fee	Change spinner action checks to switches	2017-08-16 17:51:57 +09:30
Shane Woolcock	9448e2f192	Remove unnecessary OnMouseDown/Up from SpinnerDisc	2017-08-16 17:25:48 +09:30
Dean Herbert	89987229de	Merge remote-tracking branch 'origin/is-alive' into key-config-settings	2017-08-16 15:49:43 +09:00
Shane Woolcock	9e5deb63d1	Fix spinner not handling left/right action bindings	2017-08-15 16:42:26 +09:30
Dean Herbert	97ac8e1a64	Update usages of IsAlive/IsLoaded in line with framework changes	2017-08-15 13:57:48 +09:00
Dean Herbert	7c9d6c9c83	Initial refactoring of key binding logic	2017-08-14 20:19:25 +09:00
MrTheMake	81289db33b	CI fix, fixed nullref and removed abstraction of GetAutoplayMod	2017-08-13 20:12:01 +02:00
MrTheMake	d9c26f98c7	Suggested changes	2017-08-13 19:54:07 +02:00