Commit Graph

9813 Commits

Author SHA1 Message Date
ef9d93ff6b Remove mod multipliers
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
9177a45587 Merge branch 'master' into mod-fl2 2018-12-20 15:50:18 +09:00
8d458b0b6e Update framework version 2018-12-19 19:45:50 +09:00
9d8170efa0 Only go into failing state if previously online 2018-12-19 14:32:43 +09:00
02b95d3175 Merge branch 'master' into simplify-api-requests 2018-12-19 14:17:48 +09:00
067b448617 Merge branch 'master' into do_not_delete_replay_on_import 2018-12-19 13:50:04 +09:00
bacc07f5ec Changed OsuFocusedOverlayContainer to WaveOverlayContainer from ChannelSelectionOverlay
Not sure what colour i shouldve gone for but im certain that this should be fine
2018-12-18 19:44:31 -05:00
4a1af67893 Do not delete file on import failure 2018-12-18 22:49:53 +03:00
6088612a26 Remove all retry logic and simplify overall handling of API requests 2018-12-18 20:20:17 +09:00
00998d5443 Fix web requests not getting correctly handled on first connection 2018-12-17 14:29:11 +09:00
0b5f3c00bf Revert "Fix WaveOverlayContainer always being present"
This reverts commit a6fc128094.
2018-12-14 20:50:27 +09:00
2fe642a12b Merge branch 'master' into master 2018-12-14 19:49:08 +09:00
79ae5e6fa5 Merge pull request #3855 from peppy/fix-waver-overlay-presence
Fix WaveOverlayContainer always being present
2018-12-14 19:42:01 +09:00
dfe60f6318 Merge pull request #3823 from peppy/netcoreapp22
Update projects to target .NET core 2.2
2018-12-14 19:41:52 +09:00
ec793bd708 Merge pull request #3848 from peppy/polling-component
Polling component
2018-12-14 19:41:36 +09:00
59a56b1a56 Merge pull request #3850 from peppy/fix-hitsound-change-crash
Fix crash when changing beatmap toggles at loading screen
2018-12-14 19:41:13 +09:00
578f7ff459 Merge pull request #3852 from peppy/fix-exit-crash
Fix crash on exiting player during results transition
2018-12-14 19:40:54 +09:00
4fb9a39038 Merge branch 'master' into fix-waver-overlay-presence 2018-12-14 19:40:36 +09:00
38fd35a0cf Add polling time to ctor 2018-12-14 19:17:21 +09:00
64626f62db Update framework 2018-12-14 19:02:25 +09:00
9072af9792 Move bulk of method into separate private method with minor clean-ups 2018-12-14 15:48:34 +09:00
a6fc128094 Fix WaveOverlayContainer always being present 2018-12-14 15:41:05 +09:00
a1543905ae Merge branch 'master' into fix-api-failure-fail 2018-12-14 13:19:09 +09:00
eb0a09576a Merge branch 'master' into polling-component 2018-12-13 20:07:49 +09:00
71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
ac0fc6236c Fix crash when changing beatmap toggles at loading screen 2018-12-13 14:51:18 +09:00
4fc9902cd2 Fix reverting to default skin via settings button causing a hard crash 2018-12-12 21:30:21 +09:00
d5437f7b4b Merge branch 'master' into master 2018-12-12 17:24:52 +07:00
28b033bd99 Autodetect LowestSuccessfulHitResult 2018-12-12 17:15:59 +07:00
e49e2fda9e Rename SuccessfulHitResult->LowestSuccessfulHitResult 2018-12-12 13:24:58 +07:00
ffb91b4afc Update docstring
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:11:03 +07:00
d86cbf66a9 Update docstring
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:10:47 +07:00
14af450ecb Merge branch 'master' into songselect-mods 2018-12-12 13:37:04 +09:00
49dd6ae9b0 Move a lot more of PlaySongSelect into SongSelect 2018-12-12 13:21:44 +09:00
ea4dce8454 Add a polling component model 2018-12-10 21:08:14 +09:00
a62b105fb5 Fix formatting 2018-12-10 05:06:18 +00:00
98e166a679 Merge branch 'master' into master 2018-12-10 12:00:53 +07:00
8457324044 SuccessfulHitWindow->SuccessfulHitResult 2018-12-10 09:04:12 +07:00
77a544e475 formatting fix
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:29 +07:00
784a114eae formatting fix
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:19 +07:00
7a703f9237 Fix API getting stuck in connecting state on some exceptions 2018-12-09 15:08:25 +09:00
7d9cdf6f81 Remove unnecessary private field 2018-12-07 20:13:03 +09:00
d379d02761 Remove unnecessary base class 2018-12-07 20:12:56 +09:00
808f02b51d Merge branch 'master' into mod-fl2 2018-12-07 19:58:27 +09:00
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
2f9de149dd Add constructor to create a PM channel from a User 2018-12-07 13:56:21 +09:00
2122966cd4 Show channel selector when no channels are joined 2018-12-07 13:26:31 +09:00
cb2444e01c Remove Meh from TaikoHitWindows 2018-12-06 19:04:54 +07:00
3cb91979bd Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 2018-12-06 12:14:48 +01:00