1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 07:23:20 +08:00
Commit Graph

221 Commits

Author SHA1 Message Date
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
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
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
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
06b615c474 Merge branch 'master' into repeat-points 2018-01-31 21:30:28 -06:00
smoogipoo
cd4a0612c0 Properly construct slider ends using HitObject.AddNested 2018-01-30 16:53:19 +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
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
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
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