1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:55:37 +08:00
Commit Graph

864 Commits

Author SHA1 Message Date
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
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale 2018-02-22 14:14:41 +09:00
smoogipoo
604b0fa20a Fix post-merge issues 2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8 Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:08:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement 2018-02-22 13:19:39 +09:00
Dean Herbert
3b4e4bd110 Merge remote-tracking branch 'upstream/master' into general-slider-improvements 2018-02-22 12:28:33 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
08e52e8c15 Remove unnecessary schedules 2018-02-21 18:02:52 +09:00
smoogipoo
9cd9c83f2c Allow changing accentcolour/bordercolour post-load 2018-02-21 18:00:46 +09:00
smoogipoo
0d60a65c94 Fix OsuAutoGenerator not considering stacking 2018-02-21 17:53:16 +09:00
smoogipoo
f903e6d241 Fix stacking not working with sliders
Fixes #2093.
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da Clean up and document better what "progress" means 2018-02-21 17:10:18 +09:00
Dean Herbert
50d0278cbd
Merge branch 'master' into general-slider-improvements 2018-02-21 11:28:45 +09:00
smoogipoo
9a9f53ddfd Remove 0.75 scale from osu! playfield in the editor 2018-02-21 11:10:43 +09:00
smoogipoo
4934ef7429 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-21 11:07:42 +09:00
smoogipoo
7fe0989427 Merge branch 'general-slider-improvements' into editor-hitobject-overlays 2018-02-20 23:51:47 +09:00
smoogipoo
ee055b8e5c Allow customizing the snake-ability of sliders 2018-02-20 20:53:06 +09:00
smoogipoo
8270e4d758 Add BorderColour to SliderBody 2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
Dan Balasescu
3d7f998c9b
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-20 14:07:04 +09:00
smoogipoo
8f25a5da66 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-20 14:01:33 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
smoogipoo
ef11ce3dd1 Remove Size override from OsuPlayfield 2018-02-19 17:02:27 +09:00
Dean Herbert
58af66bfc0 Merge branch 'master' into editor-hitobject-movement 2018-02-16 13:59:11 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments 2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869 fade slider ticks with hidden mod 2018-02-11 11:03:01 +01:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff Make slider tails not play hitsounds 2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
Dean Herbert
62547dba51 Remove redundant test method 2018-02-06 18:15:21 +09:00
Dean Herbert
3d0ef8b3bd Move property back to local variable
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17 Adjust appear animations of repeats and ticks 2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f Adjust scale out effect 2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d Simplify iteration code 2018-02-06 17:46:45 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
ColdVolcano
bf26fc94d8 Merge branch 'master' into repeat-points 2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261 Make osu! use HitWindows 2018-02-02 20:33:59 +09:00
smoogipoo
13f16077d4 Implement Catmull-Rom curve approximator 2018-02-01 20:04:41 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix 2018-02-01 18:44:04 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late 2018-02-01 18:28:42 +09:00
Dean Herbert
b8f6dcffaf Merge remote-tracking branch 'upstream/master' into repeat-points 2018-02-01 13:32:53 +09:00
ColdVolcano
b656858ee6 Fix typos 2018-01-31 21:32:10 -06:00
ColdVolcano
06b615c474 Merge branch 'master' into repeat-points 2018-01-31 21:30:28 -06:00
smoogipoo
00001364c3 Better judgement visualisations in testcase 2018-01-30 18:10:14 +09:00
smoogipoo
cd4a0612c0 Properly construct slider ends using HitObject.AddNested 2018-01-30 16:53:19 +09:00
smoogipoo
4b63d25871 Add hit/miss display to TestCaseSlider 2018-01-30 16:45:48 +09:00
smoogipoo
27357e100a Simplify condition 2018-01-30 16:28:38 +09:00
smoogipoo
702c4efb88 Give Slider a tail hitobject to make slider ends counts towards score 2018-01-30 16:28:14 +09:00
smoogipoo
b293408147 Construct the head of sliders from Slider 2018-01-30 15:50:48 +09:00
Aergwyn
f6501e73e3 remove unwanted using 2018-01-29 12:08:03 +01:00
Aergwyn
373b3871f9 update SliderTick calculation + more ticks in tests
math is hard >_<
2018-01-29 12:03:44 +01:00
Thomas Tan
33c5fdcedb AppVeyor fix 2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a Create Slider.StackedPositionAt method 2018-01-29 16:22:14 +08:00
Thomas Tan
f66ecae3ff Merge remote-tracking branch 'upstream/master' into starrating-fix 2018-01-29 16:19:11 +08:00
FreezyLemon
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
Thomas Tan
b04e2cbb5c Fix osu star rating calculation
The main bug was that the beatmap was not being processed prior to
having its Skill values calculated, causing stacking to be ignored in
difficulty calculation. The fix involves processing the beatmap with
OsuBeatmapProcessor.

