h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 10:57:30 +08:00
Code Issues Releases Wiki Activity
23,965 Commits 3 Branches 654 Tags 359 MiB
2663e5d756
Commit Graph

23965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
3fb2f6e320
Display useful statistics on song bar depending on current rule… (#6922) 
Display useful statistics on song bar depending on current ruleset

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-11-26 14:40:59 +09:00
Dan Balasescu
2aa13370df
Merge branch 'master' into song-bar-stats 2019-11-26 13:27:01 +09:00
Dan Balasescu
8a8e863c0e
Merge branch 'master' into intro-outro-break 2019-11-26 12:47:42 +09:00
Dan Balasescu
35c25539ae
Merge pull request #6964 from peppy/username-login 
Change login placeholder text to ask for username
 2019-11-26 12:41:13 +09:00
Dan Balasescu
7c5a49c4d8
Merge branch 'master' into username-login 2019-11-26 12:28:57 +09:00
Dan Balasescu
cda4631e17
Merge pull request #6972 from bdach/revert-to-native-network-android 
Revert Android to using native network components
 2019-11-26 12:28:48 +09:00
Dan Balasescu
017ba76066
Merge branch 'master' into revert-to-native-network-android 2019-11-26 12:08:06 +09:00
Dan Balasescu
db34ea88bc
Merge pull request #6962 from peppy/get-end-time 
Centralise End/StartTime retrieval to extension method
 2019-11-26 12:07:51 +09:00
Dan Balasescu
b21de98296
Merge branch 'master' into get-end-time 2019-11-26 11:47:01 +09:00
Dan Balasescu
686abb5007
Merge pull request #6970 from huoyaoyuan/banned-symbols 
Correct banned symbols configuration
 2019-11-26 11:25:06 +09:00
Bartłomiej Dach
8e25214eee Revert Android to using native network components 
This reverts commit 9acfc2587a
("Switch android to using managed network components") due to it
causing crashes on every online call. The managed legacy TLS provider
is slated for removal in later mono releases as it stands anyway.
 2019-11-25 21:21:56 +01:00
Huo Yaoyuan
8928f05f4f Temporarily remove deepequal test from Android to make CI green. 2019-11-26 01:39:48 +08:00
Huo Yaoyuan
41fd3f6749 Correct BannedSymbols.txt. 2019-11-25 23:42:59 +08:00
Dean Herbert
fbebbab5db Remove excess parenthesis 2019-11-25 22:37:07 +09:00
Dean Herbert
1fd5ed3c0f Change login placeholder text to ask for username 2019-11-25 21:35:25 +09:00
Huo Yaoyuan
d2f6439d5f Merge branch 'master' into ci 2019-11-25 19:48:26 +08:00
Huo Yaoyuan
9fcc566341 Change the postition of nupkg artifacts. 2019-11-25 18:32:41 +08:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Dean Herbert
6b8983b489 Consider intro and outro time as "break" time 2019-11-25 19:02:11 +09:00
Huo Yaoyuan
de3079d8e9 Fix appveyor configuration 2019-11-25 17:51:33 +08:00
Dean Herbert
053e38c95f
Fix stutters when changing beatmap difficulties (#6959) 
Fix stutters when changing beatmap difficulties
 2019-11-25 18:47:54 +09:00
smoogipoo
719f0d5947 Fix stutters when changing beatmap difficulties 2019-11-25 18:28:43 +09:00
Huo Yaoyuan
e31e83deaa Clean up and update readme. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
3c6526bbd2 Add nuget http cache 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
575b4db186 Patch csproj version. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
3a62406c58 Update deploy script. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
38dae996a1 Add InspectCode to CI. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
18840c6319 Run format check in CI. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
fbb83045f3 Enable tests. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
8479f8531e Android package name cannot contain Catch. 2019-11-25 16:42:20 +08:00
Huo Yaoyuan
137f3495e3 Use appveyor yml back for build. 2019-11-25 16:42:20 +08:00
Dean Herbert
5e8f3eb28f
Bump Microsoft.Build.Traversal from 2.0.19 to 2.0.24 (#6957) 
Bump Microsoft.Build.Traversal from 2.0.19 to 2.0.24

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-11-25 16:49:53 +09:00
dependabot-preview[bot]
94e6bfeed3
Bump Microsoft.Build.Traversal from 2.0.19 to 2.0.24 
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.19 to 2.0.24.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.19...Microsoft.Build.Traversal.2.0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 07:30:17 +00:00
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