Dean Herbert
|
13cabac386
|
Update in line with framework changes
|
2018-12-14 19:56:21 +09:00 |
|
Dean Herbert
|
fc5d5a7752
|
Merge branch 'master' into user-registration
|
2018-12-14 19:45:27 +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 |
|
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 |
|
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 |
|
smoogipoo
|
10b526504a
|
Move ModOverlay to SongSelect
|
2018-12-06 19:29:18 +09:00 |
|
Dean Herbert
|
ab27701ed1
|
Merge branch 'user-registration' of https://github.com/peppy/osu into user-registration
|
2018-12-06 17:11:57 +09:00 |
|
Dean Herbert
|
6ebe555838
|
Fix incorrect filename
|
2018-12-06 17:11:39 +09:00 |
|
Dean Herbert
|
9689c4fa17
|
Merge branch 'master' into user-registration
|
2018-12-06 17:06:43 +09:00 |
|
Dean Herbert
|
f157628dcc
|
Remove unnecessary csproj change
|
2018-12-06 17:06:22 +09:00 |
|
Dean Herbert
|
b0e2b56e85
|
Don't show warning screen if no previous account is detected
|
2018-12-06 16:54:08 +09:00 |
|
Dean Herbert
|
de8c5a6df0
|
Block input and show loading when submitting registration
|
2018-12-06 16:29:41 +09:00 |
|
Dean Herbert
|
09f985c721
|
Add warning lines
|
2018-12-06 15:49:06 +09:00 |
|
Dan Balasescu
|
6ffd2190bc
|
Merge pull request #3824 from peppy/fix-no-internet-crashes
Fix update code crashing when no internet connection is available
|
2018-12-06 15:28:13 +09:00 |
|
Dean Herbert
|
67a759122a
|
Fix update code crashing when no internet connection is available
|
2018-12-06 14:59:17 +09:00 |
|
Dean Herbert
|
d5de5d1cb7
|
Fix textbox focus issues
|
2018-12-06 14:57:00 +09:00 |
|
Dean Herbert
|
cc3ccc4c40
|
Affix logo in place better
|
2018-12-06 12:53:35 +09:00 |
|
Dean Herbert
|
88052dcea1
|
Reset to welcome screen on exiting mid-process
|
2018-12-06 12:38:11 +09:00 |
|
Dan Balasescu
|
bebbbaa73c
|
Merge pull request #3822 from peppy/strongly-typed-statistics
Change statistics to be int for now
|
2018-12-06 12:38:00 +09:00 |
|
Dean Herbert
|
d3f5111fa1
|
Use relative URL
|
2018-12-06 12:18:21 +09:00 |
|
Dean Herbert
|
966c2f6547
|
Update resources
|
2018-12-06 12:05:13 +09:00 |
|
Dean Herbert
|
e56f4cc8a5
|
Add remaining steps to registration screen
|
2018-12-06 11:58:09 +09:00 |
|