1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:22:58 +08:00
Commit Graph

4371 Commits

Author SHA1 Message Date
Dean Herbert
e096dd8126 Merge branch 'master' into fix-beatmap-population 2017-05-12 20:30:06 +09:00
Dean Herbert
a9b8e57be8 Merge pull request #728 from Jorolf/new-option-search
add search box and the ability to search
2017-05-12 20:29:53 +09:00
Dan Balasescu
815379646c Merge branch 'master' into new-option-search 2017-05-12 20:22:11 +09:00
Dan Balasescu
d60da82c4c Merge branch 'master' into fix-beatmap-population 2017-05-12 20:15:10 +09:00
Dan Balasescu
4c2ec046f0 Merge pull request #741 from peppy/chat-design-update
Update chat design
2017-05-12 20:10:52 +09:00
Dean Herbert
6c117f15af Remove unnecessary usings 2017-05-12 20:06:38 +09:00
Dean Herbert
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
Dean Herbert
fec91d4de1 Update framework 2017-05-12 19:58:31 +09:00
Dean Herbert
d3770d8395 Merge branch 'master' into chat-design-update 2017-05-12 19:57:57 +09:00
Dean Herbert
d2e066ca35 Move SearchTextBox to better namespace
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
Dan Balasescu
a27f92a4fb Merge pull request #740 from peppy/resizable-chat
Resizable chat
2017-05-12 19:52:41 +09:00
Dan Balasescu
a5ff3f4d32 Merge branch 'master' into resizable-chat 2017-05-12 19:46:11 +09:00
Dan Balasescu
65504e7cd4 Merge pull request #739 from peppy/multiple-chat-channels
Multiple chat channels
2017-05-12 19:41:28 +09:00
Dan Balasescu
8ec79f788a Merge branch 'master' into multiple-chat-channels 2017-05-12 19:35:12 +09:00
Dean Herbert
bc5bcfa66a Make tab background opaque when chat is fullscreen 2017-05-12 19:15:04 +09:00
Dean Herbert
cf239f4d9c Move chat into main content
Also changes the way parallax is applied to OsuScreens game-wide.
2017-05-12 19:03:21 +09:00
Dean Herbert
181a5a8a61 Merge pull request #682 from EVAST9919/percentage
Song Progress Info
2017-05-12 16:28:20 +09:00
EVAST9919
9a04069123 removed useless booleans, using nullables instead 2017-05-12 10:16:31 +03:00
Dean Herbert
dbf60d24bf Second design update pass. 2017-05-12 15:39:00 +09:00
Dean Herbert
6ea65009c4 Initial design update pass 2017-05-12 15:38:55 +09:00
Dean Herbert
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
Dean Herbert
9cf4998701 Make chat resizable via drag, save user set size 2017-05-12 15:36:37 +09:00
Dean Herbert
1420aa406c Add framework fix. 2017-05-12 14:24:32 +09:00
EVAST9919
34b4efc4e9 Applied suggested changes 2017-05-12 08:12:34 +03:00
Dean Herbert
f248efb01f CI Fixes 2017-05-12 13:25:50 +09:00
EVAST9919
79ed92a0d7 Simplified logic 2017-05-12 01:48:28 +03:00
EVAST9919
1f34cec5ce Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-11 22:22:57 +03:00
Dean Herbert
ffa59c6cb3 Support read-only channels, post to correct channel.
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
Dean Herbert
a77049213d Add basic hard-coded inefficient multi-channel support. 2017-05-11 23:10:48 +09:00
Dean Herbert
f044b95ce8 Allow OsuTabControl to handle non-enum types. 2017-05-11 23:10:19 +09:00
Dan Balasescu
f11ffb99ac Merge pull request #737 from peppy/general-fixes
Update framework
2017-05-11 22:02:00 +09:00
Dan Balasescu
02532e1dc8 Merge branch 'master' into general-fixes 2017-05-11 21:28:54 +09:00
Dan Balasescu
98e5b64d3f Merge pull request #736 from peppy/oauth-fixes
OAuth fixes
2017-05-11 21:26:28 +09:00
Dean Herbert
9a1c662d1f Update framework 2017-05-11 21:25:43 +09:00
Dan Balasescu
08f5cbca51 Merge branch 'master' into oauth-fixes 2017-05-11 21:07:13 +09:00
Dean Herbert
ca32caf9e4 Merge branch 'master' into new-option-search 2017-05-11 21:04:37 +09:00
Dan Balasescu
c5f6a1ec93 Merge pull request #735 from peppy/general-fixes
Fix broken test cases, remove some recursive lookup methods.
2017-05-11 21:03:27 +09:00
Dean Herbert
c3d2cdd2f2 Fix typo 2017-05-11 19:49:28 +09:00
Dean Herbert
4e881644f6 Add thread-safety on access token validation logic. 2017-05-11 19:39:01 +09:00
Dean Herbert
7d221802a2 Fix refresh tokens not working correctly
Turns out there's plenty of slashes in refresh tokens.
2017-05-11 19:38:57 +09:00
Dean Herbert
b258109a9e Fix chat input box not always keeping focus as expected 2017-05-11 19:38:36 +09:00
Dean Herbert
a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
Dean Herbert
18b7c8e783 Merge pull request #730 from smoogipooo/mania-notes
Mania notes
2017-05-11 18:16:33 +09:00
smoogipooo
6cc54773e8 Fix taiko right background not scaling with the playfield as intended. 2017-05-11 17:18:22 +09:00
Dean Herbert
6fd95e0c52 Fix post-merge breakage 2017-05-11 17:16:01 +09:00
Dean Herbert
bc54b3c85f Merge branch 'master' into mania-notes 2017-05-11 17:13:29 +09:00
Dean Herbert
b0e522345c Combine DrawableHitObject classes into one 2017-05-11 17:07:46 +09:00
Dean Herbert
ec67b617ae Add OptionsHeader class
Makes search textbox anchor correctly. Also improves visual styling.
2017-05-11 16:06:18 +09:00
Dean Herbert
057d0cd523 Merge pull request #733 from smoogipooo/hitrenderer-improvements
Hitrenderer improvements
2017-05-11 15:16:45 +09:00
smoogipooo
a762f820c6 Fix possible nullrefs. 2017-05-11 14:50:18 +09:00