Commit Graph

5763 Commits

Author SHA1 Message Date
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
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
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
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
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
3b1d5ce7df CI fix 2017-05-15 13:31:51 +09:00
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
1f3039926f Reword settings text slightly 2017-05-15 12:57:55 +09:00
3b87a938db Merge branch 'master' into cursor_size. 2017-05-15 12:23:49 +09:00
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
ca6df533bd Automatic gameplay cursor size 2017-05-13 03:46:37 +03:00
fd9218b6d5 Use FirstOrDefault 2017-05-12 20:48:25 +09:00
24db423c4f Merge remote-tracking branch 'upstream/master' into playlist-commit 2017-05-12 20:39:50 +09:00
815379646c Merge branch 'master' into new-option-search 2017-05-12 20:22:11 +09:00
6c117f15af Remove unnecessary usings 2017-05-12 20:06:38 +09:00
d2e066ca35 Move SearchTextBox to better namespace
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
bc5bcfa66a Make tab background opaque when chat is fullscreen 2017-05-12 19:15:04 +09:00
dbf60d24bf Second design update pass. 2017-05-12 15:39:00 +09:00
6ea65009c4 Initial design update pass 2017-05-12 15:38:55 +09:00
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
9cf4998701 Make chat resizable via drag, save user set size 2017-05-12 15:36:37 +09:00
f248efb01f CI Fixes 2017-05-12 13:25:50 +09:00
ffa59c6cb3 Support read-only channels, post to correct channel.
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
a77049213d Add basic hard-coded inefficient multi-channel support. 2017-05-11 23:10:48 +09:00
ca32caf9e4 Merge branch 'master' into new-option-search 2017-05-11 21:04:37 +09:00
b258109a9e Fix chat input box not always keeping focus as expected 2017-05-11 19:38:36 +09:00
ec67b617ae Add OptionsHeader class
Makes search textbox anchor correctly. Also improves visual styling.
2017-05-11 16:06:18 +09:00
df48204403 Fix OptionsOverlay stealing focus itself. 2017-05-11 13:56:21 +09:00
7d8af5f1da Use SearchTextBox
Correctly handle focus.
2017-05-11 13:23:31 +09:00
6c5490e31c Merge remote-tracking branch 'upstream/master' into new-option-search 2017-05-11 12:59:19 +09:00
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
262b42efe3 Merge branch 'master' into new-option-search 2017-05-11 12:20:58 +09:00
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
9aaac4ab0c Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search 2017-05-08 18:30:33 +02:00
86f0173c6b fix license header 2017-05-08 18:30:00 +02:00
3abf1b2a0b Merge branch 'master' into new-option-search 2017-05-08 17:25:47 +02:00
ced2332d20 Handle overlay in ToolbarOverlayToggleButton. 2017-05-08 19:37:41 +08:00
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
2f4fad9d41 Refactor colour selection. 2017-05-08 11:33:22 +09:00
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
5131371c93 Merge branch 'master' into new-option-search 2017-05-08 10:49:49 +09:00
de8428c95b Make requested changes 2017-05-07 22:23:33 -03:00
fbf05f12fc Use controlWithCurrent as per comment. 2017-05-08 10:11:45 +09:00