Commit Graph

2945 Commits

Author SHA1 Message Date
32c471d285 Merge branch 'master' into pause-container 2017-05-18 01:22:37 +09:00
8084c575ef Merge branch 'master' into fix-fail-pause-conflict 2017-05-17 23:32:41 +09:00
25f217505e Merge branch 'master' into song-select-selection-fixes 2017-05-17 23:17:10 +09:00
1278d9c53d Merge branch 'master' into bad-bad-ratio-container 2017-05-17 23:01:56 +09:00
d606b5b3a7 Fix CI warning 2017-05-17 22:13:56 +09:00
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
88a70e407c Fix and simplifty pause logic
Resolves #770
2017-05-17 20:11:41 +09:00
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
b21be8f3f5 Merge branch 'master' into fix-chat-after-disconnect 2017-05-17 17:51:35 +09:00
7bb38e927b Fix song select reverting to first difficulty of current group on entering 2017-05-17 17:33:20 +09:00
cab12ee55a Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed 2017-05-17 17:33:16 +09:00
78c1d4581f Revert "Use generic IComparable for message."
This reverts commit aaaee5ed10.
2017-05-17 13:44:43 +09:00
231f7939a6 Fix channels being unnecessarily recycled on disconnect
Resolves #768
2017-05-17 12:42:02 +09:00
12cb530358 Merge branch 'master' into tidy-up 2017-05-17 09:24:11 +09:00
a3e93afb37 Merge pull request #3 from ppy/master
cool
2017-05-16 16:57:45 -04:00
b22c84287a Fix typo. 2017-05-16 16:54:33 -04:00
e2a7f00a52 Remove unused namespace. 2017-05-16 22:20:05 +08:00
f1d5a92950 Use generic IEqutable to avoid typeless Equals. 2017-05-16 21:49:38 +08:00
aaaee5ed10 Use generic IComparable for message. 2017-05-16 21:46:22 +08:00
e911441394 Why AbandonedMutexException? 2017-05-16 21:23:14 +08:00
d929de466a DateDisplay -> DateTimeDisplay for more exactly. 2017-05-16 21:16:52 +08:00
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
b9a40a841b Use IsAssignableFrom. 2017-05-16 21:04:54 +08:00
5a9745b492 Update API endpoint 2017-05-16 21:37:55 +09:00
be3953aeb2 Merge branch 'master' into general-fixes 2017-05-16 20:52:38 +09:00
a7df99c6d2 Merge branch 'master' into fix-guest-user 2017-05-16 20:46:28 +09:00
85daddcf6f Merge branch 'master' into mania-timing-sections 2017-05-16 20:12:26 +09:00
041d4f93c0 Fix typo 2017-05-16 20:08:22 +09:00
fdf0137fc2 Remove incorrect padding 2017-05-16 19:58:34 +09:00
23807aa3b9 Better handling of logged in state 2017-05-16 19:55:45 +09:00
2384f7b0c1 Ensure LocalUser is never null 2017-05-16 19:49:50 +09:00
a209a738ea Merge branch 'master' into player-fixes 2017-05-16 19:11:23 +09:00
ca9c52ce38 Merge branch 'master' into player-fixes 2017-05-16 18:54:55 +09:00
0c7ceea4fd Merge branch 'master' into on-screen-display 2017-05-16 18:54:54 +09:00
71b14bb8af Merge branch 'master' into fix-duplicate-channels 2017-05-16 18:50:21 +09:00
0215b45088 Merge branch 'master' into player-fixes 2017-05-16 18:39:21 +09:00
6231a19b8c Merge remote-tracking branch 'origin/master' into mania-timing-sections 2017-05-16 18:35:32 +09:00
712bd21e25 Fix duplicate channels being created on connection loss
Resolves #763
2017-05-16 18:28:42 +09:00
3673e4af1f Fade bold state of chat tabs better 2017-05-16 18:00:29 +09:00
6487bf45cf Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
b016d53b85 Fix TwoLayerButton not capturing MouseDown events
Caused clicks to pass through the skip button to the progress bar.
2017-05-16 17:59:07 +09:00
0feaa407f2 Merge branch 'margin-padding-namespace' into on-screen-display 2017-05-16 16:40:06 +09:00
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
91de72e161 Merge branch 'master' into on-screen-display 2017-05-16 16:27:19 +09:00
fe3d035474 Merge branch 'master' into general-fixes 2017-05-16 16:16:43 +09:00
83a8a27161 Merge branch 'master' into logo-shockwave 2017-05-16 16:10:34 +09:00
f0ea445e46 Fix initial requests of channel mesages not being performed
fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
2017-05-16 15:59:01 +09:00
2ad9aa2ae5 Merge branch 'master' into chat-error-messages 2017-05-16 15:12:59 +09:00
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
e09f1c7c91 Remove AudioDevice from game-level setting
Should be (and is already)  in FrameworkConfig.
2017-05-16 12:59:47 +09:00