1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 05:17:25 +08:00
Commit Graph

275 Commits

Author SHA1 Message Date
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
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
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
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
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
06b615c474 Merge branch 'master' into repeat-points 2018-01-31 21:30:28 -06: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
214938b98d fix SliderTicks appearing too late 2018-01-25 10:52:03 +01: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
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
e109d5fe20 fix slider heads 2018-01-19 11:13:49 -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
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
Dean Herbert
d0881e443b Merge remote-tracking branch 'upstream/master' into approach-rate 2018-01-12 18:05:16 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +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
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
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
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
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
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
07040f9fd1 rename field 2017-12-29 17:52:28 +01:00
Dean Herbert
a4f941cdf1 Move lifetime adjustment to DrawableHitCircle 2017-12-29 18:51:14 +09: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
smoogipoo
cb18baa4d8 Add HitCircle/Slider testcases 2017-12-27 17:34:07 +09:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Shawdooow
72b5a370da dont play the same sound twice at once 2017-12-23 23:13:53 -05:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
smoogipoo
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
smoogipoo
a303bf71cf Give control over screen space conversion to DrawableHitObject 2017-12-11 22:19:02 +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
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
6883b3742f Make initial DrawableOsuHitObject initial states not use transforms 2017-11-02 20:23:28 +09:00
Dean Herbert
ad685bd919 Merge branch 'master' into sliderbouncers 2017-10-22 14:12:03 +09: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
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
b78c516b74 Merge branch 'master' into scoring-revamp 2017-09-13 20:47:14 +09:00
smoogipooo
093d82ac45 Set depths from playfield add methods instead of DrawableHitObject 2017-09-13 16:17:01 +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
d070fb8063 Actually make DrawableSliderTick return an OsuJudgement now 2017-09-12 19:48:35 +09:00
Dean Herbert
86de4fa2e2 Apply CI fixes 2017-09-12 18:36:19 +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
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
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
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
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
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
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
e9a11ebc9f Use new population methods and implement osu! ruleset actions 2017-08-10 18:31:12 +09: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
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
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