1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 19:12:57 +08:00
Commit Graph

15579 Commits

Author SHA1 Message Date
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
Dean Herbert
f195d6cb23
Merge pull request #3180 from WebFreak001/mod-fl2
Add "Blinds" mod
2018-12-20 20:25:26 +09:00
Dean Herbert
ce414ed7d0
Merge branch 'master' into mod-fl2 2018-12-20 19:56:25 +09:00
Dean Herbert
abad9b8721
Merge pull request #3888 from plankp/patch-1
Update README about SDK version
2018-12-20 19:50:52 +09:00
Paul Teng
36f57a7abb
Update README.md 2018-12-20 05:49:05 -05:00
Dean Herbert
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
Dean Herbert
d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
Dean Herbert
9177a45587
Merge branch 'master' into mod-fl2 2018-12-20 15:50:18 +09:00
Dean Herbert
bb850da200 Remove skinnability for now
Not sure if we want this going forward.
2018-12-20 15:48:45 +09:00
Dean Herbert
07f8b8e334 Update resources 2018-12-20 15:47:26 +09:00
Dean Herbert
997a0ece55
Merge pull request #3872 from peppy/simplify-api-requests
Remove all retry logic and simplify overall handling of API requests
2018-12-19 20:33:16 +09:00
Dean Herbert
8d458b0b6e Update framework version 2018-12-19 19:45:50 +09:00
smoogipoo
9d8170efa0 Only go into failing state if previously online 2018-12-19 14:32:43 +09:00
Dan Balasescu
02b95d3175
Merge branch 'master' into simplify-api-requests 2018-12-19 14:17:48 +09:00
Dean Herbert
4545661347
Merge pull request #3875 from UselessToucan/do_not_delete_replay_on_import
Do not delete file on import failure
2018-12-19 14:12:04 +09:00
Dean Herbert
067b448617
Merge branch 'master' into do_not_delete_replay_on_import 2018-12-19 13:50:04 +09:00
Dean Herbert
7abde0d0f4
Merge pull request #3880 from AltenGD/master
Add waves effect to channel selection overlay
2018-12-19 13:49:13 +09:00
Styphix
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
Roman Kapustin
4a1af67893 Do not delete file on import failure 2018-12-18 22:49:53 +03:00
Dean Herbert
6088612a26 Remove all retry logic and simplify overall handling of API requests 2018-12-18 20:20:17 +09:00
Dan Balasescu
4b0cad1455
Merge pull request #3865 from peppy/fix-web-requests-more
Fix web requests not getting correctly handled on first connection
2018-12-17 15:14:01 +09:00
Dean Herbert
00998d5443 Fix web requests not getting correctly handled on first connection 2018-12-17 14:29:11 +09:00
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