Commit Graph

4971 Commits

Author SHA1 Message Date
c06dac5b1a Remove null check (beatmap cannot be null) 2019-03-05 17:58:30 +09:00
2fee7276ae Combine creation + assignment 2019-03-05 17:58:05 +09:00
bb6c83ab25 Merge branch 'master' into show-mods-on-loader 2019-03-05 17:46:35 +09:00
fd147dae21 Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
166a8c8bbb Add back fallback behavior for match creation 2019-03-05 16:41:59 +09:00
93c79023dc Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock 2019-03-05 16:41:01 +09:00
11e353c152 Use local class instead of having a separate file 2019-03-05 15:55:37 +09:00
4e33a98dbc Move gameplay clock to own class 2019-03-05 13:53:47 +09:00
c5cd9972c4 Make restart private 2019-03-05 13:37:51 +09:00
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
5bb0511f0a Fix SquareGraph not correctly filling columns when loaded with a non-zero time 2019-03-05 13:37:28 +09:00
aecbc31ffa Use BeatmapSetCoverType.List for lobby listing 2019-03-05 12:08:14 +09:00
ec7842dd5a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-04 12:06:56 +09:00
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00
176cbc7f2e Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-03-02 19:04:48 +01:00
687d5d5ff1 Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
796f6c3092 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-02 13:13:51 +09:00
0be9f81310 Merge branch 'master' into show-mods-on-loader 2019-03-02 06:40:45 +08:00
1871e8bb2c Merge branch 'master' into master 2019-03-01 21:22:34 +09:00
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
cf51c8aa31 attempt to comply with appveyor 2019-03-01 19:10:32 +08:00
4e081fe1fc Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader 2019-03-01 18:41:41 +08:00
bf8360636a Adjust drawnodes to use the new shared data structure 2019-03-01 17:25:15 +09:00
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
f6303a2855 Fix songselect blur potentially never being applied 2019-03-01 11:52:51 +09:00
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master
# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
09e1e3bab6 Merge branch 'master' into UserDimLogic 2019-02-28 20:38:09 +09:00
30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
6861163226 Remove pointless method 2019-02-28 20:21:27 +09:00
c5270dd577 Remove unnecessary using 2019-02-28 20:17:00 +09:00
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
5b53cf0961 Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
99812bd448 Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
a37445a938 Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
b2872b47d0 Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
4c8aa65200 private + renaming 2019-02-28 17:02:45 +09:00
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
3a1066ff02 Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
6e821a426d Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +09:00