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

15455 Commits

Author SHA1 Message Date
smoogipoo
49dd6ae9b0 Move a lot more of PlaySongSelect into SongSelect 2018-12-12 13:21:44 +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
Dean Herbert
3921834cfd
Merge branch 'master' into fix-d-rank 2018-11-30 19:49:36 +09:00
Dean Herbert
97c4ee3342
Merge pull request #3785 from smoogipoo/local-score-saving
Save local scores when completing beatmaps
2018-11-30 19:49:25 +09:00
Dean Herbert
b985d19078
Merge branch 'master' into local-score-saving 2018-11-30 19:48:00 +09:00
Dean Herbert
397814698e
Merge pull request #3786 from smoogipoo/local-score-display
Display local scores in the leaderboard
2018-11-30 19:47:25 +09:00
Dean Herbert
17b2a4ca0d Fix D rank displaying as F 2018-11-30 19:46:40 +09:00
Dean Herbert
80f92c404a
Merge branch 'master' into local-score-display 2018-11-30 19:15:59 +09:00
Dean Herbert
5bd7ae5f26
Merge branch 'master' into local-score-saving 2018-11-30 18:59:09 +09:00
smoogipoo
f80a30cba4 Fix null being serialized 2018-11-30 18:52:31 +09:00
smoogipoo
b1c5b43767 Fix post-rebase errors 2018-11-30 18:46:47 +09:00
smoogipoo
10ed09521c Add leaderboard display for local scores 2018-11-30 18:40:53 +09:00
smoogipoo
4144f4bd2f Fix duplicates not being ignored if hash is null 2018-11-30 18:40:06 +09:00
smoogipoo
795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +09:00
smoogipoo
a6b0e35b2d Fix post-rebase issues 2018-11-30 18:31:54 +09:00