1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 11:52:55 +08:00
Commit Graph

14185 Commits

Author SHA1 Message Date
Dean Herbert
582bc58715 Remove unused colour propagation 2018-07-31 18:05:14 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
bcc23f10c5
Merge branch 'master' into disable-download-button 2018-07-31 17:03:41 +09:00
Dean Herbert
bc92bed72f
Merge pull request #3106 from peppy/fix-repeat-arrow-interpolation
Add interpolation to repeat point during sliding
2018-07-31 17:03:26 +09:00
Dean Herbert
51506efd1a Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-31 16:49:31 +09:00
Dean Herbert
d2ce1e9d79
Merge pull request #3062 from peppy/open-downloaded-beatmas
Add ability to open already-downloaded beatmaps from osu!direct
2018-07-31 16:48:48 +09:00
Dean Herbert
ea6cab498e Add comment 2018-07-31 16:47:13 +09:00
smoogipoo
c9d4332846 size_x, size_y -> width, height 2018-07-31 16:44:20 +09:00
Dean Herbert
49b2d8c355
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 16:41:09 +09:00
Dean Herbert
9ab56bc4ef Make Ruleset non-public 2018-07-31 16:35:51 +09:00
Dean Herbert
61b8181b0b
Merge pull request #3139 from tgi74/more-skinning
Make more gameplay elements skinnable
2018-07-31 16:24:45 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation 2018-07-31 16:21:15 +09:00
Dean Herbert
874b5636e4 Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning 2018-07-31 16:15:27 +09:00
Dean Herbert
976653fdf9 Minor formatting fixes 2018-07-31 16:13:52 +09:00
Dean Herbert
132241424d Apply FollowPoint alpha to inner container (should not affect legacy skins) 2018-07-31 15:59:06 +09:00
Dan Balasescu
4ea8c2df4d
Merge pull request #3148 from peppy/fix-follow-circle-size
Fix follow circle being scaled far larger than it should be
2018-07-31 15:53:32 +09:00
smoogipoo
c5a772bbc8 Completely reuse TriangleButton 2018-07-31 15:49:04 +09:00
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size 2018-07-31 15:41:15 +09:00
Dan Balasescu
d4f0f06727
Merge pull request #3141 from peppy/fix-repeat-preempt
Fix slider repeat points appearing far too late
2018-07-31 15:40:57 +09:00
Dan Balasescu
68f4d91787
Merge branch 'master' into fix-repeat-preempt 2018-07-31 15:32:21 +09:00
Dean Herbert
a98bb057e2 Fix follow circle being scaled far larger than it should be 2018-07-31 15:27:21 +09:00
smoogipoo
ec31028f14 Add tooltip 2018-07-31 14:50:57 +09:00
smoogipoo
70338e087a Disable beatmap download button if not supporter 2018-07-31 14:41:31 +09:00
Dean Herbert
043d159d8a
Merge branch 'master' into more-skinning 2018-07-31 14:20:47 +09:00
Dean Herbert
0b869a7150
Merge pull request #3145 from smoogipoo/fix-testcase-failure
Fix breadcrumb testcase failures
2018-07-31 14:07:02 +09:00
smoogipoo
ae8bf34fd1 Fix breadcrumb testcase failures 2018-07-31 13:48:21 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 13:21:14 +09:00
Dean Herbert
70edca4474
Merge pull request #3137 from smoogipoo/netcore-cfs
Use .NET Core CodeFileSanity
2018-07-31 13:11:01 +09:00
Dean Herbert
d59a85a1ca
Merge branch 'master' into netcore-cfs 2018-07-31 13:00:29 +09:00
Dean Herbert
64b2189df8
Fix case, just in case 2018-07-31 12:50:49 +09:00
Dean Herbert
d9435d24a6
Use nuget version 2018-07-31 12:35:33 +09:00
tgi74000
36afae5a24 Remove the inner followcircle fade, Fade the entire followcircle instead 2018-07-30 13:43:02 +02:00
miterosan
10d444e3fd
Merge branch 'master' into ArrangeMod 2018-07-30 11:52:04 +02:00
Dean Herbert
21f3ff6e77 Fix slider repeat points appearing far too late 2018-07-30 18:51:25 +09:00
Dean Herbert
f4cda695e6 Improve rotation handling in edge cases 2018-07-30 18:50:59 +09:00
miterosan
4d306ef837 Add comments and clean up code. 2018-07-30 11:39:21 +02:00
miterosan
23a37d06cf Implement the arrange mod. 2018-07-30 11:34:20 +02:00
Dan Balasescu
0704f962c5
Merge pull request #3102 from peppy/add-skip-button-sound
Add more prominent sound when skipping
2018-07-30 18:05:09 +09:00
Dan Balasescu
090bc592b5
Merge branch 'master' into add-skip-button-sound 2018-07-30 17:56:08 +09:00
smoogipoo
95aa6b262d Use .NET Core CFS 2018-07-30 17:53:06 +09:00
tgi74000
c6aabc6d2d Move the FollowCircle border to its own container 2018-07-30 10:52:37 +02:00
Dean Herbert
a39188f762 Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-30 17:29:21 +09:00
Dean Herbert
51c4d12e1d
Merge pull request #3061 from peppy/remove-net471-target
Remove net471 targeting
2018-07-30 15:53:49 +09:00
Dean Herbert
bd3e5f7e1b
Merge branch 'master' into remove-net471-target 2018-07-30 15:27:48 +09:00
Dean Herbert
338496452d Move testing package references to somewhere appveyor will find them 2018-07-30 15:15:51 +09:00
Dean Herbert
7642db3572
Merge pull request #3133 from phosphene47/player-esc-result
Fix hitting "exit" key after gameplay ends not showing results
2018-07-30 15:11:42 +09:00
Dean Herbert
4abdca92e1 Merge remote-tracking branch 'upstream/master' into phosphene47-player-esc-result 2018-07-30 14:57:04 +09:00
Dean Herbert
8c3583ac54 Remove newline 2018-07-30 14:55:03 +09:00
Dean Herbert
0205916b9e Revert "Specify tests directly"
This reverts commit 1502edcdc6.
2018-07-30 14:39:45 +09:00
Dean Herbert
a3e7d4bb21 Merge branch 'master' into peppy-remove-net471-target 2018-07-30 14:16:38 +09:00