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

24222 Commits

Author SHA1 Message Date
Dean Herbert
061d9f8d1b
Make DimmedLoadingLayer block input when active (#6956)
Make DimmedLoadingLayer block input when active

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-25 14:01:13 +09:00
Dan Balasescu
dd7e4b2340
Merge branch 'master' into dimmed-load-input-blocking 2019-11-25 13:49:10 +09:00
Dan Balasescu
0e98dd5a1c
Merge pull request #6450 from iiSaLMaN/add-access-to-skin-legacy-version
Add access to numerical version of legacy skin
2019-11-25 12:55:15 +09:00
Dan Balasescu
51eff3d49c
Merge branch 'master' into add-access-to-skin-legacy-version 2019-11-25 12:40:01 +09:00
Dan Balasescu
92c4e8e4f6
Merge pull request #6911 from peppy/fix-spritetext-usage
Fix usage of SpriteText instead of OsuSpriteText
2019-11-25 12:30:45 +09:00
Dean Herbert
22bdc8435d
Increase padding on mod section title (#6916)
Increase padding on mod section title
2019-11-25 12:28:38 +09:00
Dan Balasescu
9f93727a80
Merge branch 'master' into fix-spritetext-usage 2019-11-25 12:15:05 +09:00
Dan Balasescu
d95eb37c2d
Merge pull request #6917 from EVAST9919/beatmap-overlay-no-supporter-filter
Add placeholder for non-supporters in beatmap overlay
2019-11-25 12:13:49 +09:00
Dan Balasescu
ffd2ba5d7d
Merge branch 'master' into beatmap-overlay-no-supporter-filter 2019-11-25 11:51:10 +09:00
Dan Balasescu
987ab8b624
Merge pull request #6941 from andy840119/andy840119/_20191124_fix_ApplyToDrawableHitObjects
IApplicableToDrawableHitObjects should be able to get all the hitobject in nasted Playfield
2019-11-25 11:51:01 +09:00
Dean Herbert
36cabe72cf Make DimmedLoadingLayer block input when active 2019-11-25 11:49:54 +09:00
Dean Herbert
b85189f855 Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage 2019-11-25 11:31:12 +09:00
Dean Herbert
4904346814 Fix false warnings 2019-11-25 11:31:03 +09:00
Dean Herbert
45514ff660 Apply fixes 2019-11-25 11:30:55 +09:00
Dan Balasescu
19339326e2
Merge branch 'master' into andy840119/_20191124_fix_ApplyToDrawableHitObjects 2019-11-25 11:30:44 +09:00
Dan Balasescu
a946a9a02c
Merge pull request #6955 from turbedi/math_stuff
Use MathF instead of Math- functions when possible
2019-11-25 09:55:31 +09:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
andy840119
6126fd9a6b ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield 2019-11-24 10:42:05 +09:00
iiSaLMaN
b58afa3eb6 Remove unnecessary mentioning in xmldoc 2019-11-24 04:36:34 +03:00
iiSaLMaN
2437cfd28c Add test ensuring correct version lookup 2019-11-24 04:36:16 +03:00
iiSaLMaN
20a8a653c2 Change LegacySkin.Configuration accessibility 2019-11-24 04:10:04 +03:00
Andrei Zavatski
96533631fc Simplify if/else statement 2019-11-24 01:29:11 +03:00
Andrei Zavatski
29b05e2939 Fix getScores can be fired twice on user change 2019-11-24 00:01:49 +03:00
Andrei Zavatski
ced78dc900 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-no-supporter-filter 2019-11-23 23:54:46 +03:00
Albie
5c55060173
Merge branch 'master' into master 2019-11-23 16:54:23 +00:00
Dean Herbert
244177880e Only show star on HR 2019-11-24 01:45:21 +09:00
Dean Herbert
326a8f62eb Calculate more correct AR locally for now 2019-11-24 00:22:01 +09: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
e3f3b1ab1a Display useful statistics on song bar depending on current ruleset 2019-11-23 20:52:41 +09:00
Andrei Zavatski
2e161f7e99 Hook up the rest of the logic 2019-11-22 22:25:58 +03:00
Andrei Zavatski
aede1b183a Make ScopeSelector always visible 2019-11-22 22:04:58 +03:00
Andrei Zavatski
d6c9387beb Implement NotSupporterPlaceholder 2019-11-22 21:55:21 +03:00
Albie Spriddell
4cb09df754 increase padding 2019-11-22 18:23:48 +00: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
66e2a259f0 Fix usage of SpriteText instead of OsuSpriteText 2019-11-22 18:21:40 +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