1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
Commit Graph

9831 Commits

Author SHA1 Message Date
Shane Woolcock
56196e17dd Merge branch 'master' into samah-ios 2018-12-22 16:44:15 +10:30
Dean Herbert
870d843fff Fix username not displaying correctly in overlay 2018-12-22 14:40:55 +09:00
smoogipoo
f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00
Dean Herbert
6bca344e56
Merge branch 'master' into add-alt-select-support 2018-12-21 14:32:24 +09:00
smoogipoo
6a9b0a0ba3 Fix initial messages not being received 2018-12-21 14:02:36 +09:00
smoogipoo
6b6629e9fd Fix not posting to the correct channel 2018-12-21 14:02:29 +09:00
Dean Herbert
59452800ed Update framework 2018-12-21 13:33:06 +09:00
Dan Balasescu
3d4edd9121
Merge branch 'master' into standalone-chat 2018-12-21 12:31:33 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09: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
bc8b0485d8 Add textbox/posting support 2018-12-20 18:49:03 +09:00
Dean Herbert
65447d6f4a Add optional parameters to target messages at a specific channel 2018-12-20 17:01:08 +09:00
Dean Herbert
3a13899ce1 Add stand-alone chat component 2018-12-20 16:54:49 +09:00
Dean Herbert
9177a45587
Merge branch 'master' into mod-fl2 2018-12-20 15:50:18 +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
067b448617
Merge branch 'master' into do_not_delete_replay_on_import 2018-12-19 13:50:04 +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
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
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
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
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
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
Dean Herbert
4fc9902cd2 Fix reverting to default skin via settings button causing a hard crash 2018-12-12 21:30:21 +09:00
Ivan Pavluk
d5437f7b4b
Merge branch 'master' into master 2018-12-12 17:24:52 +07:00
Ivan Pavluk
28b033bd99 Autodetect LowestSuccessfulHitResult 2018-12-12 17:15:59 +07: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
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
98e166a679
Merge branch 'master' into master 2018-12-10 12:00:53 +07:00