1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 05:27:40 +08:00
Commit Graph

23819 Commits

Author SHA1 Message Date
Albie
9fdbb2a58e change name of interface and expose method instead of seperate values 2019-11-25 07:24:29 +00:00
Albie
9a8e3fe1da add brackets 2019-11-24 07:44:35 +00:00
Albie
1d6665fe57 improve code quality using resharper and codefactor advice 2019-11-24 07:42:39 +00:00
Albie
8294b9ebe7 Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod 2019-11-24 07:37:47 +00:00
Albie
b8e5796af5 add forced video/storyboard and disabled dim for mod inside new interface 2019-11-24 07:37:06 +00:00
Albie
aa00909ef7
Merge branch 'master' into cinema-mod 2019-11-23 18:38:41 +00:00
Albie Spriddell
3b9f59cb33 add cinema mod support 2019-11-23 17:34:53 +00:00
Albie Spriddell
20edaf4ba6 add cinema mod support 2019-11-23 17:32:16 +00:00
Dan Balasescu
8da65fc909
Merge pull request #6933 from peppy/fix-nativelibs-version
Fix incorrect NativeLibs version reference
2019-11-24 00:08:49 +09:00
Dean Herbert
1bd9fa413e Fix incorrect NativeLibs version reference 2019-11-23 23:29:34 +09:00
Dean Herbert
43de9dd3c1
Don't attempt to repopulate already populated users on startup (#6923)
Don't attempt to repopulate already populated users on startup

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-23 22:16:42 +09:00
Dan Balasescu
63084b8d41
Merge branch 'master' into fix-user-population-overhea 2019-11-23 22:03:55 +09:00
Dan Balasescu
2a47204b87
Merge pull request #6924 from peppy/fix-lookup-failures
Fix beatmap lookups failing for beatmaps with no local path
2019-11-23 22:02:29 +09:00
Dean Herbert
65d71b9442 Fix beatmap lookups failing for beatmaps with no local path
Turns out the underlying EscapeUriString doesn't like nulls
2019-11-23 20:55:42 +09:00
Dean Herbert
eb81d15463 Don't attempt to repopulate already populated users on startup 2019-11-23 20:55:00 +09:00
Dean Herbert
4063135a3a Fix result mode button's corner exponent 2019-11-22 20:45:05 +09:00
Dean Herbert
203c8ddb94
Update framework (#6912)
Update framework
2019-11-22 20:10:43 +09:00
Dean Herbert
d0002cc1c2 Update performance logging setting 2019-11-22 19:50:30 +09:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Dean Herbert
6469199f0d Update framework 2019-11-22 19:47:21 +09:00
Dean Herbert
2796a135bf
Add mod selector to beatmap overlay (#6812)
Add mod selector to beatmap overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 18:46:25 +09:00
Dean Herbert
f564f4c0b0
Merge pull request #6910 from peppy/simplify-beatmap-lookup
Simplify beatmap lookup to use a single endpoint
2019-11-22 18:43:32 +09:00
Dean Herbert
b026197859 Add spacing 2019-11-22 18:23:48 +09:00
Dean Herbert
dad2e5c678 Improve legibility of NoScroesPlaceholder 2019-11-22 18:10:44 +09:00
Dean Herbert
16bdf4e6bd Update english to be more readable 2019-11-22 18:07:56 +09:00
Dean Herbert
0cc1698b6d Rename incorrectly named container 2019-11-22 18:05:12 +09:00
Dean Herbert
880f7ddca7 Merge remote-tracking branch 'upstream/master' into beatmap-overlay-mod-selector-new 2019-11-22 18:00:58 +09:00
Dean Herbert
f079ebe857 Simplify beatmap lookup to use a single endpoint 2019-11-22 16:13:48 +09:00
Dan Balasescu
45c1e831a1
Merge pull request #4883 from peppy/lead-in-fixes
Add support for storyboard/custom beatmap lead-ins
2019-11-22 14:34:20 +09:00
Dean Herbert
83080c3b5f Fix merge regression 2019-11-22 14:14:18 +09:00
Dan Balasescu
5d2a608be0
Merge branch 'master' into lead-in-fixes 2019-11-22 13:48:55 +09:00
Dean Herbert
c4ee027d51
Improve skip button feel (#6901)
Improve skip button feel

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-22 13:48:37 +09:00
Dan Balasescu
7c19f7cd7b
Merge branch 'master' into improve-skip-button-feel 2019-11-22 13:36:27 +09:00
Dan Balasescu
82cb6e364b
Merge pull request #6900 from peppy/skip-multiple-times
Add support for consecutive skips
2019-11-22 13:36:07 +09:00
Dan Balasescu
ba0ac93f70
Merge branch 'master' into skip-multiple-times 2019-11-22 13:23:50 +09:00
Dan Balasescu
821a26682e
Merge pull request #6905 from peppy/carousel-less-scroll-motion
Reduce carousel scroll motion on initial display
2019-11-22 12:39:31 +09:00
Andrei Zavatski
745047fd19 Remove useless line from ModIcon 2019-11-22 05:10:47 +03:00
Andrei Zavatski
da425c93fa Fix beatmap switch doesn't trigger scores update 2019-11-22 05:08:50 +03:00
Andrei Zavatski
dee9ffc694 Merge master with conflicts resolved 2019-11-22 04:59:46 +03:00
Dean Herbert
d8260f4a65 Reduce carousel scroll motion on initial display 2019-11-22 10:51:49 +09:00
Dean Herbert
337112834b
Create a control for filtering mods on a leaderboard (#5634)
Create a control for filtering mods on a leaderboard

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 10:47:16 +09:00
Dean Herbert
e170cd2892 Move private methods below 2019-11-22 10:29:16 +09:00
Dean Herbert
ced0ad404e
Merge branch 'master' into beatmap-mod-selector 2019-11-22 10:17:40 +09:00
Dean Herbert
88cb1fc705
Add option to show beatmap backgrounds at main menu (#6239)
Add option to show beatmap backgrounds at main menu

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 02:55:42 +09:00
Dean Herbert
57d38c5c74 Add final newline 2019-11-22 02:39:54 +09:00
Dean Herbert
ab42fac43a Improve naming 2019-11-22 02:38:31 +09:00
Andrei Zavatski
eb2f7c1d0a Rename forgotten variable 2019-11-21 20:37:02 +03:00
Andrei Zavatski
0f1a3d97c8 Naming adjustments 2019-11-21 20:34:19 +03:00
Dean Herbert
f390e558c7 Combine and simplify beatmap change logic 2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00