1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Commit Graph

15535 Commits

Author SHA1 Message Date
Dean Herbert
0b5f3c00bf Revert "Fix WaveOverlayContainer always being present"
This reverts commit a6fc128094.
2018-12-14 20:50:27 +09:00
Dean Herbert
4a408b7750
Merge pull request #3779 from pavlukivan/master
Fix multiple taiko objects behaviour
2018-12-14 20:05:27 +09:00
Dean Herbert
2fe642a12b
Merge branch 'master' into master 2018-12-14 19:49:08 +09:00
Dean Herbert
79ae5e6fa5
Merge pull request #3855 from peppy/fix-waver-overlay-presence
Fix WaveOverlayContainer always being present
2018-12-14 19:42:01 +09:00
Dean Herbert
dfe60f6318
Merge pull request #3823 from peppy/netcoreapp22
Update projects to target .NET core 2.2
2018-12-14 19:41:52 +09:00
Dean Herbert
ec793bd708
Merge pull request #3848 from peppy/polling-component
Polling component
2018-12-14 19:41:36 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
4fb9a39038
Merge branch 'master' into fix-waver-overlay-presence 2018-12-14 19:40:36 +09:00
Dean Herbert
0610c34c98
Merge pull request #3838 from peppy/fix-api-failure-fail
Fix API getting stuck in connecting state on some exceptions
2018-12-14 19:40:28 +09:00
Dean Herbert
38fd35a0cf Add polling time to ctor 2018-12-14 19:17:21 +09:00
Dean Herbert
64626f62db Update framework 2018-12-14 19:02:25 +09:00
Dean Herbert
3fda40c4ac Ignore annoying tests for now 2018-12-14 17:42:47 +09:00
Dean Herbert
9072af9792 Move bulk of method into separate private method with minor clean-ups 2018-12-14 15:48:34 +09:00
Dean Herbert
a6fc128094 Fix WaveOverlayContainer always being present 2018-12-14 15:41:05 +09:00
Dean Herbert
a1543905ae
Merge branch 'master' into fix-api-failure-fail 2018-12-14 13:19:09 +09:00
Dean Herbert
4e9f727759
Merge branch 'master' into netcoreapp22 2018-12-14 11:33:41 +09:00
Dean Herbert
eb0a09576a
Merge branch 'master' into polling-component 2018-12-13 20:07:49 +09:00
Dean Herbert
71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
Dean Herbert
ac0fc6236c Fix crash when changing beatmap toggles at loading screen 2018-12-13 14:51:18 +09:00
Dan Balasescu
f29c6987d2
Merge pull request #3849 from peppy/fix-skin-default-revert
Fix reverting to default skin via settings button causing a hard crash
2018-12-13 12:19:53 +09:00
Dean Herbert
4fc9902cd2 Fix reverting to default skin via settings button causing a hard crash 2018-12-12 21:30:21 +09:00
Dean Herbert
ebd9375780 Add more tests 2018-12-12 20:31:58 +09:00
Ivan Pavluk
d5437f7b4b
Merge branch 'master' into master 2018-12-12 17:24:52 +07:00
Ivan Pavluk
d8b409f81f Merge branch 'master' of https://github.com/pavlukivan/osu 2018-12-12 17:18:32 +07:00
Ivan Pavluk
28b033bd99 Autodetect LowestSuccessfulHitResult 2018-12-12 17:15:59 +07:00
Ivan Pavluk
77e0d7ed8e
Fix formatting 2018-12-12 07:57:37 +00:00
Ivan Pavluk
e49e2fda9e Rename SuccessfulHitResult->LowestSuccessfulHitResult 2018-12-12 13:24:58 +07:00
Dean Herbert
ffb91b4afc
Update docstring
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:11:03 +07:00
Dean Herbert
d86cbf66a9
Update docstring
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:10:47 +07:00
Dean Herbert
b5c3b9e710
Merge pull request #3826 from smoogipoo/songselect-mods
Move ModOverlay to SongSelect
2018-12-12 13:59:10 +09:00
Dean Herbert
14af450ecb
Merge branch 'master' into songselect-mods 2018-12-12 13:37:04 +09:00
smoogipoo
49dd6ae9b0 Move a lot more of PlaySongSelect into SongSelect 2018-12-12 13:21:44 +09:00
Dean Herbert
ea4dce8454 Add a polling component model 2018-12-10 21:08:14 +09:00
Ivan Pavluk
a62b105fb5
Fix formatting 2018-12-10 05:06:18 +00:00
Ivan Pavluk
a2d1c2c096
Fix formatting 2018-12-10 05:05:03 +00:00
Ivan Pavluk
98e166a679
Merge branch 'master' into master 2018-12-10 12:00:53 +07:00
Ivan Pavluk
839e177d2a
Docstring change 2018-12-10 04:59:35 +00:00
Ivan Pavluk
8457324044 SuccessfulHitWindow->SuccessfulHitResult 2018-12-10 09:04:12 +07:00
Dan Balasescu
77a544e475
formatting fix
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:29 +07:00
Dan Balasescu
784a114eae
formatting fix
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-09 23:38:19 +07:00
Dean Herbert
7a703f9237 Fix API getting stuck in connecting state on some exceptions 2018-12-09 15:08:25 +09:00
Dan Balasescu
dc6574a9cc
Merge pull request #3833 from peppy/update-framework
Update framework and other nuget packages
2018-12-07 21:11:59 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dan Balasescu
57980e81e5
Merge pull request #3830 from peppy/channel-selector-on-none
Select channel selector when no channel is selected
2018-12-07 18:13:31 +09:00
Dean Herbert
d42c45c87e Add full tests 2018-12-07 14:01:51 +09:00
Dean Herbert
2f9de149dd Add constructor to create a PM channel from a User 2018-12-07 13:56:21 +09:00
Dean Herbert
2122966cd4 Show channel selector when no channels are joined 2018-12-07 13:26:31 +09:00
Ivan Pavluk
94f01b6678 Remove unused using directives 2018-12-06 20:05:03 +07:00
Ivan Pavluk
394c038c33 Removed unnecessary JudgementResult casts 2018-12-06 19:52:16 +07:00