RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,468 Commits 3 Branches 659 Tags 365 MiB
Commit Graph

15468 Commits

Author SHA1 Message Date
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 a1543905ae
Merge branch 'master' into fix-api-failure-fail 2018-12-14 13:19:09 +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 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 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
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
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 94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
Dan Balasescu 466505322e
Merge pull request #3819 from peppy/fix-double-working-beatmap-load 
Fix GetWorkingBeatmap potentially loading same beatmap twice
 2018-12-05 16:05:46 +09:00
Dean Herbert b5ba74a628 Add more specific checks 2018-12-05 02:12:15 +09:00
Dean Herbert c7c5837ec1 Fix GetWorkingBeatmap potentially loading same beatmap twice 
This could be seen when using the previous/next buttons in the MusicController while at song select.
 2018-12-05 01:45:32 +09:00
Dean Herbert 21305ffd71
Merge pull request #3817 from smoogipoo/fix-hudoverlay-presence 
Make hud overlay's content always present to fix input issues
 2018-12-04 23:16:48 +09:00
Dean Herbert 4f5028bbc1
Merge branch 'master' into fix-hudoverlay-presence 2018-12-04 22:14:54 +09:00
Dan Balasescu b2d1c66746
Merge pull request #3816 from peppy/fix-home-button-cancel 
Fix home button being cancelled by mod select
 2018-12-04 19:41:03 +09:00
smoogipoo ca91dfa091 Make hudoverlay always present 2018-12-04 19:20:32 +09:00
Dean Herbert 1913dc7365
Merge branch 'master' into fix-home-button-cancel 2018-12-04 12:53:11 +09:00
Dean Herbert 2d68a6c181
Merge pull request #3815 from smoogipoo/fix-incorrect-samples 
Add 1ms offset to controlpoint lookup times
 2018-12-04 12:52:55 +09:00
Dean Herbert 415349e6ef Add missing return 2018-12-04 12:14:26 +09:00
smoogipoo 9fdd48ded2 Add 1ms offset to controlpoint lookup times 2018-12-04 12:08:46 +09:00
Dean Herbert a33865efce Fix home button being cancelled by mod select 2018-12-04 12:06:05 +09:00
Dean Herbert b0adab5f96
Merge pull request #3811 from peppy/fix-async-profile-logic 
Fix loading scores on profile pages potentially causing long blocking operations
 2018-12-03 22:12:39 +09:00
Dan Balasescu 78d1a1c499
Merge branch 'master' into fix-async-profile-logic 2018-12-03 20:55:23 +09:00
Dean Herbert 2bc3c4cc8b
Merge pull request #3810 from peppy/fix-chat-crash 
Fix hard crash due to out-of-order chat sequencing
 2018-12-03 19:27:26 +09:00
Dan Balasescu f278dff49c
Merge branch 'master' into fix-chat-crash 2018-12-03 19:17:05 +09:00
Dean Herbert bc9290bfcb Schedule cross thread access in test case 2018-12-03 18:43:51 +09:00
Dean Herbert 7e35afd178 Fix loading scores on profile pages potentially causing long blocking operations 2018-12-03 18:37:44 +09:00
Dean Herbert c227c06fa1
Merge pull request #3807 from smoogipoo/fix-selector-regression 
Fix channel selector regression
 2018-12-03 18:21:52 +09:00
Dean Herbert 14d9f1d8bb Fix hard crash due to out-of-order chat sequencing 2018-12-03 18:13:10 +09:00
Dean Herbert 9a8136ea4a
Merge branch 'master' into fix-selector-regression 2018-12-03 18:01:12 +09:00
Dean Herbert 1d2626c94a
Merge pull request #3809 from smoogipoo/fix-incorrect-samples 
Fix incorrect controlpoint being applied to samples
 2018-12-03 18:00:31 +09:00
smoogipoo eb88768bd0 Fix incorrect controlpoint being applied to samples 2018-12-03 17:21:27 +09:00
smoogipoo 814d401eb0 Make ChannelSelectorTabItem not switchable 2018-12-03 11:48:36 +09:00
smoogipoo 7255a01bf5 Remove ChatTabControl 2018-12-03 11:48:21 +09:00
Dean Herbert 8f1d53400e
Merge pull request #3792 from peppy/fix-score-datatypes 
Fix some data types on ScoreInfo
 2018-12-01 09:26:18 +09:00
Dean Herbert f9fb6dc39b Remove health from ScoreInfo 2018-12-01 00:17:05 +09:00
Dean Herbert af3ef9a089 Fix some data types on ScoreInfo 2018-11-30 20:43:38 +09:00
Dean Herbert cc488fe275
Merge pull request #3791 from peppy/fix-d-rank 
Revert "Fix D rank displaying as F"
 2018-11-30 20:05:35 +09:00
Dean Herbert 2860f5a5cd Revert "Fix D rank displaying as F" 
This reverts commit 17b2a4ca0d.
 2018-11-30 20:03:21 +09:00
Dean Herbert bf4a544a12
Merge pull request #3790 from peppy/fix-d-rank 
Fix D rank displaying as F
 2018-11-30 19:56:19 +09:00