Another minor bug was that sliders were not taking into account the
stacked position midway through the slider (PositionAt does not return
stacked position.), so I corrected by adding StackOffset.
2018-01-26 03:39:19 +08:00
Aergwyn
214938b98d fix SliderTicks appearing too late 2018-01-25 10:52:03 +01:00
ColdVolcano
8eef81e24d Add more cases to TestCase 2018-01-24 16:16:46 -06:00
ColdVolcano
1f51149da8 Add xmldoc 2018-01-24 15:41:51 -06:00
ColdVolcano
cee8bb50c9 Fix reference points being wrongly selected 2018-01-24 15:34:52 -06:00
Aergwyn
52c4d22c41 review changes
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Aergwyn
4baadfdd16 fix oversight 2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149 make repeat points look better 2018-01-23 04:31:37 -06:00
Aergwyn
24b7d91f5b Merge branch 'master' into fix-repeats-appearing-early 2018-01-23 09:04:45 +01:00
smoogipoo
33c52ba30f Fix off-by-ones in RepeatPoint code 2018-01-23 13:58:43 +09:00
smoogipoo
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
Aergwyn
b726f90c37 remove unnecessary variable 2018-01-22 12:44:55 +01:00
Aergwyn
66176f2882 fix RepeatPoint animations
- FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
- TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time
2018-01-22 12:36:38 +01:00
Shawdooow
29466438a3 fix values 2018-01-19 20:58:43 -05:00
Shawdooow
c29eea870d correct values 2018-01-19 20:56:41 -05:00
Shawdooow
e109d5fe20 fix slider heads 2018-01-19 11:13:49 -05:00
Shawdooow
4d1142a0ce overall difficulty 2018-01-19 11:11:28 -05:00
smoogipoo
6908597b95 Fix inverted ternary
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
Dan Balasescu
46ba2cda10
Remove unused using 2018-01-18 21:19:06 +09:00
Dean Herbert
1a83770a06 Fix incorrect math 2018-01-18 21:16:15 +09:00
Dean Herbert
065d2a4887 Add licence header 2018-01-18 21:12:53 +09:00
Dean Herbert
01ff1584c2 Fix repeat points not following slider snaking correctly 2018-01-18 21:06:47 +09:00
Dean Herbert
e2965e1682 Remove unused using 2018-01-18 20:46:57 +09:00
Dean Herbert
063767e381 Prioritise hit normal
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
Dean Herbert
97884e1d05 Remove unnecessary null checks 2018-01-18 19:57:49 +09:00
Dean Herbert
b4f2bea37b Fix slider samples playing twice when additions are present 2018-01-18 19:50:26 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
smoogipoo
c309cc9454 Privatise OnJudgements as much as possible 2018-01-16 15:37:32 +09:00
smoogipoo
8c5ef0a330 Remove base OnJudgement from Playfield to properly accomodate nested playfields 2018-01-15 20:48:57 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
5952f1e7f1 Adjust transforms for cursor transitions 2018-01-12 19:34:14 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
Dean Herbert
e5056e11f4 Remove extra newline 2018-01-12 18:07:40 +09:00
Dean Herbert
d0881e443b Merge remote-tracking branch 'upstream/master' into approach-rate 2018-01-12 18:05:16 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Aergwyn
54c0197eb0 remove early fadeout of sliderball on hidden
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42 remove unnecessary change of spinner end sequence
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dean Herbert
0cc8516aa3
Remove empty cases, add initial ball scale adjust. 2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77 Comment and better stacking of FadeOuts 2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5 Make animation a bit more subtle 2018-01-04 20:43:42 +09:00
Dean Herbert
ffc7f7ecf4 Add a better slider "hit" state fade out animation 2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d Disallow SliderBall from contracting after EndTime 2018-01-04 20:09:58 +09:00
Shawdooow
94f81a1784 fix 2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate 2018-01-03 10:02:55 -05:00
Shawdooow
23f3cb6467 address review 2018-01-03 10:01:28 -05:00
Aergwyn
1ce6219293 remove unnecessary override 2018-01-03 13:55:24 +01:00
Aergwyn
d94c313947 fix slider follow circle instantly disappearing on slider ends 2018-01-03 08:13:58 +01:00
Dean Herbert
31865b4d96 Rename conflicting variable 2018-01-03 15:12:27 +09:00
Aergwyn
9ddbed6729 crop slider length to not go out of bounds on small screens/ratios
+ use correct methods for short and fast sliders, ooops
2018-01-02 17:10:05 +01:00
Aergwyn
737a53d826 clean up RequiredTypes 2018-01-02 17:04:00 +01:00
Shawdooow
e0beefdfd5 make this a float 2018-01-01 10:30:55 -05:00
Shawdooow
1df79c2f1b Move stackThreshold up where possible 2018-01-01 10:30:09 -05:00
Aergwyn
80be40ed34 ignore new test classes 2018-01-01 12:08:44 +01:00
Aergwyn
481a16b491 extended hitobject tests 2018-01-01 11:55:30 +01:00
Shawdooow
1502fde1b0 fix slider start circles 2017-12-31 12:04:31 -05:00
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