1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Commit Graph

13732 Commits

Author SHA1 Message Date
Dean Herbert
ea6cab498e Add comment 2018-07-31 16:47:13 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation 2018-07-31 16:21:15 +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
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
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
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
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
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
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
Dean Herbert
f57ba4ffb1 Update framework 2018-07-30 14:14:16 +09:00
Dean Herbert
3cf906042e
Merge branch 'master' into remove-net471-target 2018-07-30 11:28:06 +09:00
Dean Herbert
0d8701d0cb
Merge pull request #3124 from smoogipoo/fix-editor-lifetime
Fix hitobjects not properly expiring if scrolling in the editor
2018-07-28 12:43:02 +09:00
Dean Herbert
ac67c2dab3
Merge branch 'master' into fix-editor-lifetime 2018-07-28 12:35:39 +09:00
phosphene47
d32a3ff052 Esc at the end of play should push to result screen
Closes #3060
2018-07-28 08:34:51 +10:00
ekrctb
5b18488174
Merge pull request #3126 from smoogipoo/fix-catch-nullref
Fix possible nullref if no fruits are ever caught
2018-07-26 23:05:03 +09:00
ekrctb
5d83d00806
Merge branch 'master' into fix-catch-nullref 2018-07-26 22:50:37 +09:00
Dan Balasescu
28844a97e8
Merge pull request #2515 from odgaard/master
Disable MusicController's seek during gameplay
2018-07-26 21:49:26 +09:00
smoogipoo
464333cf0b Merge remote-tracking branch 'origin/master' 2018-07-26 21:28:31 +09:00
smoogipoo
71c49de031 Fix possible nullref if no fruits are ever caught 2018-07-26 21:00:18 +09:00
smoogipoo
ff2a3a6e92 Fix hitobjects not properly expiring if scrolling in the editor 2018-07-26 20:07:16 +09:00
Dan Balasescu
dc6898e7e0
Merge pull request #3108 from peppy/fix-turkish-i
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
2018-07-26 18:17:38 +09:00
Dan Balasescu
ceaa23fbbb
Merge branch 'master' into fix-turkish-i 2018-07-26 18:06:58 +09:00
Dan Balasescu
8a68ec6462
Merge pull request #3116 from AlFasGD/labelled-text-box-fixes
Apply certain fixes for labelled text box
2018-07-25 21:34:44 +09:00
Dan Balasescu
6c290702a3
Merge branch 'master' into labelled-text-box-fixes 2018-07-25 21:21:06 +09:00
AlFasGD
c4b1ba2979 Remove padding, fix corner radiuses 2018-07-25 15:14:40 +03:00
Dean Herbert
7400d4d0e9
Merge pull request #3101 from peppy/fix-always-skipping
Fix gameplay always skipping to first hitobject time
2018-07-25 12:40:14 +02:00
Dean Herbert
ff04527c6d
Merge branch 'master' into fix-always-skipping 2018-07-25 12:30:39 +02:00
Dan Balasescu
71898754a0
Merge pull request #3086 from AlFasGD/labelled-text-box
Add labelled text box component for the Beatmap Setup Screen
2018-07-25 19:15:49 +09:00
smoogipoo
206e3686f2 Add back blue border 2018-07-25 18:38:50 +09:00
smoogipoo
127084ba74 Merge remote-tracking branch 'origin/master' into labelled-text-box 2018-07-25 18:35:04 +09:00
smoogipoo
b60e4b0728 Cleanup 2018-07-25 18:34:47 +09:00
Dan Balasescu
53e55c2f14
Merge branch 'master' into fix-always-skipping 2018-07-25 15:30:24 +09:00