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

14877 Commits

Author SHA1 Message Date
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
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
miterosan
8652c48c18 Restore nuget before analyzing the binaries. 2018-07-30 02:23:31 +02:00
miterosan
aef824b13d Also analyze the code for spaces and warnings. 2018-07-30 02:12:39 +02:00
tgi74000
84135c49ca Fix small FollowPoint rotation bug 2018-07-29 23:21:05 +02:00
tgi74000
18096490b6 Add support for followpoint skinning 2018-07-29 23:20:37 +02:00
tgi74000
4322475ad2 Add support for sliderb skinning (single frame only) 2018-07-29 22:29:07 +02:00
tgi74000
257c035f30 Add support for sliderfollowcircle skinning 2018-07-29 21:28:13 +02:00
tgi74000
52d9461f03 Add support for reversearrow skinning 2018-07-29 20:51:06 +02:00
miterosan
6a661d1766 Prepare inspect code 2018-07-29 20:49:26 +02:00
tgi74000
2a9818a128 Add support for sliderscorepoint skinning 2018-07-29 20:42:05 +02:00
Roman Kapustin
3134e14b37 Test KeyCounter.RestoreState 2018-07-28 23:24:03 +03:00
Roman Kapustin
8bb83a8fd9 Fix nullref in KeyCounterCollection 2018-07-28 22:16:14 +03:00
Roman Kapustin
1e6220e3c0 Call KeyCounter.RestoreState itself 2018-07-28 13:22:52 +03:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas 2018-07-28 12:44:34 +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
AlFasGD
93cf063c97 Remove useless things 2018-07-27 12:52:33 +03:00
AlFasGD
1962797e20 Remove unnecessary using directive 2018-07-27 12:40:38 +03:00
AlFasGD
78cde95132 Privatise constants 2018-07-27 12:34:11 +03:00
AlFasGD
3ee1353976 Remove whitespace 2018-07-27 12:28:47 +03:00
AlFasGD
2a819a53c0 Prefer inheriting TriangleButton instead of Container 2018-07-27 12:26:37 +03: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
miterosan
91ca245c58 Allow testing 2018-07-26 03:40:28 +02:00
Dean Herbert
ee0522ad84 Ignore failing test 2018-07-25 16:45:07 +02: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
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +02:00