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

16795 Commits

Author SHA1 Message Date
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert
109abf4d28
Merge pull request #4338 from jorolf/disable-auto-dectect
Add flag to osu.iOS.sln.DotSettings as well
2019-02-27 05:35:07 +09:00
jorolf
26b74ad46a Add flag to osu.iOS.sln.DotSettings 2019-02-26 16:24:23 +01:00
Dean Herbert
6f1a1432f5
Merge pull request #4337 from jorolf/disable-auto-dectect
Disable auto detected rules
2019-02-27 00:13:13 +09:00
jorolf
2784df3b68 Disable auto detected rules 2019-02-26 15:36:07 +01:00
Dean Herbert
a11a7fa6f1
Merge pull request #4240 from ThePyrotechnic/MissingSource
Improve layout of beatmap details pane when source is unknown
2019-02-26 16:20:23 +09:00
Dean Herbert
5b88c2ea0f Add visual test 2019-02-26 16:12:40 +09:00
Dean Herbert
d9872dda12 Use fade instead of negative margin 2019-02-26 16:10:06 +09:00
Dean Herbert
2d6d9dd723 Add better easing 2019-02-26 16:09:45 +09:00
Dean Herbert
c1432b2ed5
Add back newline 2019-02-26 15:48:34 +09:00
Dean Herbert
2fc34496fd
Merge branch 'master' into MissingSource 2019-02-26 15:38:51 +09:00
Dean Herbert
19d62f76ba
Merge pull request #4329 from swoolcock/hide-exit-button
Hide exit button if the host does not support exiting
2019-02-26 13:42:13 +09:00
Dean Herbert
d2dc38f298
Merge branch 'master' into hide-exit-button 2019-02-26 13:25:47 +09:00
Dean Herbert
3213a9a443
Merge pull request #4334 from smoogipoo/fix-negative-score
Fix scores being stored as ints
2019-02-26 13:18:47 +09:00
smoogipoo
8a943a6e65 Fix scores being stored as ints 2019-02-26 13:10:59 +09:00
Dan Balasescu
32b8bb2ccc
Fix broken grammar
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-26 12:28:49 +09:00
Shane Woolcock
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +09:00
Shane Woolcock
bebb635ca1 Merge branch 'master' into hide-exit-button
# Conflicts:
#	osu.Game/Screens/Menu/MainMenu.cs
2019-02-25 21:48:42 +09:00
Shane Woolcock
2bd5bb3f69 Move all MainMenu button creation into load 2019-02-25 21:41:41 +09:00
Dean Herbert
d6cfce8bce
Merge pull request #3732 from UselessToucan/notify_track_completion_failure
Use `Track.Completed` event
2019-02-25 20:48:03 +09:00
Dean Herbert
97dc7f9819
Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +09:00
Dean Herbert
2fbb0b4e6f Don't use this 2019-02-25 19:34:03 +09:00
Dean Herbert
140de26a56 Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure 2019-02-25 19:30:35 +09:00
Dean Herbert
638e89effa
Merge pull request #4331 from nyquillerium/ScrollingExitFix
Fix song select background not being exited in time for main menu
2019-02-25 19:29:23 +09:00
Dean Herbert
ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
Dean Herbert
a4e119786f Fix some weird formatting 2019-02-25 19:19:28 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
Dean Herbert
f84a84edaa Fix oops 2019-02-25 18:59:28 +09:00
Dean Herbert
314f35b0c5 Further simplify import messaging 2019-02-25 18:42:08 +09:00
David Zhao
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00
David Zhao
ad1bce3585 Fix song select backround not being exited in time 2019-02-25 18:40:19 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dan Balasescu
de381f3457
Merge pull request #4102 from peppy/slider-fix
Fix slider button tracks and general replay accuracy
2019-02-25 16:37:21 +09:00
Dean Herbert
f0b26550d1
Merge branch 'master' into slider-fix 2019-02-25 16:12:52 +09:00
smoogipoo
7fde21b51a Rename testcase 2019-02-25 16:09:12 +09:00
smoogipoo
d06f38b3f3 Cleanup 2019-02-25 15:57:07 +09:00
Dean Herbert
706da017d7 Add target screen support and user bypass 2019-02-25 14:01:51 +09:00
Dean Herbert
caef58675d Tidy up and standardise present logic 2019-02-25 12:58:58 +09:00
Dean Herbert
e1f522fa44
Merge pull request #4324 from peppy/fix-direct-tab-activation
Remove limitation stopping search updates when no query present in direct
2019-02-25 12:03:22 +09:00
Dan Balasescu
b6ede6778c
Merge branch 'master' into fix-direct-tab-activation 2019-02-25 11:48:38 +09:00
Shane Woolcock
61be4f2695 Conditionally add ExitConfirmOverlay and disable back action 2019-02-25 10:43:47 +09:00
Dean Herbert
33a7256b8b
Merge pull request #4307 from DJKero/master
Fix key counters being ordered incorrectly
2019-02-25 10:12:59 +09:00
Dean Herbert
cd3f3be79d
Merge branch 'master' into master 2019-02-25 09:59:18 +09:00
Shane Woolcock
add8b8e9c4 Only add Exit button if the GameHost supports it 2019-02-25 09:56:00 +09:00
Dean Herbert
287870f1e1 Remove limitation stopping search updates when no query present in direct
Closes #4310.
2019-02-24 23:35:18 +09:00
Dean Herbert
b02a4ef764
Merge pull request #4318 from peppy/fix-download-failure-exception
Avoid fatal exceptions being thrown on download failure
2019-02-24 16:29:26 +09:00
Dan Balasescu
bd83a95a4f
Merge branch 'master' into fix-download-failure-exception 2019-02-24 16:01:18 +09:00
Dan Balasescu
a9bb3b7ae0
Merge pull request #4321 from peppy/fix-playback-rate-display
Fix regression causing playback rate to display incorrectly
2019-02-24 15:53:32 +09:00
Dean Herbert
2281a0235d Fix regression causing playback rate to display incorrectly 2019-02-24 15:27:06 +09:00
Dean Herbert
56397dbea6 Ensure beatmap is not disabled before continuing with present 2019-02-24 12:08:27 +09:00