Shawdooow
064758b96d
fixes
2017-12-31 11:30:58 -05:00
Shawdooow
3ba5dce052
new Approach to approach rate
2017-12-31 11:15:14 -05:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Aergwyn
138d78309f
add HitCount enum and replace string usage with enum
2017-12-30 18:07:30 +01:00
Dean Herbert
233904ddef
Merge branch 'master' into scaling-repeat-points
2017-12-30 18:09:32 +09:00
Aergwyn
1f71bd3425
scale the correct part of the repeat point
2017-12-30 09:05:40 +01:00
Dean Herbert
0bd1b75d0b
Fix test case
2017-12-30 15:38:10 +09:00
Dean Herbert
7f54778fed
Merge branch 'master' into hitobject-constructor-safety
2017-12-30 15:32:36 +09:00
Dean Herbert
a2840d2519
Fix FadeInDuration not being passed down to sliders' InitialCircle
2017-12-30 15:21:25 +09:00
Dean Herbert
a0966305d4
Remove unnecessary new event
2017-12-30 14:46:44 +09:00
smoogipoo
b99e0a0439
Fix DrawableHitCircle accepting a base OsuHitObject parameter
...
Fixes #1778 .
2017-12-30 14:15:42 +09:00
Aergwyn
52dd5ddba6
fix repeat points not scaling properly
2017-12-29 20:03:43 +01:00
Aergwyn
0a2e41884e
add more required types for test slider
2017-12-29 20:01:26 +01:00
Aergwyn
5e887240ae
actually use option to override values...
2017-12-29 18:04:40 +01:00
Aergwyn
6c6fa08a06
added some colour to testsliders
...
gray just wasn't sticking out well
2017-12-29 17:56:48 +01:00
Aergwyn
07040f9fd1
rename field
2017-12-29 17:52:28 +01:00
Aergwyn
5c3b67bcef
remove unnecessary values
2017-12-29 17:51:59 +01:00
Aergwyn
f547c7986d
created option to override values before UpdateState is called
2017-12-29 17:50:55 +01:00
Aergwyn
a58b5ff5f2
simplify sequence
2017-12-29 17:46:22 +01:00
Aergwyn
ca9f014714
add required types to testclasses
2017-12-29 17:44:38 +01:00
Aergwyn
b200134a18
fix spinner easing with hidden
2017-12-29 17:44:10 +01:00
Dean Herbert
db8228f69d
Don't think we need this expire call
2017-12-29 18:57:38 +09:00
Dean Herbert
a4f941cdf1
Move lifetime adjustment to DrawableHitCircle
2017-12-29 18:51:14 +09:00
Dean Herbert
dd2ae3f701
SImplify everything
2017-12-29 18:48:10 +09:00
Dean Herbert
0ae00cbd17
Rename one more variable
2017-12-29 18:28:16 +09:00
Dean Herbert
ced2d9749d
Adjust presets and rename more
2017-12-29 18:25:33 +09:00
Dean Herbert
c9d4da65d2
Simplify and rename time variables
2017-12-29 18:06:41 +09:00
Dean Herbert
27cb445c24
Always recrusively apply custom sequence to nested hitobjects
2017-12-29 17:48:05 +09:00
Dean Herbert
2c61ebbcd9
Remove unnecessary local derived classes
2017-12-29 17:10:33 +09:00
Dean Herbert
b74248a705
Rename application method
2017-12-29 16:22:06 +09:00
Dean Herbert
3f8f778004
Merge branch 'master' into standard-hd-support
2017-12-29 15:56:38 +09:00
Dean Herbert
2ca10b28c6
Use a non-broken opentk library
2017-12-29 15:42:51 +09:00
Aergwyn
ca650e8d48
extend TestCaseSpinner with new steps
...
- Hidden, Size and Scale
2017-12-28 18:21:08 +01:00
Aergwyn
8d5f4d4f19
extend TestCaseSlider with new steps
...
- Hidden, Size and Scale
- made Repeats an SliderStep instead
2017-12-28 18:09:35 +01:00
Aergwyn
cd237da6d3
extend TestCaseHitCircle with new steps
...
- Hidden, Size and Scale
- also fix Auto still missing because no judgement was created
2017-12-28 17:06:15 +01:00
Aergwyn
0b23ceb781
fix slider fade out to be eased
...
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
Aergwyn
dbcf87267d
Merge branch 'master' into standard-hd-support
2017-12-27 21:26:39 +01:00
Aergwyn
e42fa7205b
adjust spinner sequence to the new fadeout speed
2017-12-27 21:23:56 +01:00
Aergwyn
7d29c076d2
fix circles and slider sequences
...
+ minor cleanup
2017-12-27 21:12:02 +01:00
smoogipoo
7b06c16e70
Display larger hitcircles
2017-12-27 23:44:51 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
smoogipoo
6fe20bb910
Ignore test cases for CI
2017-12-27 20:41:59 +09:00
smoogipoo
1a5cf98e0c
Fix repeat points always being placed at end position of th slider
...
PositionAt is clamped to [0, 1] where 0 denotes the beginning of the curve and 1 denotes the end of the curve. It has no concept of repeats.
2017-12-27 20:40:38 +09:00
smoogipoo
c18fd5da48
Simplify creation of repeat points
2017-12-27 20:37:28 +09:00
smoogipoo
5b45d36fef
Decomission TestCaseHitObjects
2017-12-27 20:09:33 +09:00
smoogipoo
4c032df677
Move sliderbars to the end of the testcase buttons
2017-12-27 20:08:33 +09:00
smoogipoo
ccaf63a437
Add a Spinner testcase
2017-12-27 20:01:20 +09:00
smoogipoo
fdafc2107e
Cleanups + add auto to TestCaseHitCircle
2017-12-27 19:47:55 +09:00
smoogipoo
4d5216da00
Finish up implementation of TestCaseSlider
2017-12-27 19:47:42 +09:00
smoogipoo
cb18baa4d8
Add HitCircle/Slider testcases
2017-12-27 17:34:07 +09:00
smoogipoo
ce18a0705d
Merge remote-tracking branch 'origin/master' into sliderbouncers-fix
2017-12-27 16:48:04 +09:00
smoogipoo
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
Aergwyn
4c2554595e
implement hidden (mostly)
...
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Aergwyn
f5d4ed2a22
add interface to adjust DrawableHitObjects
2017-12-26 11:49:42 +01:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
Shawdooow
72b5a370da
dont play the same sound twice at once
2017-12-23 23:13:53 -05:00
Shawdooow
af2a2781e7
fix the fix harder
2017-12-23 23:12:10 -05:00
Shawdooow
d333fc5efe
fix the fix
...
silly me, that was configured for vitaru!
2017-12-23 23:08:55 -05:00
Shawdooow
a656656403
the fix
2017-12-23 22:47:32 -05:00
Aergwyn
47c75d01ce
access list with index instead of using LINQ
2017-12-23 13:30:44 +01:00
Aergwyn
c5aba9f247
add Samples to RepeatPoint construction
2017-12-23 12:32:21 +01:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization
2017-12-22 22:45:00 +09:00
smoogipoo
def2e5bd17
Make editor discard approach circles
...
Temporary solution for now.
2017-12-22 22:16:54 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09:00
Dean Herbert
0121692919
Ignore bugged inspectcode inspection
2017-12-21 23:14:42 +09:00
smoogipoo
ac1d27e925
Fix possible nullref exceptions
2017-12-21 23:02:46 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
smoogipoo
a3fcc0b60c
Back to using SortedLists
2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
Dean Herbert
020d272636
Make all TestCases public
2017-12-20 21:51:00 +09:00
smoogipoo
2c1a83f82e
Merge branch 'master' into editor-selection-tool
2017-12-15 13:36:47 +09:00
Aergwyn
f329b1ed72
add Spinner Count to BeatmapInfoWedge
...
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
2017-12-14 19:55:15 +01:00
smoogipoo
6a690908cf
Fix up possible nullref due to early access of Parent
2017-12-14 20:24:24 +09:00
smoogipoo
9c59db4be3
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-14 14:20:49 +09:00
smoogipoo
345b67ac85
Remove unnecessary .Except
2017-12-14 12:46:02 +09:00
Aergwyn
d4cd835419
correctly count HitObjects for their type
...
also legacy classes are internal again
2017-12-13 16:32:32 +01:00
Aergwyn
c6eaaf658e
fix BeatmapInfoWedge not counting Circles/Sliders correctly
2017-12-12 13:24:18 +01:00
smoogipoo
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
smoogipoo
7189446943
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-11 16:34:27 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
smoogipoo
ed81ed7c54
Add back HandleInput disable overrides
2017-12-11 15:19:00 +09:00
Dean Herbert
de1f51269d
Merge branch 'master' into HandleInput
2017-12-11 13:53:33 +09:00
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03:00
FreezyLemon
4a723f7382
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
smoogipoo
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
Dean Herbert
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +09:00
smoogipoo
cf859a6cf2
Make the dragger attach to objects it surrounds
...
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
smoogipoo
a30270658d
Merge remote-tracking branch 'origin/master' into netstandard
2017-12-01 18:50:28 +09:00
smoogipoo
677f3653eb
Hide osu! playfield cursor
2017-11-30 19:19:34 +09:00
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
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +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
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +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
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
a2fc5b67ec
Formatting fix
2017-11-21 12:42:28 +09:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
smoogipoo
756f6f2d16
Remove net461 targets
2017-11-20 10:10:28 +09:00
smoogipoo
067c018422
Cleanups
2017-11-19 17:31:35 +09:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +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
f461f03b08
Make osu! compile with framework changes
2017-11-16 14:51:31 +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
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Dean Herbert
99458aab48
Propagate framework updates
2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
798fff00b2
Remove shortcomings, remove InputState.Data usage, make everything amazing
...
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
1fe273cbc0
Move GameplayCursor to osu! ruleset and make work with OsuActions
2017-08-10 18:37:41 +09:00
Dean Herbert
e9a11ebc9f
Use new population methods and implement osu! ruleset actions
2017-08-10 18:31:12 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
smoogipooo
cae21869d0
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍 .
2017-08-08 17:37:11 +09:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904
Update framework
2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
Thomas Müller
440878945e
Remove remaining usages of AddDelay
2017-07-17 18:16:15 +03:00
Thomas Müller
546efc0181
Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu
2017-07-17 17:05:24 +03:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737
Try different formatting style
2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4
Replace several usages of BeginDelayedSequence with LINQ-style
2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72
Update framework
2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
d3f5de9bf9
Move to UI namespace
2017-07-13 15:44:42 +09:00
Dean Herbert
25344d2345
Fix incorrect header
2017-07-13 15:43:18 +09:00
Dean Herbert
fc28617099
Merge remote-tracking branch 'upstream/master' into ruleset-settings
2017-07-13 15:35:53 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Jorolf
f7c9e449d4
add ruleset settings
2017-07-11 20:25:24 +02:00
Dean Herbert
0e2dc9388a
More changes in-line with framework changes.
2017-07-10 12:55:47 +09:00
Dean Herbert
7952e7caa9
Fix typos
2017-07-10 03:22:08 +09:00
Dean Herbert
2c8b8c3f9c
Update loop logic in line with framework changes
2017-07-09 18:23:34 +09:00
Thomas Müller
bb15bc0467
Use ReceiveMouseInputAt whenever possible
2017-06-30 09:54:03 +03:00
Dean Herbert
7baa2b7421
Fix CI issues
2017-06-25 14:46:59 +09:00
Thomas Müller
e3489928b7
Remove now obsolete InternalContains
2017-06-24 09:21:08 +02:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5
Update nuget packages
...
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
Drezi126
9d915a691d
Fix comment placement.
2017-06-08 00:17:58 +02:00
Péter Nemes
a0bdab9f0d
Aaand docs again.
2017-06-07 20:29:03 +02:00
Péter Nemes
1f311cca06
Fix cref in comment.
2017-06-06 19:09:26 +02:00
Péter Nemes
93f654a539
More docs, better docs.
2017-06-06 18:59:46 +02:00
Péter Nemes
ce0d70d651
Whitespace fix.
2017-06-06 15:52:33 +02:00
Péter Nemes
01585027b1
OsuDifficultyBeatmap enumeration logic made clearer, more documentation added.
2017-06-06 15:39:37 +02:00
Péter Nemes
afb4443763
Capitalised protected members, added readonly modifiers.
2017-06-06 01:08:34 +02:00
Péter Nemes
f9441a7419
Fix typo and whitespace.
2017-06-06 00:07:00 +02:00
Péter Nemes
c624712f2f
Refactor ppv2 to allow integration of pp+ features.
2017-06-05 23:45:22 +02:00
Shawdooow
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
Dean Herbert
5cb6963940
Make spinners easier for now
...
The underlying spin counting doesn't match stabnle, so they have been near impossible to complete until now.
2017-05-24 22:08:46 +09:00
smoogipooo
836bf930a0
More cleanups.
2017-05-23 15:29:38 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
82cf94bbff
Move spinner colours to local definition for now
...
We don't want to start polluting the OsuColours namespace with non-UI colours.
2017-05-22 09:50:45 +09:00
Dean Herbert
8f3ab79918
Simplify SpinnerTicks & CI fixes
2017-05-21 17:31:35 +09:00
Dean Herbert
95498fe6df
Adjust spinner colours making use of EdgeEffect.Hollow
2017-05-21 17:21:49 +09:00
Dean Herbert
da31d129ee
Merge branch 'master' into mania-beatmap-conversion
2017-05-19 18:18:59 +09:00
smoogipooo
7b05930fc2
Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
...
This reverts commit 6821197a6a
2017-05-19 17:38:06 +09:00
smoogipooo
6821197a6a
Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects.
2017-05-19 16:40:01 +09:00
smoogipooo
67cf64062a
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
2017-05-19 16:02:40 +09:00
Dean Herbert
85339ace02
Merge branch 'master' into auto-fix
2017-05-19 13:54:32 +09:00
Dean Herbert
3004a44b98
Further colour adjustments
2017-05-18 22:21:41 +09:00
Dean Herbert
c78dfb4a13
Oops colours were wrong
2017-05-18 21:56:19 +09:00
Dean Herbert
e3ae2bca6d
Design improvements
...
paired with smoogi
2017-05-18 21:38:19 +09:00
Dean Herbert
4100c4fe9f
Fix order of methods
2017-05-18 21:04:09 +09:00
Dean Herbert
ae676b48b2
Fix whitespace
2017-05-18 19:51:45 +09:00
Dean Herbert
9cd41c0e87
Spinner design refresh
2017-05-18 19:42:20 +09:00
MrTheMake
58ebb24032
Use the end position of a previous note stack rather than the start position.
2017-05-18 02:17:49 +02:00
MrTheMake
91859042e8
Fix not all cases of the auto replay generator fix being covered.
2017-05-18 02:15:16 +02:00
MrTheMake
817bae3219
Fixes the auto mod not hitting stacks of notes on certain maps.
2017-05-18 01:54:17 +02:00
Dean Herbert
240d73bbf1
Merge branch 'master' into mod_fix
2017-05-15 11:59:19 +09:00
Dean Herbert
622b155fda
OsuConfig -> OsuSetting
2017-05-15 10:56:27 +09:00
EVAST9919
7055c99df0
Added default value
2017-05-14 09:36:09 +03:00
EVAST9919
a4d5660e41
Cast SpinsRequired value to int
2017-05-14 09:22:49 +03:00
EVAST9919
ef23405733
Applied suggested changes
2017-05-14 06:45:35 +03:00
EVAST9919
6d9e11a74f
CI fixes
2017-05-13 03:10:13 +03:00
EVAST9919
5532d3ec49
storing OD value only
2017-05-13 03:04:40 +03:00
EVAST9919
86ebd9d663
spinner's progress depends on current map OD now
2017-05-13 02:51:58 +03:00
EVAST9919
19728b3d98
Fixed IncompatibleMods for OsuModAutoplay
2017-05-12 15:13:02 +03:00
Huo Yaoyuan
4f8549f220
Standardise usages of exceptions.
2017-05-07 00:38:17 +08:00
Thomas Tan
6ea6130fee
CodeFactor fixes
2017-04-29 02:41:20 +08:00
Thomas Tan
d742092d9d
CI fixes
2017-04-29 02:30:34 +08:00
Thomas Tan
9b8b88601f
Create "AutoGenerator" base class and interface.
2017-04-29 02:08:48 +08:00
Thomas Tan
2af6c7aa00
Fix build errors o.o
2017-04-29 00:21:33 +08:00
Thomas Tan
fede3de8a0
Merge branch 'master' into autoreplay-refactor-squashed
2017-04-29 00:17:18 +08:00
Thomas Tan
18897235fa
Remove tab characters
2017-04-29 00:15:53 +08:00
Thomas Tan
e56bd3430a
Move some common functionality to OsuAutoReplayBase.cs
2017-04-28 23:19:15 +08:00
Dean Herbert
220c602218
Fix incorrect modifier order.
2017-04-28 13:27:20 +09:00
Thomas Tan
6392fcbc5d
Merge branch 'master' into autoreplay-refactor-squashed
2017-04-27 23:04:52 +08:00
Dean Herbert
12c0a17711
Make FollowPoints dumb; use absolute sequence at renderer level.
2017-04-27 18:07:10 +09:00
Dean Herbert
4ab636cbb8
Update osu! drawables to use TransformSequences.
2017-04-27 17:37:38 +09:00
Dan Balasescu
df5a95b675
Merge branch 'master' into fix-mouse-button-disable
2017-04-26 19:53:13 +09:00
Dean Herbert
f48d497737
Fix disabling mouse buttons causing auto to stop working.
2017-04-26 18:56:20 +09:00
smoogipooo
28f7e0cdba
Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.
2017-04-26 14:12:21 +09:00
Dan Balasescu
99db871e6c
Update OsuDifficultyCalculator.cs
2017-04-22 20:59:35 +09:00
smoogipooo
1bb0b96ddc
Make IHasCurve not depend on a SliderCurve object.
2017-04-22 20:43:20 +09:00
Thomas Tan
9432f9879d
Refactor OsuAutoReplay.cs
...
- Some trivial refactors
Rename targetPosition to startPosition, move frameDelay and
reactionTime to private readonly fields, and added 2 comments
- Split main loop into 2 functions.
One is the function to add a delay from the previous hit object if the
current one hasn't appeared yet for auto to "see and react to"
- The other function does everything else.
- Rename and comment stuff in spinner startPosition alg.
- Move movement to start of hitobject logic out
- Rename the functions I took out
- Move spinner start pos calc out.
- Move clicking object logic out
- Fix formatting
- Add private keyword
- Change ref to out
- Change some outdated comments
2017-04-22 10:38:20 +08:00
smoogipooo
d7477955ac
CI fixes.
2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8
Remove CurvedHitObject to make RepeatSamples not tied to curve.
2017-04-21 20:40:11 +09:00
smoogipooo
748f13501a
Remove HeadSamples and TailSamples, combine into RepeatSamples.
2017-04-21 20:04:40 +09:00
smoogipooo
a999c42d8a
Split slider samples into head + tail + repeats + body (the original HitObject.Samples).
2017-04-21 18:49:49 +09:00
smoogipooo
ca824de91c
Implement RepeatSamples in IHasRepeats.
2017-04-21 16:18:34 +09:00
smoogipooo
b65b2bdf4c
Simplify assignment.
2017-04-20 18:29:55 +09:00
smoogipooo
61090d918c
Temporary for taiko lagging on auto replays due to inImportantSection.
...
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
2017-04-20 15:26:42 +09:00
Dean Herbert
2d5f0f6b76
Fix off-by-one counts.
2017-04-20 11:23:40 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation.
2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary).
2017-04-20 11:03:11 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!).
2017-04-19 16:29:27 +09:00
Dean Herbert
662544e04f
Merge branch 'master' into results-screen
...
# Conflicts:
# osu.Game/Rulesets/Replays/Replay.cs
2017-04-19 16:25:31 +09:00
Dean Herbert
cef6a014d5
Add a simulated key-up delay to auto replays.
...
Fixes key counter display looking odd.
2017-04-18 22:31:52 +09:00
Dean Herbert
705e66c7a1
Fix spinners becoming wonky.
2017-04-18 22:29:58 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play.
2017-04-18 22:22:14 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
