1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 05:27:40 +08:00
Commit Graph

15538 Commits

Author SHA1 Message Date
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
smoogipoo
6a28e8c696 Add settings to lounge 2018-12-03 18:30:26 +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
53a54f8634 Renamespace room settings 2018-12-03 17:54:10 +09:00
smoogipoo
20b843e63c Add create tab 2018-12-03 17:50:56 +09:00
smoogipoo
51c16867d5 Remove type conversion from LoungeTab to RoomAvailability 2018-12-03 17:50:39 +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
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
smoogipoo
4c1abdcd8c Save score upon map completion 2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
smoogipoo
ed67984638 Don't load player if score has no replay data 2018-11-30 18:24:35 +09:00
Dean Herbert
f517f98ae7
Merge pull request #3784 from smoogipoo/scoredatabase
Add a ScoreManager + score-related tables to the database
2018-11-30 18:23:26 +09:00
Dean Herbert
059e9e180b Apply review 2018-11-30 18:07:15 +09:00
Dean Herbert
9718e476c7 Add license header 2018-11-30 18:07:15 +09:00
Dean Herbert
2dd5dad7c5 Remove empty lines 2018-11-30 18:07:15 +09:00
Dean Herbert
00c5ea28c7 Update migrations in line with hash change 2018-11-30 18:07:15 +09:00
Dean Herbert
66e43e6ed9 Update hashing method in line with master 2018-11-30 17:36:06 +09:00
Dean Herbert
be37f3c328 Rename NoModMod 2018-11-30 17:35:13 +09:00
Dean Herbert
aa7a665317 Merge remote-tracking branch 'upstream/master' into scoredatabase 2018-11-30 17:20:23 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
84f3d4f48d Fix nullref 2018-11-30 17:15:32 +09:00
Dean Herbert
10095d09c3 Fix test namespace 2018-11-30 17:02:01 +09:00
Dan Balasescu
a47a951ccd
Merge pull request #3776 from peppy/fix-skin-duplication
Fix skin duplication
2018-11-30 16:56:42 +09:00