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

14225 Commits

Author SHA1 Message Date
Andrei Zavatski 5b09daef1a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-10-01 13:54:15 +03:00
Dan Balasescu b4da92e5a6
Merge branch 'master' into bot-profile 2019-10-01 16:26:48 +09:00
smoogipoo 81a227796e Merge remote-tracking branch 'origin/master' into rulesets_fail_load_exception_log 2019-10-01 15:41:16 +09:00
smoogipoo ce609302ed Fix CI error 2019-10-01 15:41:09 +09:00
Dean Herbert 351e89bf18 Update framework 2019-09-30 22:03:56 +09:00
Dan Balasescu 2d4e557134
Merge branch 'master' into fix-potential-null-test 2019-09-30 12:19:11 +09:00
miterosan 9f498d2990 Log the exception that caused to loading of rulesets to fail. 2019-09-29 19:25:44 +02:00
Andrei Zavatski febe0175cd Small cleanups 2019-09-29 15:27:29 +03:00
Andrei Zavatski 138e65d7a4 Add missing blank line 2019-09-29 15:15:41 +03:00
Andrei Zavatski 883ee9851a Update dependencies 2019-09-29 15:02:33 +03:00
Andrei Zavatski 5314f76fda Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables 2019-09-29 14:58:58 +03:00
Andrei Zavatski 907f73ef8f Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-29 14:45:36 +03:00
Dean Herbert ce62f3c75b Simplify and future-proof random retrieval method 
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
 2019-09-29 14:35:35 +08:00
Dean Herbert 740efa5747 Handle potential null case 2019-09-29 12:19:42 +08:00
V1ntagezTV 9f1c378733 moved into the switch case 2019-09-29 00:35:47 +05:00
V1ntagezTV 2681e2064a remove comment 2019-09-29 00:34:09 +05:00
V1ntagezTV 1babd139bc remove needless blank 2019-09-29 00:22:23 +05:00
V1ntagezTV 52b044b7f6 Add random intro! 2019-09-29 00:10:17 +05:00
Dean Herbert a45f8c968b Rename and add simple xmldoc 2019-09-28 20:21:51 +08:00
Dean Herbert d01c30fd52
Merge branch 'master' into introduce-session-statics 2019-09-28 20:16:52 +08:00
Dean Herbert 1d1df2433f
Merge branch 'master' into fix-track-adjustments-not-applied-after-resume 2019-09-28 19:42:31 +08:00
Andrei Zavatski a8eef0d0c4 Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-28 12:34:16 +03:00
iiSaLMaN fb9f21237e Reset track adjustments on resuming from another screen 2019-09-28 04:18:16 +03:00
dependabot-preview[bot] 3af7c910fb
Bump Humanizer from 2.7.2 to 2.7.9 
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 19:09:07 +00:00
Andrei Zavatski bbaf21a69d Tables implementation 2019-09-27 19:33:52 +03:00
Andrei Zavatski 2a395956aa Merge dependencies 2019-09-27 19:00:17 +03:00
Dan Balasescu 8b7f558728
Merge branch 'master' into improve-hold-button-text 2019-09-27 17:35:03 +09:00
Andrei Zavatski 4908cb826b Fix line breaks 2019-09-27 09:46:11 +03:00
Andrei Zavatski 475455d7cd Add missing line breaks 2019-09-27 09:32:46 +03:00
Andrei Zavatski 94eacbca5d Fix Bot users have all the profile sections in ProfileOverlay 2019-09-27 09:22:25 +03:00
iiSaLMaN 2670a23e6f Assign to field and move to load complete 2019-09-27 08:15:24 +03:00
iiSaLMaN 7904f77cd5 Bind event to activation delay change 2019-09-27 02:59:42 +03:00
smoogipoo 45f2bcc440 Fix combo bindings not being bound to nested hitobjects 2019-09-26 17:39:19 +09:00
smoogipoo 706e884cc0 Update accent colour on combo index change 2019-09-26 17:13:13 +09:00
smoogipoo bbf0544a8d Add bindables for IHasComboInformation properties 2019-09-26 16:55:08 +09:00
iiSaLMaN 911094e790 Replace menu button text with "press for menu" on 0ms activation delay 2019-09-26 01:42:56 +03:00
Dean Herbert e2744054c7
Merge branch 'master' into back-button-part-2 2019-09-25 22:46:08 +09:00
Dean Herbert 7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… (#6236) 
Fix mania scrolling speed not including beatmap slider multiplier

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-25 22:34:46 +09:00
Dean Herbert 45f833ceea Add invocation null checks for safety 2019-09-25 22:14:42 +09:00
Salman Ahmed 3aa9a172d8
Merge branch 'master' into introduce-session-statics 2019-09-25 16:14:39 +03:00
Dean Herbert 42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
Dean Herbert 8c01677e0b Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 22:12:00 +09:00
iiSaLMaN 8844d567cb Use bindable setting instead 2019-09-25 15:56:47 +03:00
smoogipoo 244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
Dean Herbert 3bd0fc2947 Merge remote-tracking branch 'upstream/master' into android-build-automation 2019-09-25 16:33:36 +09:00
Dan Balasescu 0eff9aa5e9
Merge branch 'master' into improve-carousel-tests 2019-09-25 15:55:11 +09:00
Dan Balasescu 213488a25e
Merge branch 'master' into abstract-update-manager 2019-09-25 15:41:45 +09:00
Dean Herbert c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
Dean Herbert 654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
Dean Herbert bb1289e83c
Merge branch 'master' into improve-carousel-tests 2019-09-25 14:24:28 +09:00