RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,079 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

1580 Commits

Author SHA1 Message Date
smoogipoo f504370867 Make player block exit if pausable 2019-11-28 15:58:26 +09:00
Dan Balasescu c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan eba8657d38 Remove newly introduced redundant `this`. 2019-11-26 18:41:19 +08:00
Huo Yaoyuan c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert 77ce9642ba Add test coverage and simplify break time updating 2019-11-26 15:32:48 +09:00
Dean Herbert a453129d44 Fix nullref in tests 2019-11-26 15:13:50 +09:00
Dan Balasescu 8a8e863c0e
Merge branch 'master' into intro-outro-break 2019-11-26 12:47:42 +09:00
Dean Herbert fbebbab5db Remove excess parenthesis 2019-11-25 22:37:07 +09: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
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
Huo Yaoyuan 818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert bd6831624a Decouple skip button animations from gameplay clock 2019-11-21 19:51:22 +09:00
Dean Herbert ffd0e17826 Merge branch 'skip-multiple-times' into lead-in-fixes 2019-11-21 19:01:28 +09:00
Dean Herbert 46a94821d4 Add support for consecutive skips 2019-11-21 18:59:55 +09:00
Dean Herbert 29d2374928 Add back skip button actuation count tests 2019-11-21 17:23:52 +09:00
Dean Herbert 2dd2e3d861 Add correct AudioLeadIn support 2019-11-21 16:55:18 +09:00
Dean Herbert 8369be90f2 Allow skip button to actuate more than once 2019-11-21 15:19:06 +09:00
Dean Herbert c0b9bb5a12 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-21 14:22:17 +09:00
Berkan Diler 6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan 374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Dean Herbert eee5902851 Merge remote-tracking branch 'upstream/master' into lead-in-fixes 2019-11-15 14:05:31 +09:00
Huo Yaoyuan 87d40cf8d0 Resolve equals usages. 2019-11-13 22:35:50 +08:00
Huo Yaoyuan 7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Huo Yaoyuan ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert cd1dd0f898 Fix adjustments not being removed correctly on retry from pause 2019-11-06 10:38:04 +09:00
Dean Herbert 6dde755ef2
Merge branch 'master' into add-retry-button 2019-11-02 21:23:16 +09:00
Dean Herbert fd13f0bc55
Move ReplayDownloadButton to correct namespace (#6689) 
Move ReplayDownloadButton to correct namespace
 2019-11-02 21:22:23 +09:00
Dean Herbert 551032803d
Fix GameplayClockContainer operating on beatmap's track after s… (#6688) 
Fix GameplayClockContainer operating on beatmap's track after screen exited
 2019-11-02 21:22:13 +09:00
Dan Balasescu 8a5d3ab40a
Merge branch 'master' into add-retry-button 2019-11-02 10:51:14 +09:00
Dean Herbert daa0ebe2b5 Add xmldoc 2019-11-01 15:51:45 +09:00
Dean Herbert 14453da1d2 Centralise MakeCurrent call 2019-11-01 15:51:10 +09:00
Dean Herbert 84d17f3702 Add retry button 2019-11-01 15:41:51 +09:00
Dean Herbert 14fec6f1f3 Move ReplayDownloadButton to correct namespace 2019-11-01 15:06:36 +09:00
Dean Herbert dcc8f6e827 Better group cancel conditional 2019-11-01 14:43:52 +09:00
Dean Herbert d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
Dean Herbert ac02bb005d Fix GameplayClockContainer operating on beatmap's track after scren exited 2019-11-01 14:11:18 +09:00
Dean Herbert 3f192ca915
Fix song progress not displaying correctly (#6640) 
Fix song progress not displaying correctly

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-10-29 18:16:54 +09:00
Dean Herbert 46b44f4f99 Fix PlayerSettingsOverlay being shown by default 2019-10-28 18:37:58 +09:00
Dean Herbert 16e33e8bc7 Fix song progress not displaying correctly 2019-10-28 18:34:58 +09:00
nwabear b0e21c2749 Fixed Issue #6442 2019-10-25 14:57:49 -05:00
smoogipoo 851773a842 Apply adjustments for framework changes 2019-10-23 14:04:06 +09:00
Joehu ccc753a315 Make OverlayContainers with no blocking input VisibilityContainers 2019-10-14 16:27:59 -07:00
Dean Herbert 51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Dean Herbert 47c1f36f9d Add ValidForResume check 2019-10-04 11:41:53 +08:00
Dean Herbert 71985c7ef1 Update fail logic to match 2019-10-04 11:23:42 +08:00
Joseph Madamba d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-03 08:43:31 -07:00
smoogipoo 636913a4a6 Refactor PlayerLoader changes 2019-10-03 19:22:41 +09:00
Joehu a69b9f1148 Fix alt-f4 being blocked during gameplay 2019-10-02 11:16:31 -07:00