1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 13:02:55 +08:00
Commit Graph

459 Commits

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