Commit Graph

215 Commits

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