1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 15:17:28 +08:00
Commit Graph

4533 Commits

Author SHA1 Message Date
Huo Yaoyuan
cd065b8ff3 Add back GetHashCode. 2017-05-18 05:27:20 +08:00
Huo Yaoyuan
ffbab6bfeb Tidy up DrawableChannel. 2017-05-18 04:08:47 +08:00
Huo Yaoyuan
88f8619e9a More missed exceptions. 2017-05-18 02:46:12 +08:00
Huo Yaoyuan
23e2d3ef07 Use GroupBy in ChatOverlay. 2017-05-18 02:40:36 +08:00
Huo Yaoyuan
e2b1fcc088 Use string.Join in GetMessagesRequest. 2017-05-18 02:40:33 +08:00
Huo Yaoyuan
b5d7211cd6 Expire placeholder text. 2017-05-18 02:40:29 +08:00
Huo Yaoyuan
65ff66682a Merge branch 'master' into generic-interface 2017-05-18 02:40:05 +08:00
Dan Balasescu
55d4d83712 Merge pull request #782 from peppy/fix-fail-pause-conflict
Fix and simplify pause logic
2017-05-18 01:22:00 +09:00
Dean Herbert
8084c575ef Merge branch 'master' into fix-fail-pause-conflict 2017-05-17 23:32:41 +09:00
Dean Herbert
0242e37bb3 Merge pull request #778 from peppy/song-select-selection-fixes
Fix song select reverting to first difficulty of current group on entering
2017-05-17 23:31:24 +09:00
Dean Herbert
d1f85c3f8e Update framework 2017-05-17 23:21:23 +09:00
Dean Herbert
25f217505e Merge branch 'master' into song-select-selection-fixes 2017-05-17 23:17:10 +09:00
Dean Herbert
bab8997b43 Merge pull request #780 from peppy/bad-bad-ratio-container
Fix ratio container being added to a level too high
2017-05-17 23:16:58 +09:00
Dean Herbert
1278d9c53d Merge branch 'master' into bad-bad-ratio-container 2017-05-17 23:01:56 +09:00
Dean Herbert
3fd9edfcde Merge pull request #784 from peppy/general-fixes
Fix CI warning
2017-05-17 22:57:01 +09:00
Dean Herbert
d606b5b3a7 Fix CI warning 2017-05-17 22:13:56 +09:00
Dan Balasescu
8bcbc2cc26 Merge pull request #774 from peppy/fix-chat-after-disconnect
Fix channels being unnecessarily recycled on disconnect
2017-05-17 22:02:25 +09:00
Dean Herbert
88a70e407c Fix and simplifty pause logic
Resolves #770
2017-05-17 20:11:41 +09:00
Huo Yaoyuan
6c9505fa3a Handle possible nulls. 2017-05-17 18:11:38 +08:00
Huo Yaoyuan
b9b45493e6 Use generic IComparable together with IEqutable for Message. 2017-05-17 18:02:17 +08:00
Dean Herbert
cba7796777 Fix ratio container being added to a level too high
That's a bad ratio container! How did we not notice this until now?
2017-05-17 18:49:30 +09:00
Dan Balasescu
b21be8f3f5 Merge branch 'master' into fix-chat-after-disconnect 2017-05-17 17:51:35 +09:00
Dean Herbert
7bb38e927b Fix song select reverting to first difficulty of current group on entering 2017-05-17 17:33:20 +09:00
Dean Herbert
cab12ee55a Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed 2017-05-17 17:33:16 +09:00
Dan Balasescu
12716d2ab4 Merge pull request #776 from peppy/fix-duplicate-messages
Revert "Use generic IComparable for message."
2017-05-17 13:51:13 +09:00
Dean Herbert
78c1d4581f
Revert "Use generic IComparable for message."
This reverts commit aaaee5ed10.
2017-05-17 13:44:43 +09:00
Dean Herbert
231f7939a6 Fix channels being unnecessarily recycled on disconnect
Resolves #768
2017-05-17 12:42:02 +09:00
Dean Herbert
c78f4cc7ab Merge pull request #769 from huoyaoyuan/tidy-up
Tidy up
2017-05-17 09:29:05 +09:00
Dean Herbert
12cb530358 Merge branch 'master' into tidy-up 2017-05-17 09:24:11 +09:00
Dean Herbert
4f1c32a491 Merge pull request #771 from nyaamara/master
Fix typo
2017-05-17 07:59:46 +09:00
nyaamara
a3e93afb37 Merge pull request #3 from ppy/master
cool
2017-05-16 16:57:45 -04:00
nyaamara
b22c84287a Fix typo. 2017-05-16 16:54:33 -04:00
Huo Yaoyuan
e2a7f00a52 Remove unused namespace. 2017-05-16 22:20:05 +08:00
Huo Yaoyuan
f1d5a92950 Use generic IEqutable to avoid typeless Equals. 2017-05-16 21:49:38 +08:00
Huo Yaoyuan
aaaee5ed10 Use generic IComparable for message. 2017-05-16 21:46:22 +08:00
Huo Yaoyuan
e911441394 Why AbandonedMutexException? 2017-05-16 21:23:14 +08:00
Huo Yaoyuan
d929de466a DateDisplay -> DateTimeDisplay for more exactly. 2017-05-16 21:16:52 +08:00
Huo Yaoyuan
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Huo Yaoyuan
b9a40a841b Use IsAssignableFrom. 2017-05-16 21:04:54 +08:00
Dean Herbert
8b6d0864f0 Merge pull request #767 from peppy/general-fixes
Update framework
2017-05-16 21:42:56 +09:00
Dean Herbert
5a9745b492 Update API endpoint 2017-05-16 21:37:55 +09:00
Dean Herbert
3d74492c95 Update framework 2017-05-16 21:19:34 +09:00
Dean Herbert
18b46dc0d4 Merge pull request #766 from peppy/general-fixes
Remove incorrect padding
2017-05-16 21:18:08 +09:00
Dan Balasescu
be3953aeb2 Merge branch 'master' into general-fixes 2017-05-16 20:52:38 +09:00
Dan Balasescu
14b06f3600 Merge pull request #765 from peppy/fix-guest-user
Fix guest user being null
2017-05-16 20:52:25 +09:00
Dan Balasescu
a7df99c6d2 Merge branch 'master' into fix-guest-user 2017-05-16 20:46:28 +09:00
Dean Herbert
1112dbb113 Merge pull request #738 from smoogipooo/mania-timing-sections
Mania timing sections
2017-05-16 20:17:20 +09:00
Dean Herbert
85daddcf6f Merge branch 'master' into mania-timing-sections 2017-05-16 20:12:26 +09:00
Dean Herbert
041d4f93c0 Fix typo 2017-05-16 20:08:22 +09:00
Dean Herbert
fdf0137fc2 Remove incorrect padding 2017-05-16 19:58:34 +09:00